From 711b1f26b2ff411254411f67079aefdb98b306b1 Mon Sep 17 00:00:00 2001 From: Nathan Flurry Date: Fri, 13 Sep 2024 18:45:50 -0700 Subject: [PATCH] chore: update develop & deploy & settings & modules ui to match new spec --- .../Rivet/Editor/Images/FontAwesome/house.svg | 1 + .../Editor/Images/FontAwesome/house.svg.meta | 54 ++++++++++++++++++ .../Images/FontAwesome/pen-to-square.svg | 1 + .../Images/FontAwesome/pen-to-square.svg.meta | 54 ++++++++++++++++++ .../Rivet/Editor/Images/FontAwesome/plus.svg | 1 + .../Editor/Images/FontAwesome/plus.svg.meta | 54 ++++++++++++++++++ .../Editor/Images/FontAwesome/puzzle.svg | 1 + .../Editor/Images/FontAwesome/puzzle.svg.meta | 54 ++++++++++++++++++ .../librivet_toolchain_ffi_macos_arm64.dylib | 4 +- Assets/Rivet/Editor/UI/Elements/Header.uxml | 2 +- Assets/Rivet/Editor/UI/RivetPlugin.uss | 14 ++--- Assets/Rivet/Editor/UI/RivetPlugin.uxml | 9 +-- Assets/Rivet/Editor/UI/Screens/Main.uss | 4 ++ Assets/Rivet/Editor/UI/Screens/Main.uxml | 5 +- Assets/Rivet/Editor/UI/Tabs/Deploy.uss | 13 ++++- Assets/Rivet/Editor/UI/Tabs/Deploy.uxml | 1 + Assets/Rivet/Editor/UI/Tabs/Develop.uss | 14 +---- Assets/Rivet/Editor/UI/Tabs/Develop.uxml | 37 +++---------- Assets/Rivet/Editor/UI/Tabs/Modules.uss | 8 +++ Assets/Rivet/Editor/UI/Tabs/Modules.uss.meta | 11 ++++ Assets/Rivet/Editor/UI/Tabs/Modules.uxml | 17 ++++++ Assets/Rivet/Editor/UI/Tabs/Modules.uxml.meta | 10 ++++ .../Rivet/Editor/UI/Tabs/ModulesController.cs | 55 +++++++++++++++++++ .../Editor/UI/Tabs/ModulesController.cs.meta | 11 ++++ Assets/Rivet/Editor/UI/Tabs/Settings.uxml | 10 ++++ Assets/Rivet/Editor/UI/Tabs/Setup.uss | 30 ++++++++++ Assets/Rivet/Editor/UI/Tabs/Setup.uss.meta | 11 ++++ Assets/Rivet/Editor/UI/Tabs/Setup.uxml | 37 +++++++++++-- 28 files changed, 456 insertions(+), 67 deletions(-) create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/house.svg create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/house.svg.meta create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg.meta create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/plus.svg create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/plus.svg.meta create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg create mode 100644 Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg.meta create mode 100644 Assets/Rivet/Editor/UI/Tabs/Modules.uss create mode 100644 Assets/Rivet/Editor/UI/Tabs/Modules.uss.meta create mode 100644 Assets/Rivet/Editor/UI/Tabs/Modules.uxml create mode 100644 Assets/Rivet/Editor/UI/Tabs/Modules.uxml.meta create mode 100644 Assets/Rivet/Editor/UI/Tabs/ModulesController.cs create mode 100644 Assets/Rivet/Editor/UI/Tabs/ModulesController.cs.meta create mode 100644 Assets/Rivet/Editor/UI/Tabs/Setup.uss create mode 100644 Assets/Rivet/Editor/UI/Tabs/Setup.uss.meta diff --git a/Assets/Rivet/Editor/Images/FontAwesome/house.svg b/Assets/Rivet/Editor/Images/FontAwesome/house.svg new file mode 100644 index 0000000..2f74523 --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/house.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/Rivet/Editor/Images/FontAwesome/house.svg.meta b/Assets/Rivet/Editor/Images/FontAwesome/house.svg.meta new file mode 100644 index 0000000..b78f624 --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/house.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: 3b1a5b5822799496da64c559e533a1a8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 3 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: c6f4439e84339480f8ba885ec8460088 + PhysicsOutlines: [] diff --git a/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg b/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg new file mode 100644 index 0000000..f2c2baf --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg.meta b/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg.meta new file mode 100644 index 0000000..3fcef81 --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: d163064dfce68421abbdd81e072c9b86 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 3 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 53d871188b34741a1ad5926a34d5af47 + PhysicsOutlines: [] diff --git a/Assets/Rivet/Editor/Images/FontAwesome/plus.svg b/Assets/Rivet/Editor/Images/FontAwesome/plus.svg new file mode 100644 index 0000000..eebd0ff --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/Rivet/Editor/Images/FontAwesome/plus.svg.meta b/Assets/Rivet/Editor/Images/FontAwesome/plus.svg.meta new file mode 100644 index 0000000..7960ae4 --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/plus.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: be349c2e728b24cb18e09addf902709c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 3 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: a22136a67000f4a2e882690a9eb346a1 + PhysicsOutlines: [] diff --git a/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg b/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg new file mode 100644 index 0000000..4d2a4ae --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg.meta b/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg.meta new file mode 100644 index 0000000..2e010c2 --- /dev/null +++ b/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: 082b7f4beb7e042028ea32b7567dc2d3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 3 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: a103fb6596cc24daa90eec63bd16357d + PhysicsOutlines: [] diff --git a/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib b/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib index 90035a2..9d9fcfa 100755 --- a/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib +++ b/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d588e458af847b8e3763925eb27f76cce5dee520072a34c71560e9ec129827bd -size 120593104 +oid sha256:83bb1a555424c8ac985c8b2348a743bb3566a04185edcc9aeaf57f71213874a9 +size 130169600 diff --git a/Assets/Rivet/Editor/UI/Elements/Header.uxml b/Assets/Rivet/Editor/UI/Elements/Header.uxml index cd4897d..0ef02b4 100644 --- a/Assets/Rivet/Editor/UI/Elements/Header.uxml +++ b/Assets/Rivet/Editor/UI/Elements/Header.uxml @@ -3,6 +3,6 @@ - + diff --git a/Assets/Rivet/Editor/UI/RivetPlugin.uss b/Assets/Rivet/Editor/UI/RivetPlugin.uss index d57556d..a376a0b 100644 --- a/Assets/Rivet/Editor/UI/RivetPlugin.uss +++ b/Assets/Rivet/Editor/UI/RivetPlugin.uss @@ -23,21 +23,17 @@ } #DashboardButton .icon { - background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/browser.svg?fileID=7388822144124034973&guid=d5b6438060c4b4e59a8c5bf1dd267d0f&type=3#browser"); -} - -#DocsButton .icon { - background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/book.svg?fileID=7388822144124034973&guid=6e8f178e0ec88464f9ad9f45ad22d210&type=3#book"); -} - -#DiscordButton .icon { - background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/discord.svg?fileID=7388822144124034973&guid=0a164d5f5d70b46e1a709a15ca016836&type=3#discord"); + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/house.svg?fileID=7388822144124034973&guid=3b1a5b5822799496da64c559e533a1a8&type=3#house"); } #FeedbackButton .icon { background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/bug.svg?fileID=7388822144124034973&guid=b156156de32b04827b7eb6b334ccaf0d&type=3#bug"); } +#SettingsButton .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/gear.svg?fileID=7388822144124034973&guid=4395aa38d356747bc8b01eb63a802209&type=3#gear"); +} + #Logo { -unity-background-image-tint-color: var(--unity-colors-default-text); } diff --git a/Assets/Rivet/Editor/UI/RivetPlugin.uxml b/Assets/Rivet/Editor/UI/RivetPlugin.uxml index 713e615..2563122 100644 --- a/Assets/Rivet/Editor/UI/RivetPlugin.uxml +++ b/Assets/Rivet/Editor/UI/RivetPlugin.uxml @@ -10,15 +10,12 @@ - - - - - - + + + diff --git a/Assets/Rivet/Editor/UI/Screens/Main.uss b/Assets/Rivet/Editor/UI/Screens/Main.uss index c2cf421..5e5ebbd 100644 --- a/Assets/Rivet/Editor/UI/Screens/Main.uss +++ b/Assets/Rivet/Editor/UI/Screens/Main.uss @@ -16,6 +16,10 @@ background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/cloud-arrow-up.svg?fileID=7388822144124034973&guid=44dad88c1451c446d807e891e2bad2d8&type=3#cloud-arrow-up"); } +#TabBar #Modules .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg?fileID=7388822144124034973&guid=082b7f4beb7e042028ea32b7567dc2d3&type=3#puzzle"); +} + #TabBar #Settings .icon { background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/gear.svg?fileID=7388822144124034973&guid=4395aa38d356747bc8b01eb63a802209&type=3#gear"); } diff --git a/Assets/Rivet/Editor/UI/Screens/Main.uxml b/Assets/Rivet/Editor/UI/Screens/Main.uxml index fcf0e6d..e5ce643 100644 --- a/Assets/Rivet/Editor/UI/Screens/Main.uxml +++ b/Assets/Rivet/Editor/UI/Screens/Main.uxml @@ -15,7 +15,10 @@ - + + + + diff --git a/Assets/Rivet/Editor/UI/Tabs/Deploy.uss b/Assets/Rivet/Editor/UI/Tabs/Deploy.uss index 2a2bc69..a287744 100644 --- a/Assets/Rivet/Editor/UI/Tabs/Deploy.uss +++ b/Assets/Rivet/Editor/UI/Tabs/Deploy.uss @@ -1,3 +1,12 @@ -#BuildDeployButton .icon { - background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/hammer.svg?fileID=7388822144124034973&guid=57861a0f5a3f5403995884fd2bd0639b&type=3#hammer"); +#AddButton .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/plus.svg?fileID=7388822144124034973&guid=be349c2e728b24cb18e09addf902709c&type=3#plus"); +} + +#ModulesHeader .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/puzzle.svg?fileID=7388822144124034973&guid=082b7f4beb7e042028ea32b7567dc2d3&type=3#puzzle"); + display: flex; +} + +#CreateButton .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/pen-to-square.svg?fileID=7388822144124034973&guid=d163064dfce68421abbdd81e072c9b86&type=3#pen-to-square"); } diff --git a/Assets/Rivet/Editor/UI/Tabs/Deploy.uxml b/Assets/Rivet/Editor/UI/Tabs/Deploy.uxml index 37b8dfe..bdd9644 100644 --- a/Assets/Rivet/Editor/UI/Tabs/Deploy.uxml +++ b/Assets/Rivet/Editor/UI/Tabs/Deploy.uxml @@ -5,6 +5,7 @@ + diff --git a/Assets/Rivet/Editor/UI/Tabs/Develop.uss b/Assets/Rivet/Editor/UI/Tabs/Develop.uss index b043de2..37cbcbc 100644 --- a/Assets/Rivet/Editor/UI/Tabs/Develop.uss +++ b/Assets/Rivet/Editor/UI/Tabs/Develop.uss @@ -3,16 +3,6 @@ display: flex; } -#LocalGameServerHeader .icon { - background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/server.svg?fileID=7388822144124034973&guid=7bcd10cbcf44540858a99dc18ebb77c3&type=3#server"); - display: flex; -} - -#BackendHeader .icon { - background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/gear-code.svg?fileID=7388822144124034973&guid=e9347091e532b4c26b3832355cb4812a&type=3#gear-code"); - display: flex; -} - #StartButton .icon { background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/play.svg?fileID=7388822144124034973&guid=9c12e8ede8d8142448922406ab7718f3&type=3#play"); } @@ -33,7 +23,7 @@ background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/square-sliders.svg?fileID=7388822144124034973&guid=071bfd08c297a4f43886df844a2cb2d7&type=3#square-sliders"); } -#PlayerHeader .icon { - background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/desktop.svg?fileID=7388822144124034973&guid=81aa27a3f3dde4e7698c22bfcd3120c4&type=3#desktop"); +#PlayHeader .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/joystick%201.svg?fileID=7388822144124034973&guid=e2339b8045892476da1e39eceaabfbd4&type=3#joystick 1"); display: flex; } diff --git a/Assets/Rivet/Editor/UI/Tabs/Develop.uxml b/Assets/Rivet/Editor/UI/Tabs/Develop.uxml index 04c17db..d50bd69 100644 --- a/Assets/Rivet/Editor/UI/Tabs/Develop.uxml +++ b/Assets/Rivet/Editor/UI/Tabs/Develop.uxml @@ -7,16 +7,18 @@ - + - - + + - - + + + + @@ -28,29 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Assets/Rivet/Editor/UI/Tabs/Modules.uss b/Assets/Rivet/Editor/UI/Tabs/Modules.uss new file mode 100644 index 0000000..a459b7b --- /dev/null +++ b/Assets/Rivet/Editor/UI/Tabs/Modules.uss @@ -0,0 +1,8 @@ +#BuildDeployButton .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/hammer.svg?fileID=7388822144124034973&guid=57861a0f5a3f5403995884fd2bd0639b&type=3#hammer"); +} + +#DeployHeader .icon { + background-image: url("project://database/Assets/Rivet/Editor/Images/FontAwesome/cloud-arrow-up.svg?fileID=7388822144124034973&guid=44dad88c1451c446d807e891e2bad2d8&type=3#cloud-arrow-up"); + display: flex; +} diff --git a/Assets/Rivet/Editor/UI/Tabs/Modules.uss.meta b/Assets/Rivet/Editor/UI/Tabs/Modules.uss.meta new file mode 100644 index 0000000..207c030 --- /dev/null +++ b/Assets/Rivet/Editor/UI/Tabs/Modules.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 84b52ab49b72845e98e43b2e1afcb021 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Assets/Rivet/Editor/UI/Tabs/Modules.uxml b/Assets/Rivet/Editor/UI/Tabs/Modules.uxml new file mode 100644 index 0000000..5ec1e48 --- /dev/null +++ b/Assets/Rivet/Editor/UI/Tabs/Modules.uxml @@ -0,0 +1,17 @@ + + + +