diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba5bf02bd7..2aded018c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -181,17 +181,12 @@ jobs: cache: Windows extra_defines: OCULUS_SUPPORTED - - name: Windows Monoscopic - targetPlatform: StandaloneWindows64 - vrsdk: Monoscopic - cache: Windows - - - name: Linux Monoscopic + - name: Linux targetPlatform: StandaloneLinux64 - vrsdk: Monoscopic + vrsdk: Monoscopic # All builds include monoscopic, but this one has no additional XrSdk, so we'll keep the name monoscopic cache: Linux - - name: MacOS Monoscopic + - name: MacOS targetPlatform: StandaloneOSX vrsdk: Monoscopic cache: MacOS @@ -591,8 +586,8 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: MacOS Monoscopic - path: build_macos_monoscopic + name: MacOS + path: build_macos # See https://docs.github.com/en/actions/deployment/deploying-xcode-applications/installing-an-apple-certificate-on-macos-runners-for-xcode-development - name: Install the Apple certificate and provisioning profile @@ -629,7 +624,7 @@ jobs: env: VERSION: ${{ needs.configuration.outputs.version }} run: | - tar xvfz build_macos_monoscopic/*tgz + tar xvfz build_macos/*tgz export FILENAME=$(basename $(readlink -f StandaloneOSX/OpenBrush*.app)) @@ -644,7 +639,7 @@ jobs: - name: Upload signed app uses: actions/upload-artifact@v4 with: - name: MacOS Monoscopic (signed) + name: MacOS (signed) path: | OpenBrush.tgz @@ -669,14 +664,14 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v4 with: - name: MacOS Monoscopic (signed) - path: build_macos_monoscopic + name: MacOS (signed) + path: build_macos - name: Create a notarized DMG env: VERSION: ${{ needs.configuration.outputs.version }} run: | - tar xvfz build_macos_monoscopic/*tgz + tar xvfz build_macos/*tgz export FILENAME=$(basename $(readlink -f StandaloneOSX/OpenBrush*.app)) mkdir dist @@ -701,7 +696,7 @@ jobs: - name: Upload notarized dmg uses: actions/upload-artifact@v4 with: - name: MacOS Monoscopic (DMG) + name: MacOS (DMG) path: | dist/OpenBrush.dmg @@ -765,12 +760,6 @@ jobs: name: Windows Rift path: build_windows_rift - - name: Download Build Artifacts (Windows Monoscopic) - uses: actions/download-artifact@v4 - with: - name: Windows Monoscopic - path: build_windows_mono - - name: Download Build Artifacts (Android OpenXR) uses: actions/download-artifact@v4 with: @@ -792,8 +781,8 @@ jobs: - name: Download Build Artifacts (Mac) uses: actions/download-artifact@v4 with: - name: MacOS Monoscopic (DMG) - path: build_monoscopic_macos + name: MacOS (DMG) + path: build_macos - name: Package Artifacts for release env: @@ -805,15 +794,12 @@ jobs: mv build_android_pico/*/com.Icosa.OpenBrush*apk releases/OpenBrush_Pico_$VERSION.apk mv build_windows_openxr/StandaloneWindows64/ releases/OpenBrush_Desktop_$VERSION/ mv build_windows_rift/StandaloneWindows64/ releases/OpenBrush_Rift_$VERSION/ - mv build_windows_mono/StandaloneWindows64/ releases/OpenBrush_Mono_$VERSION/ - mv build_monoscopic_macos/*.dmg releases/OpenBrush_Mac_Mono_$VERSION.dmg + mv build_macos/*.dmg releases/OpenBrush_Mac_$VERSION.dmg cd releases zip -r OpenBrush_Desktop_$VERSION.zip OpenBrush_Desktop_$VERSION/ zip -r OpenBrush_Rift_$VERSION.zip OpenBrush_Rift_$VERSION/ - zip -r OpenBrush_Mono_$VERSION.zip OpenBrush_Mono_$VERSION/ rm -rf OpenBrush_Desktop_$VERSION rm -rf OpenBrush_Rift_$VERSION - rm -rf OpenBrush_Mono_$VERSION - name: Publish uses: softprops/action-gh-release@v2 @@ -917,20 +903,20 @@ jobs: with: name: Windows OpenXR path: build_windows_openxr - - name: Download Build Artifacts (MacOS Monoscopic Signed) + - name: Download Build Artifacts (MacOS Signed) uses: actions/download-artifact@v4 with: - name: MacOS Monoscopic (signed) - path: build_macos_monoscopic + name: MacOS (signed) + path: build_macos - name: Upload Build run: | - cd build_macos_monoscopic + cd build_macos tar xvfz OpenBrush.tgz cd - pip install -U jinjanator jinjanate Support/steam/app.vdf.j2 > app.vdf jinjanate Support/steam/main_depot.win.vdf.j2 > build_windows_openxr/main_depot.vdf - jinjanate Support/steam/main_depot.mac.vdf.j2 > build_macos_monoscopic/main_depot.vdf + jinjanate Support/steam/main_depot.mac.vdf.j2 > build_macos/main_depot.vdf jinjanate Support/steam/installscript_win.vdf.j2 > build_windows_openxr/installscript_win.vdf steamcmd +login $STEAM_USERNAME +run_app_build $(pwd)/app.vdf +quit env: diff --git a/Assets/Editor/BuildTiltBrush.cs b/Assets/Editor/BuildTiltBrush.cs index 3b3f4a9bd7..8e5652fcc8 100644 --- a/Assets/Editor/BuildTiltBrush.cs +++ b/Assets/Editor/BuildTiltBrush.cs @@ -111,9 +111,6 @@ public BuildFailedException(string message) private static readonly List> kValidSdkTargets = new List>() { - // Mono - new KeyValuePair(XrSdkMode.Monoscopic, BuildTarget.StandaloneWindows64), - // OpenXR new KeyValuePair(XrSdkMode.OpenXR, BuildTarget.StandaloneWindows64), new KeyValuePair(XrSdkMode.OpenXR, BuildTarget.Android), @@ -204,7 +201,6 @@ public static XrSdkMode GuiSelectedSdk set { EditorPrefs.SetString(kMenuPluginPref, value.ToString()); - Menu.SetChecked(kMenuPluginMono, value == XrSdkMode.Monoscopic); Menu.SetChecked(kMenuPluginOpenXr, value == XrSdkMode.OpenXR); #if OCULUS_SUPPORTED Menu.SetChecked(kMenuPluginOculus, value == XrSdkMode.Oculus); @@ -392,19 +388,6 @@ static bool MenuItem_BackgroundBuild_Validate() //======= SDKs ======= - [MenuItem(kMenuPluginMono, isValidateFunction: false, priority: 100)] - static void MenuItem_Plugin_Mono() - { - GuiSelectedSdk = XrSdkMode.Monoscopic; - } - - [MenuItem(kMenuPluginMono, isValidateFunction: true)] - static bool MenuItem_Plugin_Mono_Validate() - { - Menu.SetChecked(kMenuPluginMono, GuiSelectedSdk == XrSdkMode.Monoscopic); - return true; - } - [MenuItem(kMenuPluginOpenXr, isValidateFunction: false, priority: 110)] static void MenuItem_Plugin_OpenXr() { @@ -630,17 +613,6 @@ static public BuildTargetGroup TargetToGroup(BuildTarget buildTarget) } } - static public SdkMode XrTargetToSdk(XrSdkMode mode) - { - switch (mode) - { - case XrSdkMode.Monoscopic: - return SdkMode.Monoscopic; - default: - return SdkMode.UnityXR; - } - } - // Removes the the given suffix from text. // Returns true on success static bool RemoveSuffix(ref string text, string suffix) @@ -1200,9 +1172,6 @@ public TempSetXrPlugin(TiltBuildOptions tiltOptions) case XrSdkMode.Zapbox: targetXrPluginsRequired = new string[] { "Zappar.XR.ZapboxLoader" }; break; - case XrSdkMode.Monoscopic: - targetSettings.InitManagerOnStart = false; - break; default: break; } @@ -1466,7 +1435,7 @@ static void ShowBrushExportTextures() using (var unused = new TempHookUpSingletons()) { // Set consultUserConfig = false to keep user config from affecting the build output. - TiltBrushManifest manifest = App.Instance.GetMergedManifest(consultUserConfig: false); + TiltBrushManifest manifest = App.Instance.GetMergedManifest(forceExperimental: true); StringBuilder s = new StringBuilder(); foreach (BrushDescriptor desc in manifest.UniqueBrushes()) @@ -1558,8 +1527,7 @@ public static void DoBuild(TiltBuildOptions tiltOptions) "ProjectSettings/GraphicsSettings.asset"))) { var config = App.Config; - // TODO: can we think of a better way of switching to mono/something else in the future? - config.m_SdkMode = XrTargetToSdk(xrSdk); + config.m_SdkMode = SdkMode.UnityXR; config.m_AutoProfile = tiltOptions.AutoProfile; config.m_BuildStamp = stamp; //config.OnValidate(xrSdk, TargetToGroup(target)); @@ -1579,8 +1547,7 @@ public static void DoBuild(TiltBuildOptions tiltOptions) // to be run at build-time (ie when nobody has called Start(), Awake()). // TempHookupSingletons() has done just enough initialization to make it happy. // Also set consultUserConfig = false to keep user config from affecting the build output. - TiltBrushManifest manifest = App.Instance.GetMergedManifest( - consultUserConfig: false, forceExperimental: true); + TiltBrushManifest manifest = App.Instance.GetMergedManifest(forceExperimental: true); // Some sanity checks { diff --git a/Assets/Editor/PanelLister.cs b/Assets/Editor/PanelLister.cs index 7eee34d24e..e0d328e3c6 100644 --- a/Assets/Editor/PanelLister.cs +++ b/Assets/Editor/PanelLister.cs @@ -23,7 +23,7 @@ static void ListPanels() panelList.AppendLine($"m_Advanced\tm_Basic\tm_ModeGvr\tm_ModeMono\tm_ModeQuest\tm_ModeVr\tm_PanelPrefab\tm_ModeVrExperimental"); foreach (var panel in m_PanelMap) { - panelList.AppendLine($"{panel.m_Advanced}\t{panel.m_Basic}\t{panel.m_ModeGvr}\t{panel.m_ModeMono}\t{panel.m_ModeQuest}\t{panel.m_ModeVr}\t{panel.m_PanelPrefab}\t{panel.m_ModeVrExperimental}"); + panelList.AppendLine($"{panel.m_Advanced}\t{panel.m_Basic}\t{panel.m_ModeMono}\t{panel.m_ModeQuest}\t{panel.m_ModeVr}\t{panel.m_PanelPrefab}"); } diff --git a/Assets/Editor/PanelMapKeyDrawer.cs b/Assets/Editor/PanelMapKeyDrawer.cs index 6927f0e685..b17fc0620f 100644 --- a/Assets/Editor/PanelMapKeyDrawer.cs +++ b/Assets/Editor/PanelMapKeyDrawer.cs @@ -63,36 +63,19 @@ public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label) NextRect(baseX, pos.y, 10, baseHeight, 12); EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_ModeVr"), GUIContent.none); - NextRect(baseX, pos.y, 30, baseHeight, 30); - EditorGUI.LabelField(drawRect, new GUIContent("VR")); - - NextRect(baseX, pos.y, 10, baseHeight, 12); - EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_ModeVrExperimental"), - GUIContent.none); - NextRect(baseX, pos.y, 30, baseHeight, 30); - EditorGUI.LabelField(drawRect, new GUIContent("Exp")); - - NextRect(baseX, pos.y, 10, baseHeight, 12); - EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_ModeQuestExperimental"), - GUIContent.none); - NextRect(baseX, pos.y, 30, baseHeight, 30); - EditorGUI.LabelField(drawRect, new GUIContent("ExpQ")); - - NextRect(baseX, pos.y, 10, baseHeight, 12); - EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_ModeMono"), GUIContent.none); - NextRect(baseX, pos.y, 30, baseHeight, 30); - EditorGUI.LabelField(drawRect, new GUIContent("Mo", "Monoscopic")); + NextRect(baseX, pos.y, 40, baseHeight, 40); + EditorGUI.LabelField(drawRect, new GUIContent("PCVR")); NextRect(baseX, pos.y, 10, baseHeight, 12); EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_ModeQuest"), GUIContent.none); - NextRect(baseX, pos.y, 30, baseHeight, 30); - EditorGUI.LabelField(drawRect, new GUIContent("OQ", "Oculus Quest")); + NextRect(baseX, pos.y, 40, baseHeight, 40); + EditorGUI.LabelField(drawRect, new GUIContent("Quest", "Oculus Quest")); NextRect(baseX, pos.y, 10, baseHeight, 12); - EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_ModeGvr"), GUIContent.none); - NextRect(baseX, pos.y, 30, baseHeight, 30); - EditorGUI.LabelField(drawRect, new GUIContent("GVR")); + EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_ModeMono"), GUIContent.none); + NextRect(baseX, pos.y, 40, baseHeight, 60); + EditorGUI.LabelField(drawRect, new GUIContent("Mono", "Monoscopic")); NextRect(baseX, pos.y, 10, baseHeight, 12); EditorGUI.PropertyField(drawRect, prop.FindPropertyRelative("m_Basic"), GUIContent.none); diff --git a/Assets/Prefabs/NoPeekingCamera.prefab b/Assets/Prefabs/NoPeekingCamera.prefab index 4ab475a9ac..57d4efac12 100644 --- a/Assets/Prefabs/NoPeekingCamera.prefab +++ b/Assets/Prefabs/NoPeekingCamera.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 6492638988032190719} - component: {fileID: 4366673980723059407} - component: {fileID: 6241333446037012601} - m_Layer: 0 + m_Layer: 5 m_Name: NoPeekingCamera m_TagString: Ignore m_Icon: {fileID: 0} @@ -34,7 +34,7 @@ Transform: m_Children: - {fileID: 413004} - {fileID: 418946} - - {fileID: 489474} + - {fileID: 911356271401581444} - {fileID: 413530} - {fileID: 8410171649586590716} m_Father: {fileID: 0} @@ -151,7 +151,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb5310d4ad41cc24686ff24a0abda748, type: 3} m_Name: m_EditorClassIdentifier: + m_Heading: {fileID: 2983092942286120586} m_SketchLoadingUi: {fileID: 286790923345576475} + m_NonXRHelpURL: https://docs.openbrush.app/user-guide/monoscopic-mode --- !u!1 &140238 GameObject: m_ObjectHideFlags: 0 @@ -163,7 +165,7 @@ GameObject: - component: {fileID: 418946} - component: {fileID: 3371228} - component: {fileID: 2387590} - m_Layer: 17 + m_Layer: 5 m_Name: Mesh m_TagString: Untagged m_Icon: {fileID: 0} @@ -235,103 +237,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &143586 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 489474} - - component: {fileID: 2383960} - - component: {fileID: 10297204} - m_Layer: 17 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &489474 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143586} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.078, y: 0.38900018, z: 0.10699999} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 443338} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &2383960 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143586} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 543b312efaeb6aa4aa25a9e07e815953, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!102 &10297204 -TextMesh: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 143586} - m_Text: " Tiltasaurus says...\n No Peeking!" - m_OffsetZ: 0 - m_CharacterSize: 0.015 - m_LineSpacing: 1 - m_Anchor: 4 - m_Alignment: 1 - m_TabSize: 4 - m_FontSize: 32 - m_FontStyle: 0 - m_RichText: 1 - m_Font: {fileID: 12800000, guid: aa94fec06c672f74d86409a6979db921, type: 3} - m_Color: - serializedVersion: 2 - rgba: 4294967295 --- !u!1 &155226 GameObject: m_ObjectHideFlags: 0 @@ -343,7 +248,7 @@ GameObject: - component: {fileID: 413004} - component: {fileID: 3381284} - component: {fileID: 2338714} - m_Layer: 17 + m_Layer: 5 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -426,7 +331,7 @@ GameObject: - component: {fileID: 413530} - component: {fileID: 2364274} - component: {fileID: 10204362} - m_Layer: 17 + m_Layer: 5 m_Name: Category m_TagString: Untagged m_Icon: {fileID: 0} @@ -634,16 +539,16 @@ RectTransform: m_LocalScale: {x: 0.0025, y: 0.0025, z: 0.0025} m_ConstrainProportionsScale: 1 m_Children: + - {fileID: 630978965793830188} - {fileID: 5689798638485741962} - {fileID: 4894785073544231431} - - {fileID: 1131303945205074137} - - {fileID: 4178932762530763408} + - {fileID: 4875555268988913917} m_Father: {fileID: 443338} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: -0.038000107} + m_AnchoredPosition: {x: 0, y: -0.078} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4437145558877611219 @@ -842,6 +747,141 @@ MonoBehaviour: m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1573734845628677540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7721906838142688869} + - component: {fileID: 8205964720597243434} + - component: {fileID: 1464657527913837083} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7721906838142688869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573734845628677540} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 904834551594540007} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8205964720597243434 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573734845628677540} + m_CullTransparentMesh: 1 +--- !u!114 &1464657527913837083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573734845628677540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2100919791272594790 GameObject: m_ObjectHideFlags: 0 @@ -875,11 +915,11 @@ RectTransform: m_Children: - {fileID: 2638111108600025223} m_Father: {fileID: 8410171649586590716} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -120} + m_AnchoredPosition: {x: 0, y: -111.39996} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1928330968161714127 @@ -976,7 +1016,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &3331604220319500385 +--- !u!1 &2418423914818305576 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -984,70 +1024,247 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6449318793323638539} - - component: {fileID: 639102838445672671} + - component: {fileID: 4875555268988913917} + - component: {fileID: 3220745595112530957} + - component: {fileID: 8946969364917335011} + - component: {fileID: 4838710306112110406} m_Layer: 5 - m_Name: Item + m_Name: Help Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6449318793323638539 +--- !u!224 &4875555268988913917 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3331604220319500385} + m_GameObject: {fileID: 2418423914818305576} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2976052544196070531} - - {fileID: 8023065207140017517} - - {fileID: 2697015570847389550} - m_Father: {fileID: 3116164079771605471} - m_RootOrder: 0 + - {fileID: 904834551594540007} + m_Father: {fileID: 8410171649586590716} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2.4, y: -149.6} + m_SizeDelta: {x: 197.88, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &639102838445672671 +--- !u!222 &3220745595112530957 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2418423914818305576} + m_CullTransparentMesh: 1 +--- !u!114 &8946969364917335011 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3331604220319500385} + m_GameObject: {fileID: 2418423914818305576} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'More info on using Open Brush without VR:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 12 + m_fontSizeBase: 12 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -165.4031, y: 16.408669, z: 8.950348, w: 3.872204} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &4838710306112110406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2418423914818305576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjects: + - rid: 8355684332050841602 + references: + version: 2 + RefIds: + - rid: 8355684332050841602 + type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, + asm: Unity.Localization} + data: + m_Target: {fileID: 8946969364917335011} + m_TrackedProperties: + items: + - rid: 8355684332050841603 + m_UpdateType: 0 + - rid: 8355684332050841603 + type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, + asm: Unity.Localization} + data: + m_Localized: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 218558579745579008 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_PropertyPath: m_text +--- !u!1 &3331604220319500385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6449318793323638539} + - component: {fileID: 639102838445672671} + m_Layer: 5 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6449318793323638539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3331604220319500385} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2976052544196070531} + - {fileID: 8023065207140017517} + - {fileID: 2697015570847389550} + m_Father: {fileID: 3116164079771605471} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &639102838445672671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3331604220319500385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal @@ -1099,11 +1316,11 @@ RectTransform: - {fileID: 8467908165221074957} - {fileID: 102712877867131431} m_Father: {fileID: 8410171649586590716} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -83} + m_AnchoredPosition: {x: 0, y: -74.4} m_SizeDelta: {x: 300, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1847867622963271843 @@ -1198,7 +1415,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AlphaFadeSpeed: 0.15 ---- !u!1 &4316734770812203229 +--- !u!1 &4333366822911286920 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1206,195 +1423,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4178932762530763408} - - component: {fileID: 1804670819683889448} - - component: {fileID: 5341229340267931592} + - component: {fileID: 102712877867131431} + - component: {fileID: 5915223642259439387} + - component: {fileID: 2094713486907015822} + - component: {fileID: 570194408203025994} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Template m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4178932762530763408 + m_IsActive: 0 +--- !u!224 &102712877867131431 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4316734770812203229} + m_GameObject: {fileID: 4333366822911286920} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8410171649586590716} - m_RootOrder: 3 + m_Children: + - {fileID: 2657996401036598236} + - {fileID: 588423579390810819} + m_Father: {fileID: 5689798638485741962} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 197.88, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1804670819683889448 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5915223642259439387 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4316734770812203229} + m_GameObject: {fileID: 4333366822911286920} m_CullTransparentMesh: 1 ---- !u!114 &5341229340267931592 +--- !u!114 &2094713486907015822 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4316734770812203229} + m_GameObject: {fileID: 4333366822911286920} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "You can continue without a VR headset. Choose a sketch below to enter - Viewing Mode with the following controls:\n\nMouse: look around (press I to invert - up/down) \nW,A,S,D: move forward/back/left/right\nQ,E: move up/down\nHold shift - to move faster" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -61.764145, y: -95.308304, z: -53.75923, w: -38.724518} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4333366822911286920 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 102712877867131431} - - component: {fileID: 5915223642259439387} - - component: {fileID: 2094713486907015822} - - component: {fileID: 570194408203025994} - m_Layer: 5 - m_Name: Template - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &102712877867131431 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4333366822911286920} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2657996401036598236} - - {fileID: 588423579390810819} - m_Father: {fileID: 5689798638485741962} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 2} - m_SizeDelta: {x: 0, y: 150} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &5915223642259439387 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4333366822911286920} - m_CullTransparentMesh: 1 ---- !u!114 &2094713486907015822 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4333366822911286920} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1798,7 +1877,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &5779876023089213500 +--- !u!1 &6812850759890895917 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1806,75 +1885,557 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1131303945205074137} - - component: {fileID: 6580132714863173329} - - component: {fileID: 4821677423117870613} + - component: {fileID: 4819975770493435412} + - component: {fileID: 3760274468751633008} + - component: {fileID: 190549172735166888} m_Layer: 5 - m_Name: Image + m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1131303945205074137 +--- !u!224 &4819975770493435412 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5779876023089213500} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 6812850759890895917} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8410171649586590716} - m_RootOrder: 2 + m_Father: {fileID: 5689798638485741962} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -7.5, y: -0.5} + m_SizeDelta: {x: -35, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3760274468751633008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6812850759890895917} + m_CullTransparentMesh: 1 +--- !u!114 &190549172735166888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6812850759890895917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6991865534908863925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2976052544196070531} + - component: {fileID: 5213149964954912582} + - component: {fileID: 934122834382106253} + m_Layer: 5 + m_Name: Item Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2976052544196070531 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991865534908863925} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6449318793323638539} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5213149964954912582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991865534908863925} + m_CullTransparentMesh: 1 +--- !u!114 &934122834382106253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991865534908863925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7051219236974457440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 904834551594540007} + - component: {fileID: 4184418382703275785} + - component: {fileID: 2604098599225458528} + - component: {fileID: 6054634665160168264} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &904834551594540007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7051219236974457440} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7721906838142688869} + m_Father: {fileID: 4875555268988913917} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 380, y: 180} + m_AnchoredPosition: {x: 105.77, y: 0.5} + m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6580132714863173329 +--- !u!222 &4184418382703275785 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5779876023089213500} + m_GameObject: {fileID: 7051219236974457440} m_CullTransparentMesh: 1 ---- !u!114 &4821677423117870613 +--- !u!114 &2604098599225458528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7051219236974457440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aeca9105189a8a440a70db4df8804de5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6054634665160168264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7051219236974457440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2604098599225458528} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6241333446037012601} + m_TargetAssemblyTypeName: TiltBrush.InitNoHeadsetMode, Assembly-CSharp + m_MethodName: HandleHelpButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &7271298453558863823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 911356271401581444} + - component: {fileID: 7405870479433317310} + - component: {fileID: 2983092942286120586} + - component: {fileID: 367213507965825259} + m_Layer: 5 + m_Name: Heading Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &911356271401581444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7271298453558863823} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.10699999} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 443338} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.38900018} + m_SizeDelta: {x: 1.104868, y: 1.4460607} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &7405870479433317310 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7271298453558863823} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2983092942286120586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7271298453558863823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Failed to detect VR + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 0.5 + m_fontSizeBase: 0.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -30 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0.08442587, y: 0.64909506, z: 0.05726683, w: 0.62002563} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7405870479433317310} + m_maskType: 0 +--- !u!114 &367213507965825259 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5779876023089213500} + m_GameObject: {fileID: 7271298453558863823} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.5176471} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6812850759890895917 + m_TrackedObjects: + - rid: 6394126997433090060 + references: + version: 2 + RefIds: + - rid: 6394126997433090060 + type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, + asm: Unity.Localization} + data: + m_Target: {fileID: 2983092942286120586} + m_TrackedProperties: + items: + - rid: 6394126997433090061 + m_UpdateType: 0 + - rid: 6394126997433090061 + type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, + asm: Unity.Localization} + data: + m_Localized: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 217070349893754880 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_PropertyPath: m_text +--- !u!1 &7509677497865119354 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1882,51 +2443,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4819975770493435412} - - component: {fileID: 3760274468751633008} - - component: {fileID: 190549172735166888} + - component: {fileID: 2638111108600025223} + - component: {fileID: 2855464350492990026} + - component: {fileID: 6923965882176873253} m_Layer: 5 - m_Name: Label + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4819975770493435412 +--- !u!224 &2638111108600025223 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6812850759890895917} + m_GameObject: {fileID: 7509677497865119354} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5689798638485741962} + m_Father: {fileID: 4894785073544231431} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3760274468751633008 +--- !u!222 &2855464350492990026 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6812850759890895917} + m_GameObject: {fileID: 7509677497865119354} m_CullTransparentMesh: 1 ---- !u!114 &190549172735166888 +--- !u!114 &6923965882176873253 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6812850759890895917} + m_GameObject: {fileID: 7509677497865119354} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1940,7 +2501,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: View Sketch m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -1949,8 +2510,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1967,14 +2528,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -2009,7 +2570,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6991865534908863925 +--- !u!1 &8081055030279375977 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2017,66 +2578,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2976052544196070531} - - component: {fileID: 5213149964954912582} - - component: {fileID: 934122834382106253} + - component: {fileID: 7063341143212780120} + - component: {fileID: 7279067945763796406} + - component: {fileID: 5854695235748652438} m_Layer: 5 - m_Name: Item Background + m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2976052544196070531 +--- !u!224 &7063341143212780120 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6991865534908863925} + m_GameObject: {fileID: 8081055030279375977} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6449318793323638539} + m_Father: {fileID: 2151790082496267364} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0.2} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5213149964954912582 +--- !u!222 &7279067945763796406 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6991865534908863925} + m_GameObject: {fileID: 8081055030279375977} m_CullTransparentMesh: 1 ---- !u!114 &934122834382106253 +--- !u!114 &5854695235748652438 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6991865534908863925} + m_GameObject: {fileID: 8081055030279375977} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2085,7 +2646,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7509677497865119354 +--- !u!1 &8545941337398205663 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2093,51 +2654,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2638111108600025223} - - component: {fileID: 2855464350492990026} - - component: {fileID: 6923965882176873253} + - component: {fileID: 630978965793830188} + - component: {fileID: 1408844378251565} + - component: {fileID: 2445846288178429498} + - component: {fileID: 2788450684570689581} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Body Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2638111108600025223 +--- !u!224 &630978965793830188 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7509677497865119354} + m_GameObject: {fileID: 8545941337398205663} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4894785073544231431} + m_Father: {fileID: 8410171649586590716} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 197.88, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2855464350492990026 +--- !u!222 &1408844378251565 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7509677497865119354} + m_GameObject: {fileID: 8545941337398205663} m_CullTransparentMesh: 1 ---- !u!114 &6923965882176873253 +--- !u!114 &2445846288178429498 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7509677497865119354} + m_GameObject: {fileID: 8545941337398205663} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2151,7 +2713,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: View Sketch + m_text: "You can continue without a VR headset. Choose a sketch below to enter + Viewing Mode with the following controls:\n\nMouse: look around (press I to invert + up/down) \nW,A,S,D: move forward/back/left/right\nQ,E: move up/down\nHold shift + to move faster" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} @@ -2160,8 +2725,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2178,15 +2743,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 16 + m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -2214,85 +2779,49 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -61.764145, y: -118.35762, z: -53.75923, w: -38.724518} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8081055030279375977 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7063341143212780120} - - component: {fileID: 7279067945763796406} - - component: {fileID: 5854695235748652438} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7063341143212780120 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8081055030279375977} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2151790082496267364} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.2} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7279067945763796406 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8081055030279375977} - m_CullTransparentMesh: 1 ---- !u!114 &5854695235748652438 +--- !u!114 &2788450684570689581 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8081055030279375977} + m_GameObject: {fileID: 8545941337398205663} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_TrackedObjects: + - rid: 8355684332050841602 + references: + version: 2 + RefIds: + - rid: 8355684332050841602 + type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, + asm: Unity.Localization} + data: + m_Target: {fileID: 2445846288178429498} + m_TrackedProperties: + items: + - rid: 8355684332050841603 + m_UpdateType: 0 + - rid: 8355684332050841603 + type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, + asm: Unity.Localization} + data: + m_Localized: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 217069105871577088 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_PropertyPath: m_text diff --git a/Assets/Prefabs/Panels/LabsPanel.prefab b/Assets/Prefabs/Panels/LabsPanel.prefab index ad1a671dfe..d6d9284e21 100644 --- a/Assets/Prefabs/Panels/LabsPanel.prefab +++ b/Assets/Prefabs/Panels/LabsPanel.prefab @@ -255,7 +255,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 13 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3364774 MeshFilter: @@ -293,13 +293,16 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6466337336638288277} - {fileID: 4000010460034712} + - {fileID: 4000011596321798} + - {fileID: 6292014397156290862} - {fileID: 4000011251504288} - {fileID: 4000012282201364} - {fileID: 4000012490214276} + - {fileID: 6291905350315219778} - {fileID: 1643836230823162033} - {fileID: 4626429713668410} - - {fileID: 4000011596321798} - {fileID: 4000012572946912} - {fileID: 4959811239207079844} - {fileID: 1210818133549774434} @@ -347,7 +350,7 @@ Transform: - {fileID: 468986} - {fileID: 430698} m_Father: {fileID: 402684} - m_RootOrder: 10 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11452096 MonoBehaviour: @@ -465,7 +468,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 12 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6547610 BoxCollider: @@ -1028,7 +1031,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000013755556650 MeshFilter: @@ -1199,12 +1202,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010708462674} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.415, y: 0.15, z: 0.05} + m_LocalPosition: {x: 0, y: 0.6000004, z: 0.05} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000010418119032 MeshFilter: @@ -1366,7 +1369,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4000010460034712 Transform: m_ObjectHideFlags: 0 @@ -1380,7 +1383,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000010384743742 MeshFilter: @@ -1551,12 +1554,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000012054711126} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.415, y: 0.6, z: 0.05} + m_LocalPosition: {x: 0.415, y: 0.15, z: 0.05} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000013414599442 MeshFilter: @@ -1731,7 +1734,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 11 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000013181835044 MeshFilter: @@ -1829,7 +1832,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000012285989520 MeshFilter: @@ -2047,7 +2050,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4000011251504288 Transform: m_ObjectHideFlags: 0 @@ -2061,7 +2064,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000012292458500 MeshFilter: @@ -2237,7 +2240,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 5 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33062622632853984 MeshFilter: @@ -2386,7 +2389,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 8 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7459773723550717888 MeshFilter: @@ -2521,7 +2524,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1643836230823162033 Transform: m_ObjectHideFlags: 0 @@ -2535,7 +2538,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 4 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2078078264413487613 MeshFilter: @@ -2684,7 +2687,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4510907067803236372 MeshFilter: @@ -2800,3 +2803,515 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 0.01} m_Center: {x: 0, y: 0, z: -0.05} +--- !u!1 &6294566030148222674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6292014397156290862} + - component: {fileID: 6280797664358514420} + - component: {fileID: 6272788975588130916} + - component: {fileID: 6320537500852989196} + - component: {fileID: 6254052937444237984} + m_Layer: 16 + m_Name: PanelButton_SaveModel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6292014397156290862 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6294566030148222674} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.415, y: 0.6000004, z: 0.05} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6280797664358514420 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6294566030148222674} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &6272788975588130916 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6294566030148222674} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6320537500852989196 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6294566030148222674} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &6254052937444237984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6294566030148222674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c6859eec74651247968d56b594ac313, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Save selected strokes to model catalog + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: Save Model + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: b7fb5e24817634c4eb185b6d24afa87c, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 1 + m_Command: 56 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + references: + version: 2 + RefIds: [] +--- !u!1 &6295169059849678530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6291905350315219778} + - component: {fileID: 6280936243828533384} + - component: {fileID: 6273185573184273286} + - component: {fileID: 6321239972332227614} + - component: {fileID: 6253917691903006574} + m_Layer: 16 + m_Name: PanelButton_Drafting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6291905350315219778 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6295169059849678530} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.415, y: 0.14999962, z: 0.05} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6280936243828533384 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6295169059849678530} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &6273185573184273286 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6295169059849678530} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6321239972332227614 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6295169059849678530} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &6253917691903006574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6295169059849678530} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 943fba418b3347340bc4b20dfc353b17, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Drafting Lines + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 0} + m_AtlasTexture: 0 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_ShowRotation: 1 + m_RotationSpeedMultiplier: 14.3 + m_Command: 28 + m_Options: + - m_Description: Visible + m_Texture: {fileID: 2800000, guid: b3961aaf98d6a2d418267b50a97dc1f3, type: 3} + - m_Description: Transparent + m_Texture: {fileID: 2800000, guid: 30958851ea89a7c46bdb214571b82882, type: 3} + - m_Description: Hidden + m_Texture: {fileID: 2800000, guid: ff3938a5f23ea46409dd9389f1a1cd97, type: 3} + DisplayTextLabel: 0 + DisplayIcon: 1 + references: + version: 2 + RefIds: [] +--- !u!1 &6464453085985281487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6466337336638288277} + - component: {fileID: 6468953577034300013} + - component: {fileID: 6478340555185268185} + - component: {fileID: 6438941399148946665} + - component: {fileID: 6351870043360636743} + m_Layer: 16 + m_Name: PanelButton_MultiMirror + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6466337336638288277 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464453085985281487} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.415, y: 0.6000004, z: 0.05} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6468953577034300013 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464453085985281487} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &6478340555185268185 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464453085985281487} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6438941399148946665 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464453085985281487} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.01} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6351870043360636743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464453085985281487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67f633b3c98a3cd4da3a381ebd07cca9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Multi-Mirror + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 128947584183828496 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 8643f7dbd4cd20b48bb3b2b4c7ac1fe0, type: 3} + m_AtlasTexture: 0 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 0 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 15 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0.5, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 0 + m_LinkedUIObject: {fileID: 0} + m_LongPressDuration: 0.3 + references: + version: 2 + RefIds: [] diff --git a/Assets/Prefabs/Panels/LabsPanel_Mobile.prefab b/Assets/Prefabs/Panels/LabsPanel_Mobile.prefab index 6e7445721f..355e2b9fc4 100644 --- a/Assets/Prefabs/Panels/LabsPanel_Mobile.prefab +++ b/Assets/Prefabs/Panels/LabsPanel_Mobile.prefab @@ -30,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3364774 MeshFilter: @@ -69,10 +69,13 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4000012490214276} + - {fileID: 3219221680988349883} - {fileID: 1139538046860859100} - {fileID: 4626429713668410} - {fileID: 4000011596321798} + - {fileID: 2468152952838901612} - {fileID: 8809421544085413876} + - {fileID: 2468055462235645184} - {fileID: 499404} - {fileID: 4000011486688576} - {fileID: 415298} @@ -154,7 +157,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6547610 BoxCollider: @@ -357,7 +360,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000010418119032 MeshFilter: @@ -532,7 +535,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 6 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000013181835044 MeshFilter: @@ -862,7 +865,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33062622632853984 MeshFilter: @@ -978,6 +981,518 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!1 &2471131391549106940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2468055462235645184} + - component: {fileID: 2465741338722790106} + - component: {fileID: 2458014089478837322} + - component: {fileID: 2496962056029272354} + - component: {fileID: 2583710071636260494} + m_Layer: 16 + m_Name: PanelButton_SaveModel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2468055462235645184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471131391549106940} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.6149999, y: -0.2119999, z: 0.05} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2465741338722790106 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471131391549106940} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &2458014089478837322 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471131391549106940} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2496962056029272354 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471131391549106940} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &2583710071636260494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471131391549106940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c6859eec74651247968d56b594ac313, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Save selected strokes to model catalog + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: Save Model + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: b7fb5e24817634c4eb185b6d24afa87c, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 56 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 1 + m_LinkedUIObject: {fileID: 0} + references: + version: 2 + RefIds: [] +--- !u!1 &2471663056078174956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2468152952838901612} + - component: {fileID: 2466755025299766438} + - component: {fileID: 2458727450580922280} + - component: {fileID: 2497383291980388400} + - component: {fileID: 2583821116712190784} + m_Layer: 16 + m_Name: PanelButton_Drafting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2468152952838901612 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471663056078174956} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.215, y: -0.2119999, z: 0.05} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2466755025299766438 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471663056078174956} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &2458727450580922280 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471663056078174956} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2497383291980388400 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471663056078174956} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.1} + m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0} +--- !u!114 &2583821116712190784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471663056078174956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 943fba418b3347340bc4b20dfc353b17, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Drafting Lines + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 0} + m_AtlasTexture: 0 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_ShowRotation: 1 + m_RotationSpeedMultiplier: 14.3 + m_Command: 28 + m_Options: + - m_Description: Visible + m_Texture: {fileID: 2800000, guid: b3961aaf98d6a2d418267b50a97dc1f3, type: 3} + - m_Description: Transparent + m_Texture: {fileID: 2800000, guid: 30958851ea89a7c46bdb214571b82882, type: 3} + - m_Description: Hidden + m_Texture: {fileID: 2800000, guid: ff3938a5f23ea46409dd9389f1a1cd97, type: 3} + DisplayTextLabel: 0 + DisplayIcon: 1 + references: + version: 2 + RefIds: [] +--- !u!1 &3217728787759546849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3219221680988349883} + - component: {fileID: 3231233352384081475} + - component: {fileID: 3239850603676135927} + - component: {fileID: 3191439746185572551} + - component: {fileID: 3258234186096769897} + m_Layer: 16 + m_Name: PanelButton_MultiMirror + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3219221680988349883 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217728787759546849} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.41499996, y: 0.2119999, z: 0.05} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 402684} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3231233352384081475 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217728787759546849} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &3239850603676135927 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217728787759546849} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &3191439746185572551 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217728787759546849} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 0.01} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3258234186096769897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217728787759546849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67f633b3c98a3cd4da3a381ebd07cca9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Multi-Mirror + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 128947584183828496 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 8643f7dbd4cd20b48bb3b2b4c7ac1fe0, type: 3} + m_AtlasTexture: 0 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 0 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 15 + m_CommandParam: -1 + m_CommandParam2: -1 + m_RequiresPopup: 0 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0.5, z: 0} + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 0 + m_LinkedUIObject: {fileID: 0} + m_LongPressDuration: 0.3 + references: + version: 2 + RefIds: [] --- !u!1 &7776948797728914220 GameObject: m_ObjectHideFlags: 0 @@ -997,7 +1512,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1139538046860859100 Transform: m_ObjectHideFlags: 0 @@ -1011,7 +1526,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402684} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7705200013302925820 MeshFilter: @@ -1142,12 +1657,12 @@ PrefabInstance: - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.19999993 objectReference: {fileID: 0} - target: {fileID: 7020719392467468644, guid: 6e69b3bc22681fb44ac931399886cd69, type: 3} diff --git a/Assets/Prefabs/Panels/SettingsPanel.prefab b/Assets/Prefabs/Panels/SettingsPanel.prefab index 97f6678ac5..94120a6efe 100644 --- a/Assets/Prefabs/Panels/SettingsPanel.prefab +++ b/Assets/Prefabs/Panels/SettingsPanel.prefab @@ -849,7 +849,7 @@ MonoBehaviour: m_MeshCollider: {fileID: 6569620} m_ParticleBounds: {x: 0, y: 0, z: 0} m_PanelPopUpMap: - - m_PopUpPrefab: {fileID: 1330139964700006, guid: 8e5788c6293aee146b001d47a0947366, + - m_PopUpPrefab: {fileID: 1577505780274820, guid: aa4ede7afc03f5a4b817dc74f61b8422, type: 3} m_Command: 33 - m_PopUpPrefab: {fileID: 125142, guid: 7009260f148146a47b18e9c43e3802a2, type: 3} @@ -2187,7 +2187,7 @@ MonoBehaviour: m_CommandParam: -1 m_CommandParam2: -1 m_RequiresPopup: 1 - m_CenterPopupOnButton: 0 + m_CenterPopupOnButton: 1 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: SETTINGS_PANEL_HELP_BUTTON_POPUP m_LocalizedPopup: diff --git a/Assets/Prefabs/Panels/SettingsPanel_Mobile.prefab b/Assets/Prefabs/Panels/SettingsPanel_Mobile.prefab index 5ef5f6745d..c97fb6fb1a 100644 --- a/Assets/Prefabs/Panels/SettingsPanel_Mobile.prefab +++ b/Assets/Prefabs/Panels/SettingsPanel_Mobile.prefab @@ -622,11 +622,11 @@ MonoBehaviour: m_HoverScale: 1.1 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 - m_Command: 30 + m_Command: 33 m_CommandParam: -1 m_CommandParam2: -1 m_RequiresPopup: 1 - m_CenterPopupOnButton: 0 + m_CenterPopupOnButton: 1 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: SETTINGS_PANEL_HELP_BUTTON_POPUP m_LocalizedPopup: @@ -1555,27 +1555,9 @@ MonoBehaviour: m_MeshCollider: {fileID: 65899513144291816} m_ParticleBounds: {x: 0, y: 0, z: 0} m_PanelPopUpMap: - - m_PopUpPrefab: {fileID: 1577505780274820, guid: f0becab4eefa8c94aa53e6a2e4f12630, - type: 3} - m_Command: 30 - - m_PopUpPrefab: {fileID: 1867976667913174, guid: f454fbf43a220d645a14594cb79db0af, - type: 3} - m_Command: 20 - - m_PopUpPrefab: {fileID: 1867976667913174, guid: f454fbf43a220d645a14594cb79db0af, - type: 3} - m_Command: 70 - - m_PopUpPrefab: {fileID: 1867976667913174, guid: f454fbf43a220d645a14594cb79db0af, + - m_PopUpPrefab: {fileID: 1577505780274820, guid: aa4ede7afc03f5a4b817dc74f61b8422, type: 3} m_Command: 33 - - m_PopUpPrefab: {fileID: 1867976667913174, guid: f454fbf43a220d645a14594cb79db0af, - type: 3} - m_Command: 80 - - m_PopUpPrefab: {fileID: 1867976667913174, guid: f454fbf43a220d645a14594cb79db0af, - type: 3} - m_Command: 81 - - m_PopUpPrefab: {fileID: 1867976667913174, guid: f454fbf43a220d645a14594cb79db0af, - type: 3} - m_Command: 100 - m_PopUpPrefab: {fileID: 125142, guid: 7009260f148146a47b18e9c43e3802a2, type: 3} m_Command: 1000 m_PanelDescription: @@ -2110,7 +2092,7 @@ MonoBehaviour: m_Command: 20 m_CommandParam: -1 m_CommandParam2: -1 - m_RequiresPopup: 1 + m_RequiresPopup: 0 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: @@ -3454,7 +3436,7 @@ MonoBehaviour: m_Command: 100 m_CommandParam: -1 m_CommandParam2: -1 - m_RequiresPopup: 1 + m_RequiresPopup: 0 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: diff --git a/Assets/Prefabs/PopUps/PopUpWindow_ExitOpenBrush.prefab b/Assets/Prefabs/PopUps/PopUpWindow_ExitOpenBrush.prefab index 4989d21985..d1a5374e06 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_ExitOpenBrush.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_ExitOpenBrush.prefab @@ -579,9 +579,9 @@ MonoBehaviour: m_BlockUndoRedo: 0 m_IsLongPressPopUp: 0 m_OrderedPageButtons: [] - m_PrevButton: {fileID: 0} + m_PrevButton: {fileID: 1990516768702390} m_NextButton: {fileID: 0} - m_Title: {fileID: 0} + m_Title: {fileID: 8578634322448871378} m_SaveButton: {fileID: 114705786332752742} m_Title_Saving: Save your sketch? m_Title_NoSaving: Proceed? diff --git a/Assets/Prefabs/PopUps/PopUpWindow_Help.prefab b/Assets/Prefabs/PopUps/PopUpWindow_Help.prefab deleted file mode 100644 index 1c1d847074..0000000000 --- a/Assets/Prefabs/PopUps/PopUpWindow_Help.prefab +++ /dev/null @@ -1,853 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1013956416291354 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4219445656900884} - - component: {fileID: 33896364913653792} - - component: {fileID: 23948894913811622} - - component: {fileID: 114058032933004694} - - component: {fileID: 65937569612538212} - m_Layer: 16 - m_Name: HelpCenter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4219445656900884 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013956416291354} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.214, y: -0.13199997, z: -0.06} - m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4716675176553920} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33896364913653792 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013956416291354} - m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &23948894913811622 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013956416291354} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &114058032933004694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013956416291354} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c6859eec74651247968d56b594ac313, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: Help Center - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 76118256381386752 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: Opens in External Browser - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 76117892328382464 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 1ccda41d8c619b546b22b394248abea2, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 0 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 0 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.05 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Command: 33 - m_CommandParam: -1 - m_CommandParam2: -1 - m_RequiresPopup: 0 - m_CenterPopupOnButton: 0 - m_PopupOffset: {x: 0, y: 0, z: 0} - m_PopupText: - m_LocalizedPopup: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnDescription: - m_LocalizedToggleOnDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 0} - m_AllowUnavailable: 0 - m_LinkedUIObject: {fileID: 0} - references: - version: 2 - RefIds: [] ---- !u!65 &65937569612538212 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013956416291354} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.01} - m_Center: {x: 0, y: 0, z: -0.05} ---- !u!1 &1025750065563636 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4059193849943850} - - component: {fileID: 33945438526404500} - - component: {fileID: 23198251724127564} - m_Layer: 16 - m_Name: PopupBg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4059193849943850 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025750065563636} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4651150655564158} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33945438526404500 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025750065563636} - m_Mesh: {fileID: 4300002, guid: 2508ba61fbd9f70458d7284d9b499a14, type: 3} ---- !u!23 &23198251724127564 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025750065563636} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: db0305ff9081c3b448ac79e85d26e5d4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1180819805918058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4716675176553920} - m_Layer: 16 - m_Name: Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4716675176553920 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180819805918058} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3002481137361859821} - - {fileID: 4096470876169614} - - {fileID: 4219445656900884} - - {fileID: 4651150655564158} - m_Father: {fileID: 4884282046101004} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1197482442604334 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4651150655564158} - m_Layer: 16 - m_Name: HelpPopupMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4651150655564158 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1197482442604334} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4059193849943850} - - {fileID: 4240837486363406} - m_Father: {fileID: 4716675176553920} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1314086247394794 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4096470876169614} - - component: {fileID: 33605825188197590} - - component: {fileID: 23832623902835872} - - component: {fileID: 114088762219753278} - - component: {fileID: 65151130798194660} - m_Layer: 16 - m_Name: Release Notes - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4096470876169614 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314086247394794} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.214, y: -0.132, z: -0.06} - m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4716675176553920} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33605825188197590 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314086247394794} - m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} ---- !u!23 &23832623902835872 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314086247394794} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &114088762219753278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314086247394794} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c6859eec74651247968d56b594ac313, type: 3} - m_Name: - m_EditorClassIdentifier: - m_DescriptionType: 0 - m_DescriptionYOffset: 0 - m_DescriptionText: Release Notes - m_LocalizedDescription: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 76117800062083072 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionTextExtra: POPUP_HELP_BUTTON_DESCRIPTION_EXTRA_BROWSER - m_LocalizedDescriptionExtra: - m_TableReference: - m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 - m_TableEntryReference: - m_KeyId: 76117892328382464 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_DescriptionActivateSpeed: 12 - m_DescriptionZScale: 1 - m_ButtonTexture: {fileID: 2800000, guid: 77bf8765016e8ff4080d523e18a50722, type: 3} - m_AtlasTexture: 1 - m_ToggleButton: 0 - m_LongPressReleaseButton: 0 - m_ButtonHasPressedAudio: 0 - m_ZAdjustHover: -0.02 - m_ZAdjustClick: 0.05 - m_HoverScale: 1.1 - m_HoverBoxColliderGrow: 0.2 - m_AddOverlay: 0 - m_Command: 70 - m_CommandParam: -1 - m_CommandParam2: -1 - m_RequiresPopup: 0 - m_CenterPopupOnButton: 0 - m_PopupOffset: {x: 0, y: 0, z: 0} - m_PopupText: - m_LocalizedPopup: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnDescription: - m_LocalizedToggleOnDescription: - m_TableReference: - m_TableCollectionName: - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_ToggleOnTexture: {fileID: 0} - m_AllowUnavailable: 0 - m_LinkedUIObject: {fileID: 0} - references: - version: 2 - RefIds: [] ---- !u!65 &65151130798194660 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314086247394794} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.01} - m_Center: {x: 0, y: 0, z: -0.05} ---- !u!1 &1330139964700006 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4884282046101004} - - component: {fileID: 65876111884857662} - - component: {fileID: 114264731919910424} - - component: {fileID: 114180933628215120} - m_Layer: 16 - m_Name: PopUpWindow_Help - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4884282046101004 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1330139964700006} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.42369986, y: 9.294, z: 0.0048000813} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4716675176553920} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &65876111884857662 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1330139964700006} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 0.83, z: 0.01} - m_Center: {x: 0, y: 0, z: -0.0125} ---- !u!114 &114264731919910424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1330139964700006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac3bbf6d1bcd3034ab32fd1367d2a2d3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Background: {fileID: 1025750065563636} - m_TopBorder: {fileID: 1426551274687394} - m_BottomBorder: {fileID: 1426551274687394} - m_WindowText: {fileID: 2235105195396209540} - m_CharacterWidth: 0.175 - m_SubtitleCharacterWidth: 0.05625 - m_ButtonWidth: 0.6 - m_BaseButtonOffset: {x: 0, y: 0, z: 0} - m_ReticleBounds: {x: 1.65, y: 2, z: -0.35} - m_PopUpForwardOffset: -0.25 - m_AutoPlaceButtons: [] - m_TransitionDuration: 0.1 - m_OpenDelay: 0 - m_Persistent: 0 - m_AudioOnOpen: 1 - m_BlockUndoRedo: 0 - m_IsLongPressPopUp: 0 - m_OrderedPageButtons: [] - m_PrevButton: {fileID: 0} - m_NextButton: {fileID: 0} - m_ColorTransitionDuration: 0.2 ---- !u!114 &114180933628215120 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1330139964700006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 739d5b1996234d64992a2ae60c3723e9, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1426551274687394 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4240837486363406} - - component: {fileID: 33746060422048770} - - component: {fileID: 23477704909709270} - m_Layer: 16 - m_Name: PopupBorder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4240837486363406 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426551274687394} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4651150655564158} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33746060422048770 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426551274687394} - m_Mesh: {fileID: 4300000, guid: 2508ba61fbd9f70458d7284d9b499a14, type: 3} ---- !u!23 &23477704909709270 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426551274687394} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 77dd4ff8b1158a84397aba783cd0af05, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1490494727988678 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3002481137361859821} - - component: {fileID: 2651438933014298440} - - component: {fileID: 2235105195396209540} - m_Layer: 16 - m_Name: TextLine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3002481137361859821 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1490494727988678} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.002} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4716675176553920} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.433, y: 0.384} - m_SizeDelta: {x: 0.88, y: 0.25} - m_Pivot: {x: 0, y: 1} ---- !u!23 &2651438933014298440 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1490494727988678} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2235105195396209540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1490494727988678} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Description - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 1.915 - m_fontSizeBase: 1.915 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2651438933014298440} - m_maskType: 0 diff --git a/Assets/Prefabs/PopUps/PopUpWindow_HelpMobile.prefab b/Assets/Prefabs/PopUps/PopUpWindow_HelpLinks.prefab similarity index 99% rename from Assets/Prefabs/PopUps/PopUpWindow_HelpMobile.prefab rename to Assets/Prefabs/PopUps/PopUpWindow_HelpLinks.prefab index 9b00b6df28..4f1ae92789 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_HelpMobile.prefab +++ b/Assets/Prefabs/PopUps/PopUpWindow_HelpLinks.prefab @@ -165,7 +165,7 @@ GameObject: - component: {fileID: 114998092889480470} - component: {fileID: 114303534374012010} m_Layer: 16 - m_Name: PopUpWindow_HelpMobile + m_Name: PopUpWindow_HelpLinks m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -462,7 +462,7 @@ MonoBehaviour: m_Command: 70 m_CommandParam: -1 m_CommandParam2: -1 - m_RequiresPopup: 1 + m_RequiresPopup: 0 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: @@ -638,7 +638,7 @@ MonoBehaviour: m_Command: 81 m_CommandParam: -1 m_CommandParam2: -1 - m_RequiresPopup: 1 + m_RequiresPopup: 0 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: @@ -814,7 +814,7 @@ MonoBehaviour: m_Command: 33 m_CommandParam: -1 m_CommandParam2: -1 - m_RequiresPopup: 1 + m_RequiresPopup: 0 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: @@ -990,7 +990,7 @@ MonoBehaviour: m_Command: 80 m_CommandParam: -1 m_CommandParam2: -1 - m_RequiresPopup: 1 + m_RequiresPopup: 0 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} m_PopupText: diff --git a/Assets/Prefabs/PopUps/PopUpWindow_Help.prefab.meta b/Assets/Prefabs/PopUps/PopUpWindow_HelpLinks.prefab.meta similarity index 74% rename from Assets/Prefabs/PopUps/PopUpWindow_Help.prefab.meta rename to Assets/Prefabs/PopUps/PopUpWindow_HelpLinks.prefab.meta index 224ed0d778..d68af462ba 100644 --- a/Assets/Prefabs/PopUps/PopUpWindow_Help.prefab.meta +++ b/Assets/Prefabs/PopUps/PopUpWindow_HelpLinks.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e5788c6293aee146b001d47a0947366 +guid: aa4ede7afc03f5a4b817dc74f61b8422 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/PopUps/PopUpWindow_HelpMobile.prefab.meta b/Assets/Prefabs/PopUps/PopUpWindow_HelpMobile.prefab.meta deleted file mode 100644 index df108a86c4..0000000000 --- a/Assets/Prefabs/PopUps/PopUpWindow_HelpMobile.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f0becab4eefa8c94aa53e6a2e4f12630 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Icons/faq_sprite.png b/Assets/Resources/Icons/faq_sprite.png new file mode 100644 index 0000000000..f6cd70a493 Binary files /dev/null and b/Assets/Resources/Icons/faq_sprite.png differ diff --git a/Assets/Resources/Icons/faq_sprite.png.meta b/Assets/Resources/Icons/faq_sprite.png.meta new file mode 100644 index 0000000000..f43869afba --- /dev/null +++ b/Assets/Resources/Icons/faq_sprite.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: aeca9105189a8a440a70db4df8804de5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index bc548ac0f7..0b7636b5e7 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1924,12 +1924,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2032315650} - m_Father: {fileID: 1008953366} + m_Father: {fileID: 2084734315} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 79, y: 138} + m_AnchoredPosition: {x: 55.054993, y: 55.054993} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &66695122 @@ -3652,7 +3652,7 @@ MonoBehaviour: m_EnableGlbVersion2: 1 m_DebugUpload: 1 m_TbtSettings: {fileID: 11400000, guid: 86eb32a1d469be44a99294025e7795de, type: 2} - m_ReplaceBrushesOnLoad: 1 + m_ReplaceBrushesOnLoad: 0 m_BrushReplacementMap: [] m_IntroSketchUsdFilename: m_IntroSketchSpeed: 1 @@ -10708,35 +10708,30 @@ MonoBehaviour: shader: {fileID: 4800000, guid: f9a08f3ab0b238144b0879d7e2f23a95, type: 3} icon: {fileID: 2800000, guid: bc3c505962723cf44a605851212f406e, type: 3} cylindrical: 1 - experimental: 0 hdr: 0 - mode: 1 info: shader: {fileID: 4800000, guid: 364d9b04fdb9b704bb3629008701d08e, type: 3} icon: {fileID: 2800000, guid: 83ef8e3ba97ff0547b7be2042945a3b7, type: 3} cylindrical: 0 - experimental: 0 hdr: 0 - mode: 2 info: shader: {fileID: 4800000, guid: 6261961f4821a79409739fd23c0c9afd, type: 3} icon: {fileID: 2800000, guid: 49bb25c6aaecebd4db489bf5e3f45052, type: 3} cylindrical: 0 - experimental: 1 hdr: 0 - mode: 3 info: shader: {fileID: 4800000, guid: 91c5170cd03857741b3200cd3c996595, type: 3} icon: {fileID: 2800000, guid: 2950926868f0c9b4db5a871ce378909c, type: 3} cylindrical: 1 - experimental: 1 hdr: 0 - mode: 4 info: shader: {fileID: 4800000, guid: 86a7aa4de119e334986bfae53f8889dd, type: 3} icon: {fileID: 2800000, guid: f3301a86069400c44bb6d99e01af3ff6, type: 3} cylindrical: 1 - experimental: 1 hdr: 1 m_NumColors: 7 --- !u!114 &652605566 @@ -14011,12 +14006,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1344159570} - m_Father: {fileID: 1008953366} + m_Father: {fileID: 2084734315} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 193.51004, y: 138} + m_AnchoredPosition: {x: 169.56503, y: 55.054993} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &993616878 @@ -14318,10 +14313,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1382731250} - - {fileID: 66695121} - - {fileID: 993616877} - - {fileID: 1158145242} + - {fileID: 2084734315} m_Father: {fileID: 8282789105019930893} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14354,15 +14346,15 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1008953365} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1366, y: 768} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -16380,12 +16372,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 140066843} - m_Father: {fileID: 1008953366} + m_Father: {fileID: 2084734315} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 308.01996, y: 138} + m_AnchoredPosition: {x: 284.07495, y: 55.054993} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1158145243 @@ -18700,12 +18692,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 582806602} - m_Father: {fileID: 1008953366} + m_Father: {fileID: 2084734315} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 193.51004, y: 252.51999} + m_AnchoredPosition: {x: 169.56503, y: 169.57498} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1382731251 @@ -21944,7 +21936,7 @@ RectTransform: m_GameObject: {fileID: 1590074096} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 2.2022} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 822889419} @@ -21953,7 +21945,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -37.5, y: -37.5} + m_AnchoredPosition: {x: -60, y: -60} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1590074098 @@ -29745,383 +29737,262 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 778caecccd06f444ba3d7b451cfa06e9, type: 3} m_Name: m_EditorClassIdentifier: - m_UxExplorationPrefab: {fileID: 0} m_PanelMap: - m_PanelPrefab: {fileID: 0} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 0 m_ModeMono: 0 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 0 - m_PanelPrefab: {fileID: 1000012735434356, guid: c6dbb15c5329b944497772a3599dd74c, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 118774, guid: c736e99e0a7c16340b761d84a4e808d4, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 0} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 0 m_ModeMono: 0 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 0 - m_PanelPrefab: {fileID: 1101360102585764085, guid: fa1eb8dde798ea54e95ddf4744cc180e, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 1865477934442706, guid: b57c606c7c23d6547b7b136a53c8118c, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 1 m_Advanced: 0 - m_PanelPrefab: {fileID: 152754, guid: 1f98c5464e57ca042986684865c6c8e0, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 1 m_Advanced: 0 - - m_PanelPrefab: {fileID: 176644, guid: 82e9561ccc4f9d646b8d328e8a736c62, type: 3} + - m_PanelPrefab: {fileID: 0} m_ModeVr: 0 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 - m_ModeMono: 1 + m_ModeMono: 0 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 - m_Advanced: 1 + m_Advanced: 0 - m_PanelPrefab: {fileID: 1543516286980528, guid: 8143a5d07ca44f3469740c23ad742c85, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 1002243801905128, guid: d544a96827bc4554993b25909f237c88, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 199434, guid: ec8bfc3daf3140a40b74246785710580, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 109932, guid: 11a71a8b70e19254abe00d5e569f428c, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 8342536447398316161, guid: 16ea55ab72c703c449db50dfbaffc5f5, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 1119189097058054, guid: 847238bd90b3e504492e50630277ef33, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 0 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 160214, guid: dd236f92a2697d449b2a758b7b42ec17, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 192154, guid: 540f829b5f1ea7743be79be2582e1a38, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 141494, guid: 0053ac08708148641bd0b629e8e3e2e5, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 159900, guid: c5747cd6fc6d92b4b941d58d649877ef, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 162374, guid: 1cb57c13fa6b529488ff10d4d47cd359, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 176644, guid: 898df100b7777cd40b9e51b8df90ddfd, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 1770738498669030, guid: 657b9653200e3f64ca3fd359d83c79cf, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 176644, guid: a7d344d3f87214b40adfb90fb5ab01f5, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 0 m_ModeMono: 0 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 0 - m_PanelPrefab: {fileID: 141494, guid: a71be6f60d7230c46b3f4c851f6f5933, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 1 - - m_PanelPrefab: {fileID: 118774, guid: ccf3c045c4caee34386327d7023b10cf, type: 3} + - m_PanelPrefab: {fileID: 0} m_ModeVr: 0 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 1284305836696064, guid: 9e8a7ecc535b86c42a6d0752d1590e9f, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 1769143079597906, guid: dcbd812f016610942a11d04c69dc3a7c, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 1000816559363234, guid: f5b291cbc819737469486452ea6748b8, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 1 m_Advanced: 1 - m_PanelPrefab: {fileID: 1272310558547734, guid: 6f8d5fd33c3621841bfcab343300ec72, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 1185791771697282, guid: 757ae00c043360a4bae0ebf6c3ef5254, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 1736516471272333392, guid: 0bc38db0c1bbe92458ab389448255167, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 199434, guid: da22f81315a0e724887dc7c8b38b71b4, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 4470684113445036128, guid: 67d9c3f0bfc633440901c0281f11b46e, type: 3} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 1 m_ModeMono: 0 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 1513704753240124, guid: 16a494a2ae54cba4d94ef4c0515bdaee, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 1 - - m_PanelPrefab: {fileID: 176644, guid: a7d344d3f87214b40adfb90fb5ab01f5, type: 3} + - m_PanelPrefab: {fileID: 0} m_ModeVr: 0 - m_ModeVrExperimental: 0 - m_ModeQuestExperimental: 0 m_ModeMono: 0 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 0 - m_PanelPrefab: {fileID: 1272310558547734, guid: 38a4b95a5f6824c41994709bfbd012ad, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 0 m_ModeMono: 1 m_ModeQuest: 0 - m_ModeGvr: 0 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 199434, guid: 87deb34c3f9672645984b6032a6c1f8d, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 199434, guid: de22d465caf3f20419b98ce5290a7e57, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 199434, guid: 6dafd36d9488aba4a998d2ef69ea2553, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 176644, guid: d620d9effac3e6c4eaae746d85edf13c, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 - m_PanelPrefab: {fileID: 160214, guid: 2b8f8dc5c7f70ba4eaf8f6a7181d8fc7, type: 3} m_ModeVr: 1 - m_ModeVrExperimental: 1 - m_ModeQuestExperimental: 1 m_ModeMono: 1 m_ModeQuest: 1 - m_ModeGvr: 1 m_Basic: 0 m_Advanced: 1 m_WandPanelsRotationFeedbackInterval: 20 @@ -30443,7 +30314,6 @@ GameObject: m_Component: - component: {fileID: 1802399861} - component: {fileID: 1802399860} - - component: {fileID: 1802399859} - component: {fileID: 1802399858} - component: {fileID: 1802399862} m_Layer: 5 @@ -30470,29 +30340,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &1802399859 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1802399857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 --- !u!223 &1802399860 Canvas: m_ObjectHideFlags: 0 @@ -34232,6 +34079,46 @@ Transform: m_Father: {fileID: 1043378877} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} +--- !u!1 &2084734314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2084734315} + m_Layer: 5 + m_Name: Touchscreen Keys Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2084734315 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084734314} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1382731250} + - {fileID: 66695121} + - {fileID: 993616877} + - {fileID: 1158145242} + m_Father: {fileID: 1008953366} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 288.58, y: 279.5} + m_SizeDelta: {x: 750, y: 500} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2088774266 GameObject: m_ObjectHideFlags: 0 @@ -34936,10 +34823,10 @@ RectTransform: m_Father: {fileID: 1802399861} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 493.5, y: 346} - m_SizeDelta: {x: 75, y: 75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2129205351 MonoBehaviour: diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 450ce51ed6..d8e529b1cd 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -22,6 +22,7 @@ using System.Runtime.CompilerServices; using UnityEngine; using Newtonsoft.Json; +using TMPro; #if USD_SUPPORTED using Unity.Formats.USD; #endif @@ -57,7 +58,7 @@ public partial class App : MonoBehaviour // want to have a different config file for your edition of the app. public const string kConfigFileName = "Open Brush.cfg"; // The name of the App folder (In the user's Documents folder) - original Tilt Brush used "Tilt Brush" - // If you are forking Open Brush, you may want to leave this as "Open Brush" or not. + // If you are forking Open Brush, you may want to leave this as "Open Brush" or not. public const string kAppFolderName = "Open Brush"; // The data folder used on Google Drive. public const string kDriveFolderName = kAppDisplayName; @@ -545,7 +546,7 @@ void Awake() gameObject.AddComponent(); } - m_Manifest = GetMergedManifest(consultUserConfig: true); + m_Manifest = GetMergedManifest(); m_HttpServer = GetComponentInChildren(); if (!Config.IsMobileHardware) @@ -599,8 +600,11 @@ void Start() // Use of ControllerConsoleScript must wait until Start() ControllerConsoleScript.m_Instance.AddNewLine(GetStartupString()); - if (!VrSdk.IsHmdInitialized()) + if (!VrSdk.IsHmdInitialized() && !UserConfig.Flags.EnableMonoscopicMode) { + // If XR is disabled or fails to initialize + // and we haven't enabled monoscopic mode + // then fall back to the 2d View-only mode CreateFailedToDetectVrDialog(); } else @@ -757,15 +761,6 @@ void Start() SwitchState(); -#if USD_SUPPORTED - if (Config.IsExperimental && !string.IsNullOrEmpty(Config.m_IntroSketchUsdFilename)) - { - var gobject = ImportUsd.ImportWithAnim(Config.m_IntroSketchUsdFilename); - - gobject.transform.SetParent(App.Scene.transform, false); - } -#endif - if (Config.m_AutoProfile || m_UserConfig.Profiling.AutoProfile) { StateChanged += AutoProfileOnStartAndQuit; @@ -929,7 +924,10 @@ void Update() { OnIntroComplete(); } - else if (Config.IsExperimental) + else if (!VrSdk.IsHmdInitialized() || + UserConfig.Flags.SkipIntro || + UserConfig.Flags.DisableXrMode || + UserConfig.Flags.EnableMonoscopicMode) { OnIntroComplete(); PanelManager.m_Instance.ReviveFloatingPanelsForStartup(); @@ -1770,15 +1768,13 @@ public void RefreshUserConfig() public void CreateFailedToDetectVrDialog(string msg = null, bool allowViewing = true) { GameObject dialog = Instantiate(m_ErrorDialog); - var textXf = dialog.transform.Find("Text"); - var textMesh = textXf.GetComponent(); - if (msg == null) + var initScript = dialog.GetComponent(); + if (!string.IsNullOrEmpty(msg)) { - msg = "Failed to detect VR"; + var textMesh = initScript.m_Heading; + textMesh.text = @$" Tiltasaurus says... + {msg}"; } - textMesh.text = string.Format(@" Tiltasaurus says... - {0}", msg); - var initScript = dialog.GetComponent(); initScript.ShowSketchSelectorUi(allowViewing && !StartupError); } @@ -2183,15 +2179,12 @@ void OnPlaybackComplete() } } - public TiltBrushManifest GetMergedManifest(bool consultUserConfig, bool forceExperimental = false) + public TiltBrushManifest GetMergedManifest(bool forceExperimental = false) { var manifest = m_Manifest; if (Config.IsExperimental || forceExperimental) { - // At build time, we don't want the user config to affect the build output. - if ((consultUserConfig - && m_UserConfig.Flags.ShowDangerousBrushes - && m_ManifestExperimental != null) || forceExperimental) + if (m_ManifestExperimental != null) { manifest = Instantiate(m_Manifest); manifest.AppendFrom(m_ManifestExperimental); diff --git a/Assets/Scripts/BrushCatalog.cs b/Assets/Scripts/BrushCatalog.cs index 8964206fe8..7a21c122f5 100644 --- a/Assets/Scripts/BrushCatalog.cs +++ b/Assets/Scripts/BrushCatalog.cs @@ -104,6 +104,11 @@ public List GuiBrushList void Awake() { m_Instance = this; + Init(); + } + + public void Init() + { m_GuidToBrush = new Dictionary(); m_MaterialToBrush = new Dictionary(); m_AllBrushes = new HashSet(); @@ -115,7 +120,6 @@ void Awake() m_MaterialToBrush.Add(m_BlocksMaterials[i].brushDescriptor.Material, m_BlocksMaterials[i].brushDescriptor); } - Shader.SetGlobalTexture("_GlobalNoiseTexture", m_GlobalNoiseTexture); } @@ -178,7 +182,7 @@ public void BeginReload() } // Postprocess: put brushes into parse-friendly list - + m_GuiBrushList.Clear(); foreach (var brush in m_GuidToBrush.Values) { if (brush.m_HiddenInGui) @@ -195,8 +199,6 @@ public Brush[] GetTagFilteredBrushList() string[] includeTags = App.UserConfig.Brushes.IncludeTags; string[] excludeTags = App.UserConfig.Brushes.ExcludeTags; - Dictionary test = App.UserConfig.Brushes.AddTagsToBrushes; - if (includeTags == null) { Debug.LogError("There will be no brushes because there are no 'include' tags."); diff --git a/Assets/Scripts/Config.cs b/Assets/Scripts/Config.cs index 5cede9a23a..7ff74dcbbb 100644 --- a/Assets/Scripts/Config.cs +++ b/Assets/Scripts/Config.cs @@ -526,6 +526,8 @@ public bool GetIsExperimental() public void SetIsExperimental(bool active) { PlayerPrefs.SetInt("ExperimentalMode", active ? 1 : 0); + BrushCatalog.m_Instance.Init(); + BrushCatalog.m_Instance.BeginReload(); } void Awake() @@ -533,13 +535,6 @@ void Awake() m_SingletonState = this; m_WasExperimentalAtStartup = GetIsExperimental(); - // Force mono to experimental and quit. - if (m_SdkMode == SdkMode.Monoscopic && !m_WasExperimentalAtStartup) - { - SetIsExperimental(true); - Application.Quit(); - } - #if UNITY_EDITOR if (!string.IsNullOrEmpty(m_FakeCommandLineArgsInEditor)) { diff --git a/Assets/Scripts/GUI/BaseButton.cs b/Assets/Scripts/GUI/BaseButton.cs index 777826807f..979e9c642a 100644 --- a/Assets/Scripts/GUI/BaseButton.cs +++ b/Assets/Scripts/GUI/BaseButton.cs @@ -139,7 +139,9 @@ override protected void Awake() // since some buttons are in prefabs rather than in the scene. bool selfDestruct = m_AddOverlay; - if (m_AddOverlay && Config.IsExperimental) + // TODO Trace which buttons have this set and decide what to do + // If they are the labs panel then fine. + if (m_AddOverlay) { GameObject overlay = Instantiate(App.Config.m_LabsButtonOverlayPrefab); overlay.transform.SetParent(transform, false); diff --git a/Assets/Scripts/GUI/ExitTiltBrushPopUpWindow.cs b/Assets/Scripts/GUI/ExitTiltBrushPopUpWindow.cs index 36c503953a..0c1bab4f85 100644 --- a/Assets/Scripts/GUI/ExitTiltBrushPopUpWindow.cs +++ b/Assets/Scripts/GUI/ExitTiltBrushPopUpWindow.cs @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +using TMPro; using UnityEngine; namespace TiltBrush @@ -19,7 +20,7 @@ namespace TiltBrush public class ExitTiltBrushPopUpWindow : PopUpWindow { - [SerializeField] protected TextMesh m_Title; + [SerializeField] protected TextMeshPro m_Title; [SerializeField] protected SaveAndConfirmButton m_SaveButton; [SerializeField] private string m_Title_Saving; diff --git a/Assets/Scripts/GUI/PanelManager.cs b/Assets/Scripts/GUI/PanelManager.cs index 188d320c56..60197c98c6 100644 --- a/Assets/Scripts/GUI/PanelManager.cs +++ b/Assets/Scripts/GUI/PanelManager.cs @@ -24,11 +24,8 @@ public struct PanelMapKey { public GameObject m_PanelPrefab; public bool m_ModeVr; - public bool m_ModeVrExperimental; - public bool m_ModeQuestExperimental; public bool m_ModeMono; public bool m_ModeQuest; - public bool m_ModeGvr; public bool m_Basic; public bool m_Advanced; @@ -36,13 +33,9 @@ public bool IsValidForSdkMode(SdkMode mode) { switch (mode) { - case SdkMode.UnityXR when Config.IsExperimental && App.Config.IsMobileHardware: - return m_ModeQuestExperimental; - case SdkMode.UnityXR when Config.IsExperimental && !App.Config.IsMobileHardware: - return m_ModeVrExperimental; - case SdkMode.UnityXR when !Config.IsExperimental && App.Config.IsMobileHardware: + case SdkMode.UnityXR when App.Config.IsMobileHardware: return m_ModeQuest; - case SdkMode.UnityXR when !Config.IsExperimental && !App.Config.IsMobileHardware: + case SdkMode.UnityXR when !App.Config.IsMobileHardware: return m_ModeVr; case SdkMode.Monoscopic: return m_ModeMono; @@ -66,8 +59,6 @@ public class PanelManager : MonoBehaviour public const string kPlayerPrefAdvancedMode = "AdvancedMode"; - [SerializeField] protected GameObject m_UxExplorationPrefab; - [SerializeField] protected PanelMapKey[] m_PanelMap; [SerializeField] float m_WandPanelsRotationFeedbackInterval = 20.0f; @@ -471,15 +462,6 @@ public void Init() m_PanelsCustomized = false; m_AdvancedModeRevealActive = false; - if (Config.IsExperimental) - { - // If we've got a UX exploration prefab, instantiate it here. - if (m_UxExplorationPrefab != null) - { - m_UxExploration = Instantiate(m_UxExplorationPrefab); - } - } - TintWandPaneVisuals(true); // Set the MipMap bias for mobile builds (as there is more compression on the textures) @@ -1101,15 +1083,6 @@ void UpdateWandPanelsOriginAngle(float fDiff, float fOffset = 0) public void UpdatePanels() { - if (Config.IsExperimental) - { - if (m_UxExploration != null) - { - LockUxExplorationToController(); - return; - } - } - UnityEngine.Profiling.Profiler.BeginSample("PanelManager.UpdatePanels"); // Lock panels to the controller if we've got 6dof controls. if (SketchControlsScript.m_Instance.ActiveControlsType == @@ -1668,16 +1641,6 @@ public void ResetPaneVisuals() } } - public void LockUxExplorationToController() - { - if (Config.IsExperimental) - { - Transform baseTransform = InputManager.Wand.Geometry.MainAxisAttachPoint; - m_UxExploration.transform.position = baseTransform.position; - m_UxExploration.transform.rotation = baseTransform.rotation; - } - } - public void LockPanelsToController() { Transform rBaseTransform = InputManager.Wand.Geometry.MainAxisAttachPoint; diff --git a/Assets/Scripts/GUI/TiltBrushWatermark.cs b/Assets/Scripts/GUI/TiltBrushWatermark.cs index 2daeb716e9..bf814d0d3d 100644 --- a/Assets/Scripts/GUI/TiltBrushWatermark.cs +++ b/Assets/Scripts/GUI/TiltBrushWatermark.cs @@ -46,10 +46,6 @@ void Refresh() if (CameraConfig.Watermark && !App.Config.IsMobileHardware) { m_WatermarkStyle = WatermarkStyle.Standard; - if (Config.IsExperimental) - { - m_WatermarkStyle = WatermarkStyle.Labs; - } } } diff --git a/Assets/Scripts/GUI/ViewModeUI.cs b/Assets/Scripts/GUI/ViewModeUI.cs index bddd8ab589..d70724bc42 100644 --- a/Assets/Scripts/GUI/ViewModeUI.cs +++ b/Assets/Scripts/GUI/ViewModeUI.cs @@ -9,7 +9,7 @@ public class ViewModeUI : MonoBehaviour void Awake() { - m_UiRoot.SetActive(!App.VrSdk.IsHmdInitialized()); + m_UiRoot.SetActive(!App.VrSdk.IsHmdInitialized() || App.Config.m_SdkMode == SdkMode.Monoscopic); } public void HandleCloseButton() diff --git a/Assets/Scripts/InitNoHeadsetMode.cs b/Assets/Scripts/InitNoHeadsetMode.cs index 1c5ff27bbb..7db038acf6 100644 --- a/Assets/Scripts/InitNoHeadsetMode.cs +++ b/Assets/Scripts/InitNoHeadsetMode.cs @@ -19,8 +19,9 @@ namespace TiltBrush { public class InitNoHeadsetMode : MonoBehaviour { - + public TextMeshPro m_Heading; public GameObject m_SketchLoadingUi; + public string m_NonXRHelpURL; void Start() { @@ -76,5 +77,10 @@ public void ShowSketchSelectorUi(bool active = true) { m_SketchLoadingUi.SetActive(active); } + + public void HandleHelpButton() + { + SketchControlsScript.m_Instance.OpenURLAndInformUser(m_NonXRHelpURL); + } } } diff --git a/Assets/Scripts/Input/ControllerConsoleScript.cs b/Assets/Scripts/Input/ControllerConsoleScript.cs index acf8165691..1258a1f470 100644 --- a/Assets/Scripts/Input/ControllerConsoleScript.cs +++ b/Assets/Scripts/Input/ControllerConsoleScript.cs @@ -111,10 +111,7 @@ void Awake() InputManager.OnSwapControllers += AttachToBrush; - if (Config.IsExperimental) - { - m_AutosaveIcon.gameObject.SetActive(true); - } + m_AutosaveIcon.gameObject.SetActive(true); } void OnDestroy() @@ -396,13 +393,10 @@ void UpdateBackgroundWidth() vClockAnchorPos.x = -fBGWidth; m_Clock.localPosition = vClockAnchorPos; - if (Config.IsExperimental) - { - //position autosave dot on the right hand side. - Vector3 vAutosavePos = m_AutosaveIcon.localPosition; - vAutosavePos.x = fBGWidth; - m_AutosaveIcon.localPosition = vAutosavePos; - } + //position autosave dot on the right hand side. + Vector3 vAutosavePos = m_AutosaveIcon.localPosition; + vAutosavePos.x = fBGWidth; + m_AutosaveIcon.localPosition = vAutosavePos; } private void AttachToBrush() diff --git a/Assets/Scripts/InputManager.cs b/Assets/Scripts/InputManager.cs index 6c26ea6a9f..666a87181b 100644 --- a/Assets/Scripts/InputManager.cs +++ b/Assets/Scripts/InputManager.cs @@ -59,7 +59,7 @@ public enum SketchCommands LockToController, Scale, Sensitivity, - Reset, + Reset, // Advanced Keyboard Shortcut mode only Undo, Redo, Delete, @@ -107,22 +107,21 @@ public enum KeyboardShortcut Delete, Abort, - SaveNew, - ExportAll, - SwitchCamera, + SaveNew, // Advanced Keyboard Shortcut mode only + SwitchCamera, // Advanced Keyboard Shortcut mode only _Unused_1, _Unused_4, - ViewOnly, - ToggleScreenMirroring, - PreviousTool, - NextTool, + ViewOnly, // Advanced Keyboard Shortcut mode only + ToggleScreenMirroring, // Advanced Keyboard Shortcut mode only + PreviousTool, // Advanced Keyboard Shortcut mode only + NextTool, // Advanced Keyboard Shortcut mode only _Unused_2, _Unused_3, - CycleSymmetryMode, - Export, - StoreHeadTransform, - RecallHeadTransform, - ToggleLightType, + CycleSymmetryMode, // Advanced Keyboard Shortcut mode only + Export, // Advanced Keyboard Shortcut mode only + StoreHeadTransform, // Advanced Keyboard Shortcut mode only + RecallHeadTransform, // Advanced Keyboard Shortcut mode only + ToggleLightType, // Advanced Keyboard Shortcut mode only CheckStrokes, @@ -137,11 +136,11 @@ public enum KeyboardShortcut PositionMonoCamera, - ToggleHeadStationaryOrWobble, - ToggleHeadStationaryOrFollow, + ToggleHeadStationaryOrWobble, // Advanced Keyboard Shortcut mode only + ToggleHeadStationaryOrFollow, // Advanced Keyboard Shortcut mode only - DecreaseSlowFollowSmoothing, - IncreaseSlowFollowSmoothing, + DecreaseSlowFollowSmoothing, // Advanced Keyboard Shortcut mode only + IncreaseSlowFollowSmoothing, // Advanced Keyboard Shortcut mode only ToggleGVRAudio, @@ -150,14 +149,14 @@ public enum KeyboardShortcut ExtendDemoTimer, InstantUpload, - TossWidget, + TossWidget, // Advanced Keyboard Shortcut mode only - ToggleProfile, + ToggleProfile, // Advanced Keyboard Shortcut mode only CameraMoveLeft, CameraMoveRight, CameraMoveUp, CameraMoveDown, - FlyMode, + FlyMode, // Advanced Keyboard Shortcut mode only InvertLook, SprintMode } @@ -176,23 +175,23 @@ public enum KeyboardShortcut { (int)KeyboardShortcut.AdvanceTimeline, new[] { Key.Equals } }, { (int)KeyboardShortcut.TimelineHome, new[] { Key.Home } }, { (int)KeyboardShortcut.TimelineEnd, new[] { Key.End } }, - { (int)KeyboardShortcut.Reset, new[] { Key.Space } }, + { (int)KeyboardShortcut.Reset, new[] { Key.Space } }, // Advanced Keyboard Shortcut mode only { (int)KeyboardShortcut.Undo, new[] { Key.Z } }, { (int)KeyboardShortcut.Redo, new[] { Key.X } }, { (int)KeyboardShortcut.Delete, new[] { Key.Delete } }, { (int)KeyboardShortcut.Abort, new[] { Key.Escape } }, - { (int)KeyboardShortcut.SaveNew, new[] { Key.S } }, - { (int)KeyboardShortcut.ToggleProfile, new[] { Key.K } }, + { (int)KeyboardShortcut.SaveNew, new[] { Key.S } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.ToggleProfile, new[] { Key.K } }, // Advanced Keyboard Shortcut mode only // Context-dependent - { (int)KeyboardShortcut.SwitchCamera, new[] { Key.C } }, - { (int)KeyboardShortcut.ViewOnly, new[] { Key.H } }, - { (int)KeyboardShortcut.ToggleScreenMirroring, new[] { Key.M } }, - { (int)KeyboardShortcut.PreviousTool, new[] { Key.LeftArrow } }, - { (int)KeyboardShortcut.NextTool, new[] { Key.RightArrow } }, - { (int)KeyboardShortcut.CycleSymmetryMode, new[] { Key.F2 } }, - { (int)KeyboardShortcut.Export, new[] { Key.E } }, - { (int)KeyboardShortcut.StoreHeadTransform, new[] { Key.O } }, // Also checks for shift + { (int)KeyboardShortcut.SwitchCamera, new[] { Key.C } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.ViewOnly, new[] { Key.H } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.ToggleScreenMirroring, new[] { Key.M } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.PreviousTool, new[] { Key.LeftArrow } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.NextTool, new[] { Key.RightArrow } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.CycleSymmetryMode, new[] { Key.F2 } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.Export, new[] { Key.E } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.StoreHeadTransform, new[] { Key.O } }, // Also checks for shift. Advanced Keyboard Shortcut mode only { (int)KeyboardShortcut.RecallHeadTransform, new[] { Key.O } }, { (int)KeyboardShortcut.ToggleLightType, new[] { Key.P } }, @@ -209,15 +208,15 @@ public enum KeyboardShortcut { (int)KeyboardShortcut.PositionMonoCamera, new[] { Key.LeftAlt, Key.RightAlt } }, - { (int)KeyboardShortcut.ToggleHeadStationaryOrWobble, new[] { Key.Q } }, - { (int)KeyboardShortcut.ToggleHeadStationaryOrFollow, new[] { Key.W } }, + { (int)KeyboardShortcut.ToggleHeadStationaryOrWobble, new[] { Key.Q } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.ToggleHeadStationaryOrFollow, new[] { Key.W } }, // Advanced Keyboard Shortcut mode only - { (int)KeyboardShortcut.DecreaseSlowFollowSmoothing, new[] { Key.E } }, - { (int)KeyboardShortcut.IncreaseSlowFollowSmoothing, new[] { Key.R } }, + { (int)KeyboardShortcut.DecreaseSlowFollowSmoothing, new[] { Key.E } }, // Advanced Keyboard Shortcut mode only + { (int)KeyboardShortcut.IncreaseSlowFollowSmoothing, new[] { Key.R } }, // Advanced Keyboard Shortcut mode only { (int)KeyboardShortcut.ToggleGVRAudio, new[] { Key.Backquote } }, - { (int)KeyboardShortcut.TossWidget, new[] { Key.Y } }, + { (int)KeyboardShortcut.TossWidget, new[] { Key.Y } }, // Advanced Keyboard Shortcut mode only }; // Separate keymap for when we launch but no VR headset is detected. @@ -229,7 +228,7 @@ public enum KeyboardShortcut { (int)KeyboardShortcut.CameraMoveRight, new[] { Key.D } }, { (int)KeyboardShortcut.CameraMoveUp, new[] { Key.Q } }, { (int)KeyboardShortcut.CameraMoveDown, new[] { Key.E } }, - { (int)KeyboardShortcut.FlyMode, new[] { Key.F } }, + { (int)KeyboardShortcut.FlyMode, new[] { Key.F } }, // Advanced Keyboard Shortcut mode only { (int)KeyboardShortcut.InvertLook, new[] { Key.I } }, { (int)KeyboardShortcut.SprintMode, new[] { Key.LeftShift } }, }; diff --git a/Assets/Scripts/Model.cs b/Assets/Scripts/Model.cs index cfb70ac916..4d1ec6db26 100644 --- a/Assets/Scripts/Model.cs +++ b/Assets/Scripts/Model.cs @@ -445,10 +445,7 @@ out ImportMaterialCollector GameObject LoadUsd(List warnings) { #if USD_SUPPORTED - if (Config.IsExperimental) - { - return ImportUsd.Import(m_Location.AbsolutePath, out warnings); - } + return ImportUsd.Import(m_Location.AbsolutePath, out warnings); #endif m_LoadError = new LoadError("usd not supported"); return null; @@ -546,7 +543,7 @@ public void LoadModelAsync(bool useThreadedImageLoad) bool allowUsd = false; #if USD_SUPPORTED - allowUsd = Config.IsExperimental; + allowUsd = true; #endif // Experimental usd loading. diff --git a/Assets/Scripts/ModelCatalog.cs b/Assets/Scripts/ModelCatalog.cs index 92d67f5a6f..f85569a231 100644 --- a/Assets/Scripts/ModelCatalog.cs +++ b/Assets/Scripts/ModelCatalog.cs @@ -237,12 +237,9 @@ void ProcessDirectory(string sPath, Dictionary oldModels) // Models we download from Poly are called ".gltf2", but ".gltf" is more standard string[] extensions = { ".obj", ".fbx", ".gltf2", ".gltf", ".glb", ".ply" }; - if (Config.IsExperimental) - { - var l = new List(extensions); - l.AddRange(new string[] { ".usda", ".usdc", ".usd" }); - extensions = l.ToArray(); - } + var l = new List(extensions); + l.AddRange(new string[] { ".usda", ".usdc", ".usd" }); + extensions = l.ToArray(); for (int i = 0; i < aFiles.Length; ++i) { diff --git a/Assets/Scripts/Save/MetadataUtils.cs b/Assets/Scripts/Save/MetadataUtils.cs index a0873b4ed0..3e61de4bfb 100644 --- a/Assets/Scripts/Save/MetadataUtils.cs +++ b/Assets/Scripts/Save/MetadataUtils.cs @@ -283,7 +283,7 @@ public static void VerifyMetadataVersion(SketchMetadata data) // Converts data.Set_deprecated[] to data.ModelIndex[].InSet static void Upgrade_Set_ModelIndexInSet(SketchMetadata data) { - if (data.Set_deprecated == null) + if (data == null || data.Set_deprecated == null) { return; } diff --git a/Assets/Scripts/Save/SaveLoadScript.cs b/Assets/Scripts/Save/SaveLoadScript.cs index d7f9c34cf0..3aab4c4728 100644 --- a/Assets/Scripts/Save/SaveLoadScript.cs +++ b/Assets/Scripts/Save/SaveLoadScript.cs @@ -670,7 +670,9 @@ public bool Load(SceneFileInfo fileInfo, bool bAdditive = false) if (jsonData.CanvasTransformInSceneSpace != TrTransform.identity) { Debug.LogWarning("This file has an unsupported, experimental Canvas Transform specified."); - if (Config.IsExperimental) + // Was experimental mode. Needs testing. + // Saves sketches are unlikely to trigger this under normal usage + if (false) { Coords.CanvasLocalPose = jsonData.CanvasTransformInSceneSpace; } @@ -717,7 +719,7 @@ public bool Load(SceneFileInfo fileInfo, bool bAdditive = false) } - // It's proving to be rather complex to merge widgets/models etc. + // It's proving to be rather complex to merge widgets/models etc. // For now skip all that when loading additively with the if (!bAdditive) below // This should cover the majority of use cases. diff --git a/Assets/Scripts/Save/SketchWriter.cs b/Assets/Scripts/Save/SketchWriter.cs index c28336df0f..15fd9b30ba 100644 --- a/Assets/Scripts/Save/SketchWriter.cs +++ b/Assets/Scripts/Save/SketchWriter.cs @@ -296,12 +296,11 @@ public static bool ReadMemory(Stream stream, Guid[] brushList, bool bAdditive, o SketchMemoryScript.m_Instance.ClearMemory(); } - if (Config.IsExperimental) + // Previously was on in experimental builds only. + // Maybe investigate making this a user setting? + if (App.Config.m_ReplaceBrushesOnLoad) { - if (App.Config.m_ReplaceBrushesOnLoad) - { - brushList = brushList.Select(guid => App.Config.GetReplacementBrush(guid)).ToArray(); - } + brushList = brushList.Select(guid => App.Config.GetReplacementBrush(guid)).ToArray(); } oldGroupToNewGroup = new Dictionary(); diff --git a/Assets/Scripts/SelectionManager.cs b/Assets/Scripts/SelectionManager.cs index 3de9f7b00b..b24a26ae03 100644 --- a/Assets/Scripts/SelectionManager.cs +++ b/Assets/Scripts/SelectionManager.cs @@ -434,9 +434,9 @@ void UpdateSelectionVisibility() { bool showSelection = ShouldShowSelectedStrokes; - if (Config.IsExperimental) + if (!App.Config.m_UseBatchedBrushes) { - // Strokes of type BrushStroke currently only exist in experimental builds. + // Strokes of type BrushStroke currently only exist when batching is off // The list of selected strokes might be quite long, so we want to avoid iterating it. foreach (Stroke stroke in m_SelectedStrokes) { diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index ed57d8adf5..569e0c3bab 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -928,11 +928,8 @@ void Start() m_CurrentGazeObject = -1; m_EatInputGazeObject = false; + // Previously set to 0 in experimental builds int hidePanelsDelay = 1; - if (Config.IsExperimental) - { - hidePanelsDelay = 0; - } StartCoroutine(DelayedHidePanels(hidePanelsDelay)); @@ -1334,7 +1331,7 @@ void UpdateStandardInput() { UnityEngine.Profiling.Profiler.BeginSample("SketchControlScript.UpdateStandardInput"); //debug keys - if (Config.IsExperimental) + if (App.UserConfig.Flags.AdvancedKeyboardShortcuts) { var camTool = SketchSurfacePanel.m_Instance.ActiveTool as MultiCamTool; @@ -1342,11 +1339,6 @@ void UpdateStandardInput() { IssueGlobalCommand(GlobalCommands.SaveNew, 1); } - else if (InputManager.m_Instance.GetKeyboardShortcutDown( - InputManager.KeyboardShortcut.ExportAll)) - { - IssueGlobalCommand(GlobalCommands.ExportAll); - } else if (InputManager.m_Instance.GetKeyboardShortcutDown( InputManager.KeyboardShortcut.SwitchCamera) && camTool != null) { @@ -3973,27 +3965,23 @@ IEnumerator ExportCoroutine() private void SaveModel() { #if USD_SUPPORTED - if (Config.IsExperimental) - { - - var current = SaveLoadScript.m_Instance.SceneFile; - string basename = (current.Valid) - ? Path.GetFileNameWithoutExtension(current.FullPath) - : "Untitled"; - string directoryName = FileUtils.GenerateNonexistentFilename( - App.ModelLibraryPath(), basename, ""); - - string usdname = Path.Combine(directoryName, basename + ".usd"); - // TODO: export selection only, though this is still only experimental. The blocking - // issue to implement this is that the export collector needs to expose this as an option. - // - // SelectionManager.m_Instance.HasSelection - // ? SelectionManager.m_Instance.SelectedStrokes - // : null - ExportUsd.ExportPayload(usdname); - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, "Model created!"); - } + var current = SaveLoadScript.m_Instance.SceneFile; + string basename = (current.Valid) + ? Path.GetFileNameWithoutExtension(current.FullPath) + : "Untitled"; + string directoryName = FileUtils.GenerateNonexistentFilename( + App.ModelLibraryPath(), basename, ""); + + string usdname = Path.Combine(directoryName, basename + ".usd"); + // TODO: export selection only, though this is still only experimental. The blocking + // issue to implement this is that the export collector needs to expose this as an option. + // + // SelectionManager.m_Instance.HasSelection + // ? SelectionManager.m_Instance.SelectedStrokes + // : null + ExportUsd.ExportPayload(usdname); + OutputWindowScript.m_Instance.CreateInfoCardAtController( + InputManager.ControllerName.Brush, "Model created!"); #endif } @@ -4401,26 +4389,10 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, EatGazeObjectInput(); break; case GlobalCommands.FAQ: - //launch external window and tell the user we did so - EatGazeObjectInput(); - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(m_HelpCenterURL); + OpenURLAndInformUser(m_HelpCenterURL); break; case GlobalCommands.ReleaseNotes: - //launch external window and tell the user we did so - EatGazeObjectInput(); - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(m_ReleaseNotesURL); + OpenURLAndInformUser(m_ReleaseNotesURL); break; case GlobalCommands.ExportRaw: if (!FileUtils.CheckDiskSpaceWithError(App.UserExportPath())) @@ -4489,35 +4461,7 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, break; } case GlobalCommands.About: - EatGazeObjectInput(); - - if (!App.Config.IsMobileHardware) - { - // Launch external window and tell the user we did so/ - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - - // This call is Windows only. - if ((Application.platform == RuntimePlatform.WindowsPlayer) || - (Application.platform == RuntimePlatform.WindowsEditor)) - { - if (!Application.isEditor) - { - System.Diagnostics.Process.Start("notepad.exe", - Path.Combine(App.PlatformPath(), "NOTICE")); - } - else - { - System.Diagnostics.Process.Start("notepad.exe", - Path.Combine(App.SupportPath(), "ThirdParty/GeneratedThirdPartyNotices.txt")); - } - } - else if (App.Config.IsMobileHardware) - { - App.OpenURL(m_ThirdPartyNoticesURL); - } + OpenURLAndInformUser(m_ThirdPartyNoticesURL); break; case GlobalCommands.StencilsDisabled: SketchMemoryScript.m_Instance.PerformAndRecordCommand(new StencilsVisibleCommand()); @@ -4531,11 +4475,10 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, SketchSurfacePanel.m_Instance.EatToolsInput(); break; case GlobalCommands.StraightEdgeShape: - if (Config.IsExperimental) - { - PointerManager.m_Instance.StraightEdgeGuide.SetTempShape( - (StraightEdgeGuideScript.Shape)iParam1); - } + // Previously experimental mode only. + // Untested and currently untriggerable. + PointerManager.m_Instance.StraightEdgeGuide.SetTempShape( + (StraightEdgeGuideScript.Shape)iParam1); break; case GlobalCommands.DeleteSketch: { @@ -4599,17 +4542,8 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, break; } case GlobalCommands.ViewOnlineGallery: - { - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(kTiltBrushGalleryUrl); - EatGazeObjectInput(); - break; - } + OpenURLAndInformUser(kTiltBrushGalleryUrl); + break; case GlobalCommands.CancelUpload: VrAssetService.m_Instance.CancelUpload(); break; @@ -4630,19 +4564,12 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, } break; case GlobalCommands.ShowGoogleDrive: - EatGazeObjectInput(); - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } string baseDriveUrl = "https://drive.google.com"; string driveURL = !App.GoogleIdentity.LoggedIn ? baseDriveUrl : string.Format( "http://accounts.google.com/AccountChooser?Email={0}&continue={1}", App.GoogleIdentity.Profile.email, baseDriveUrl); - App.OpenURL(driveURL); + OpenURLAndInformUser(driveURL); break; case GlobalCommands.GoogleDriveSync: App.DriveSync.SyncEnabled = !App.DriveSync.SyncEnabled; @@ -4703,24 +4630,10 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, SaveModel(); break; case GlobalCommands.ViewPolyPage: - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(kPolyMainPageUri); - EatGazeObjectInput(); + OpenURLAndInformUser(kPolyMainPageUri); break; case GlobalCommands.ViewPolyGallery: - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(kBlocksGalleryUrl); - EatGazeObjectInput(); + OpenURLAndInformUser(kBlocksGalleryUrl); break; case GlobalCommands.ExportListed: StartCoroutine(ExportListAndQuit()); @@ -4871,47 +4784,16 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, } break; case GlobalCommands.ShowTos: - // Launch external window and tell the user we did so - EatGazeObjectInput(); - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(m_TosURL); + OpenURLAndInformUser(m_TosURL); break; case GlobalCommands.ShowPrivacy: - // Launch external window and tell the user we did so - EatGazeObjectInput(); - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(m_PrivacyURL); + OpenURLAndInformUser(m_PrivacyURL); break; case GlobalCommands.ShowQuestSideLoading: - // Launch external window and tell the user we did so - EatGazeObjectInput(); - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(m_QuestSideLoadingHowToURL); + OpenURLAndInformUser(m_QuestSideLoadingHowToURL); break; case GlobalCommands.ShowContribution: - EatGazeObjectInput(); - if (!App.Config.IsMobileHardware) - { - OutputWindowScript.m_Instance.CreateInfoCardAtController( - InputManager.ControllerName.Brush, - kRemoveHeadsetFyi, fPopScalar: 0.5f); - } - App.OpenURL(m_ContributionURL); + OpenURLAndInformUser(m_ContributionURL); break; case GlobalCommands.UnloadReferenceImageCatalog: ReferenceImageCatalog.m_Instance.UnloadAllImages(); @@ -4939,16 +4821,13 @@ public void IssueGlobalCommand(GlobalCommands rEnum, int iParam1 = -1, EatGazeObjectInput(); break; case GlobalCommands.OpenScriptsCommandsList: - // TODO refactor code above to use this method - OpenUrl($"http://localhost:{App.HttpServer.HttpPort}/help/commands"); + OpenURLAndInformUser($"http://localhost:{App.HttpServer.HttpPort}/help/commands"); break; case GlobalCommands.OpenScriptsList: - // TODO refactor code above to use this method - OpenUrl($"http://localhost:{App.HttpServer.HttpPort}/scripts"); + OpenURLAndInformUser($"http://localhost:{App.HttpServer.HttpPort}/scripts"); break; case GlobalCommands.OpenExampleScriptsList: - // TODO refactor code above to use this method - OpenUrl($"http://localhost:{App.HttpServer.HttpPort}/examplescripts"); + OpenURLAndInformUser($"http://localhost:{App.HttpServer.HttpPort}/examplescripts"); break; case GlobalCommands.RepaintOptions: break; // Intentionally blank. case GlobalCommands.Null: break; // Intentionally blank. @@ -4977,15 +4856,16 @@ private void LoadNamed(string path, bool quickload, bool additive) } } - private void OpenUrl(string url) + public void OpenURLAndInformUser(string url) { + // On desktop - launch external browser and inform the user + // On mobile - the browser appears over the app if (!App.Config.IsMobileHardware) { OutputWindowScript.m_Instance.CreateInfoCardAtController( InputManager.ControllerName.Brush, kRemoveHeadsetFyi, fPopScalar: 0.5f); } - App.OpenURL(url); EatGazeObjectInput(); } @@ -5013,13 +4893,11 @@ public bool IsCommandActive(GlobalCommands rEnum, int iParam = -1) case GlobalCommands.YouTubeChat: return m_YouTubeChatWidget != null; case GlobalCommands.StencilsDisabled: return m_WidgetManager.StencilsDisabled; case GlobalCommands.StraightEdgeShape: - if (Config.IsExperimental) - { - return PointerManager.m_Instance.StraightEdgeGuide.TempShape == (StraightEdgeGuideScript.Shape)iParam || - (PointerManager.m_Instance.StraightEdgeGuide.TempShape == StraightEdgeGuideScript.Shape.None - && PointerManager.m_Instance.StraightEdgeGuide.CurrentShape == (StraightEdgeGuideScript.Shape)iParam); - } - else return false; + // Previously experimental mode only. + // Untested and currently untriggerable. + return PointerManager.m_Instance.StraightEdgeGuide.TempShape == (StraightEdgeGuideScript.Shape)iParam || + (PointerManager.m_Instance.StraightEdgeGuide.TempShape == StraightEdgeGuideScript.Shape.None + && PointerManager.m_Instance.StraightEdgeGuide.CurrentShape == (StraightEdgeGuideScript.Shape)iParam); case GlobalCommands.Disco: return LightsControlScript.m_Instance.DiscoMode; case GlobalCommands.ToggleGroupStrokesAndWidgets: return SelectionManager.m_Instance.SelectionIsInOneGroup; case GlobalCommands.ToggleProfiling: return UnityEngine.Profiling.Profiler.enabled; diff --git a/Assets/Scripts/Tools/DropperTool.cs b/Assets/Scripts/Tools/DropperTool.cs index 41610273e2..625c087c8e 100644 --- a/Assets/Scripts/Tools/DropperTool.cs +++ b/Assets/Scripts/Tools/DropperTool.cs @@ -284,7 +284,7 @@ void SetDescriptionInfo(Color rColor, float fSize, BrushDescriptor rBrush, Strok if (rBrush != null) { sBrushDescription = rBrush.Description; - if (Config.IsExperimental && !string.IsNullOrEmpty(rBrush.m_DescriptionExtra)) + if (!string.IsNullOrEmpty(rBrush.m_DescriptionExtra)) { sBrushDescription = string.Format( "{0} ({1})", rBrush.Description, rBrush.m_DescriptionExtra); diff --git a/Assets/Scripts/Tools/MultiCamTool.cs b/Assets/Scripts/Tools/MultiCamTool.cs index 6216516d59..ab6053b0c8 100644 --- a/Assets/Scripts/Tools/MultiCamTool.cs +++ b/Assets/Scripts/Tools/MultiCamTool.cs @@ -2098,22 +2098,18 @@ void AdjustGifPreset(int i) { return; } - // Limit shipping version to a single gif preset - if (Config.IsExperimental) - { - m_iGifPreset = (m_iGifPreset + i + m_AutoGifPresets.Length) % m_AutoGifPresets.Length; + m_iGifPreset = (m_iGifPreset + i + m_AutoGifPresets.Length) % m_AutoGifPresets.Length; - var preset = m_AutoGifPresets[m_iGifPreset]; + var preset = m_AutoGifPresets[m_iGifPreset]; - // Apply the preset - var text = m_Cameras[1].m_OffsetTransform.Find("Text"); - if (text != null) + // Apply the preset + var text = m_Cameras[1].m_OffsetTransform.Find("Text"); + if (text != null) + { + var tmpro = text.GetComponent(); + if (tmpro != null) { - var tmpro = text.GetComponent(); - if (tmpro != null) - { - tmpro.text = preset.name; - } + tmpro.text = preset.name; } } } diff --git a/Assets/Scripts/Tools/TeleportTool.cs b/Assets/Scripts/Tools/TeleportTool.cs index 3621f32867..024b57e1ad 100644 --- a/Assets/Scripts/Tools/TeleportTool.cs +++ b/Assets/Scripts/Tools/TeleportTool.cs @@ -488,42 +488,6 @@ void Update() // If we're not locking to a controller, update our transforms now, instead of in LateUpdate. UpdateTransformsFromControllers(); } - -#if JOGGING_ENABLED - if (Config.IsExperimental) { - // Add jogging motion. - Vector3 currentHeadPosition = ViewpointScript.Head.position; - if (m_JogLastHeadPosition != Vector3.zero) { - Vector3 headMotion = currentHeadPosition - m_JogLastHeadPosition; - - TrTransform newScene = Coords.ScenePose; - float motionFactor = Vector3.Dot(headMotion, m_TeleportTargetVector); - motionFactor = (motionFactor - m_MotionMinThreshhold) / (m_MotionMaxThreshhold - m_MotionMinThreshhold); - motionFactor = Mathf.SmoothStep(0, 1, motionFactor) * (m_MotionMaxThreshhold - m_MotionMinThreshhold); - newScene.translation -= m_MotionSpeedup * motionFactor * m_TeleportTargetVector.normalized; - - if (headMotion.y > m_JogMinThreshold) { - m_JogStage = JogState.JoggingUp; - } - if (m_JogStage != JogState.NotJogging) { - newScene.translation -= m_JogSpeed * m_TeleportTargetVector; - if (m_JogStage == JogState.JoggingUp && headMotion.y < 0) { - m_JogStage = JogState.JoggingDown; - } else if (m_JogStage == JogState.JoggingDown && headMotion.y >= 0) { - m_JogStage = JogState.NotJogging; - } - } - - // newScene might have gotten just a little bit invalid. - // Enforce the invariant that teleport always sends you - // to a scene which is MakeValidPose(scene) - newScene = SketchControlsScript.MakeValidScenePose(newScene, BoundsRadius); - Coords.ScenePose = newScene; - } - m_JogLastHeadPosition = currentHeadPosition; - } -#endif - } override public void LateUpdateTool() diff --git a/Assets/Scripts/UserConfig.cs b/Assets/Scripts/UserConfig.cs index b3eadfa0b4..5ee6fc9a11 100644 --- a/Assets/Scripts/UserConfig.cs +++ b/Assets/Scripts/UserConfig.cs @@ -42,18 +42,33 @@ public struct FlagsConfig public bool HighResolutionSnapshots; // Deprecated public bool ShowDroppedFrames; public bool LargeMeshSupport; + public bool EnableMonoscopicMode; + + private bool? m_DisableXrMode; + public bool DisableXrMode + { + get + { +#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX + return true; +#else + return m_DisableXrMode ?? false; +#endif + } + set { m_DisableXrMode = value; } + } public bool EnableApiRemoteCalls; public bool EnableApiCorsHeaders; - bool? m_ShowDangerousBrushes; - public bool ShowDangerousBrushes + bool? m_AdvancedKeyboardShortcuts; + public bool AdvancedKeyboardShortcuts { get { - return m_ShowDangerousBrushes ?? Config.IsExperimental; + return m_AdvancedKeyboardShortcuts ?? false; } - set { m_ShowDangerousBrushes = value; } + set { m_AdvancedKeyboardShortcuts = value; } } bool? m_PostEffectsOnCapture; @@ -90,6 +105,13 @@ public bool ShowControllers set { m_ShowControllers = value; } } + bool? m_SkipIntro; + public bool SkipIntro + { + get { return m_SkipIntro ?? false; } + set { m_SkipIntro = value; } + } + int? m_SnapshotHeight; public int SnapshotHeight { diff --git a/Assets/Scripts/Util/ColorPickerUtils.cs b/Assets/Scripts/Util/ColorPickerUtils.cs index 719b9b3157..3d64194551 100644 --- a/Assets/Scripts/Util/ColorPickerUtils.cs +++ b/Assets/Scripts/Util/ColorPickerUtils.cs @@ -55,7 +55,6 @@ public class ColorPickerInfo public Shader shader; public Texture icon; public bool cylindrical; - public bool experimental; // if true, don't show in demo mode public bool hdr; } @@ -99,13 +98,7 @@ public static int NumModes(bool hdr) int n = 0; for (int i = 0; i < ModeToPickerInfo.Length; i++) { - if (!ModeToPickerInfo[i].info.experimental && - ModeToPickerInfo[i].info.hdr == hdr) - { - n++; - } - if (Config.IsExperimental && ModeToPickerInfo[i].info.experimental && - ModeToPickerInfo[i].info.hdr == hdr) + if (ModeToPickerInfo[i].info.hdr == hdr) { n++; } @@ -163,7 +156,6 @@ public static Vector3 ColorToRawValue(ColorPickerMode mode, Color rgb) bool pickerSupportsHdr = (mode == ColorPickerMode.HS_LogV_Polar); if (colorIsHdr && !pickerSupportsHdr) { - // Shouldn't happen except in experimental Debug.LogErrorFormat("Truncating HDR color to LDR"); float h, s, v; Color.RGBToHSV(rgb, out h, out s, out v); @@ -482,15 +474,6 @@ public static bool ModeIsValid(ColorPickerMode mode) { return false; } - if (Config.IsExperimental) - { - return true; - } - if (info.experimental) - { - return false; - } - return true; } diff --git a/Assets/Scripts/VrSdk.cs b/Assets/Scripts/VrSdk.cs index 87e4cd8f5d..a4158e3a7c 100644 --- a/Assets/Scripts/VrSdk.cs +++ b/Assets/Scripts/VrSdk.cs @@ -15,7 +15,10 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; +using UnityEngine.InputSystem; using UnityEngine.XR; +using UnityEngine.XR.Management; +using InputDevice = UnityEngine.XR.InputDevice; #if PICO_SUPPORTED using PicoInput = Unity.XR.PXR.PXR_Input; @@ -125,6 +128,25 @@ public bool IsInitializingUnityXR void Awake() { + bool forceMonoscopic = + App.UserConfig.Flags.EnableMonoscopicMode || + Keyboard.current[Key.M].isPressed; + + bool disableXr = App.UserConfig.Flags.DisableXrMode || + Keyboard.current[Key.D].isPressed; + + // Allow forcing of monoscopic mode even if launching in XR + if (forceMonoscopic && !(App.Config.m_SdkMode == SdkMode.Ods)) + { + App.Config.m_SdkMode = SdkMode.Monoscopic; + } + else if (!disableXr) + { + // We no longer initialize XR SDKs automatically + // so we need to do it manually + Initialize(); + } + if (App.Config.m_SdkMode == SdkMode.UnityXR) { InputDevices.deviceConnected += OnUnityXRDeviceConnected; @@ -170,6 +192,9 @@ void Awake() m_VrCamera.gameObject.SetActive(true); m_VrSystem.SetActive(m_VrCamera.gameObject.activeSelf); + // Skip the rest of the VR setup if we're not using XR + if (App.UserConfig.Flags.DisableXrMode || App.UserConfig.Flags.EnableMonoscopicMode) return; + #if OCULUS_SUPPORTED // ---------------------------------------------------------------------------------------- // // OculusVR @@ -340,8 +365,10 @@ private void RefreshRoomBoundsCache() #if OCULUS_SUPPORTED // N points, clockwise winding (but axis is undocumented), undocumented convexity // In practice, it's clockwise looking along Y- - points_RS = OVRManager.boundary.GetGeometry(OVRBoundary.BoundaryType.OuterBoundary) - .Select(v => UnityFromOculus(v)).ToArray(); + points_RS = OVRManager.boundary + ?.GetGeometry(OVRBoundary.BoundaryType.OuterBoundary) + ?.Select(v => UnityFromOculus(v)) + .ToArray(); #else // OCULUS_SUPPORTED // if (App.Config.m_SdkMode == SdkMode.SteamVR) // { @@ -584,7 +611,7 @@ public ControllerInfo CreateControllerInfo(BaseControllerBehavior behavior, bool // return new NonVrControllerInfo(behavior); // //return new SteamControllerInfo(behavior); // } - // else + // else if (App.Config.m_SdkMode == SdkMode.UnityXR) { return new UnityXRControllerInfo(behavior, isLeftHand); @@ -764,12 +791,15 @@ private void OnUnityXRDeviceDisconnected(InputDevice device) // Returns false if SDK Mode uses an HMD, but it is not initialized. // Retruns true if SDK does not have an HMD or if it is correctly initialized. + // Monoscopic mode returns true for some reason + // but we make use of this to trigger the view-only mode so if that's ever fixed + // we need to also fix the conditions for triggering view-only mode public bool IsHmdInitialized() { switch (App.Config.m_SdkMode) { case SdkMode.UnityXR: - return UnityEngine.XR.Management.XRGeneralSettings.Instance.Manager.activeLoader != null; + return XRGeneralSettings.Instance?.Manager?.activeLoader != null; default: return true; } @@ -894,5 +924,14 @@ public void SetGpuClockLevel(int level) } #endif // OCULUS_SUPPORTED } + + public void Initialize() + { + // Null checks are for Linux view mode + // TODO: Need to investigate exactly why Linux hits an NRE here + // When other platforms don't + XRGeneralSettings.Instance?.Manager?.InitializeLoaderSync(); + XRGeneralSettings.Instance?.Manager?.StartSubsystems(); + } } } diff --git a/Assets/Scripts/Widgets/DropCamWidget.cs b/Assets/Scripts/Widgets/DropCamWidget.cs index 88d7cacd73..6e0e799240 100644 --- a/Assets/Scripts/Widgets/DropCamWidget.cs +++ b/Assets/Scripts/Widgets/DropCamWidget.cs @@ -207,7 +207,7 @@ void ResetCam() override protected void OnUpdate() { - if (Debug.isDebugBuild && Config.IsExperimental) + if (App.UserConfig.Flags.AdvancedKeyboardShortcuts) { if (InputManager.m_Instance.GetKeyboardShortcutDown( InputManager.KeyboardShortcut.ToggleHeadStationaryOrWobble)) @@ -269,7 +269,7 @@ override protected void OnUpdate() break; case Mode.SlowFollow: { - if (Debug.isDebugBuild && Config.IsExperimental) + if (App.UserConfig.Flags.AdvancedKeyboardShortcuts) { if (InputManager.m_Instance.GetKeyboardShortcutDown( InputManager.KeyboardShortcut.DecreaseSlowFollowSmoothing)) diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index 1050ad76ad..be65b5797f 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3} m_Name: Strings Shared Data - m_EditorClassIdentifier: + m_EditorClassIdentifier: m_TableCollectionName: Strings m_TableCollectionNameGuidString: c84355079ab3f3e4f8f3812258805f86 m_Entries: @@ -3295,6 +3295,18 @@ MonoBehaviour: m_Key: POPUP_UPLOAD_COMPLETE_MOBILE_DESCRIPTION m_Metadata: m_Items: [] + - m_Id: 217069105871577088 + m_Key: VIEW_MODE_TEXT + m_Metadata: + m_Items: [] + - m_Id: 217070349893754880 + m_Key: VR_NOT_DETECTED + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Key: MONOSCOPIC_HELP + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_de.asset b/Assets/Settings/Localization/Strings/Strings_de.asset index 53d4ae3f20..e0259b2546 100644 --- a/Assets/Settings/Localization/Strings/Strings_de.asset +++ b/Assets/Settings/Localization/Strings/Strings_de.asset @@ -1252,7 +1252,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 68768010396041216 - m_Localized: Experimentiermodus anschalten + m_Localized: Experimentelle Pinsel aktivieren m_Metadata: m_Items: [] - m_Id: 68768580896882688 @@ -3560,6 +3560,22 @@ MonoBehaviour: zur\xFCckzusetzen" m_Metadata: m_Items: [] + - m_Id: 217070349893754880 + m_Localized: VR-Erkennung fehlgeschlagen + m_Metadata: + m_Items: [] + - m_Id: 217069105871577088 + m_Localized: "Sie k\xF6nnen ohne ein VR-Headset fortfahren. W\xE4hlen Sie unten + eine Skizze aus, um den Betrachtungsmodus mit den folgenden Steuerungen zu + betreten:\n\nMaus: umsehen (dr\xFCcken Sie I, um oben/unten zu invertieren)\nW,A,S,D: + vorw\xE4rts/r\xFCckw\xE4rts/links/rechts bewegen\nQ,E: auf/ab bewegen\nHalten + Sie Shift gedr\xFCckt, um schneller zu bewegen" + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Localized: Mehr Informationen zur Verwendung von Open Brush ohne VR + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index 22810f3509..799530a2b8 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} m_Name: Strings_en - m_EditorClassIdentifier: + m_EditorClassIdentifier: m_LocaleId: m_Code: en m_SharedData: {fileID: 11400000, guid: c84355079ab3f3e4f8f3812258805f86, type: 2} @@ -1257,11 +1257,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 68768010396041216 - m_Localized: Turn Experimental Mode On + m_Localized: Enable Experimental Brushes m_Metadata: m_Items: [] - m_Id: 68768580896882688 - m_Localized: Turn Experimental Mode Off + m_Localized: Disable Experimental Brushes m_Metadata: m_Items: [] - m_Id: 68773633749745664 @@ -3489,6 +3489,21 @@ MonoBehaviour: m_Localized: Unlock Canvas Position m_Metadata: m_Items: [] + - m_Id: 217069105871577088 + m_Localized: "You can continue without a VR headset. Choose a sketch below to + enter Viewing Mode with the following controls:\n\nMouse: look around (press + I to invert up/down) \nW,A,S,D: move forward/back/left/right\nQ,E: move up/down\nHold + shift to move faster\n" + m_Metadata: + m_Items: [] + - m_Id: 217070349893754880 + m_Localized: Failed to Detect VR + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Localized: More info on using Open Brush without VR + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_es.asset b/Assets/Settings/Localization/Strings/Strings_es.asset index 3bddce8763..0aa94db064 100644 --- a/Assets/Settings/Localization/Strings/Strings_es.asset +++ b/Assets/Settings/Localization/Strings/Strings_es.asset @@ -1207,11 +1207,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 68768010396041216 - m_Localized: Activar modo experimental + m_Localized: Habilitar pinceles experimentales m_Metadata: m_Items: [] - m_Id: 68768580896882688 - m_Localized: Desactivar modo experimental + m_Localized: Deshabilitar pinceles experimentales m_Metadata: m_Items: [] - m_Id: 68773633749745664 @@ -3533,6 +3533,21 @@ MonoBehaviour: m_Localized: "Usa el disparador y luego pulsa X o A\npara restablecer tu tama\xF1o" m_Metadata: m_Items: [] + - m_Id: 217070349893754880 + m_Localized: No se pudo detectar el VR + m_Metadata: + m_Items: [] + - m_Id: 217069105871577088 + m_Localized: "Puedes continuar sin un casco de realidad virtual. Elige un boceto + abajo para entrar al Modo de Visualizaci\xF3n con los siguientes controles:\n\nRat\xF3n: + mirar alrededor (presiona I para invertir arriba/abajo)\nW,A,S,D: mover adelante/atr\xE1s/izquierda/derecha\nQ,E: + mover arriba/abajo\nMant\xE9n presionado shift para moverte m\xE1s r\xE1pido" + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Localized: "M\xE1s informaci\xF3n sobre c\xF3mo usar Open Brush sin VR" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_fr.asset b/Assets/Settings/Localization/Strings/Strings_fr.asset index 364f318929..c0c7d234f0 100644 --- a/Assets/Settings/Localization/Strings/Strings_fr.asset +++ b/Assets/Settings/Localization/Strings/Strings_fr.asset @@ -1194,7 +1194,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 68768010396041216 - m_Localized: "Activer le mode exp\xE9rimental" + m_Localized: "Activer les pinceaux exp\xE9rimentaux" m_Metadata: m_Items: [] - m_Id: 68768580896882688 @@ -3502,6 +3502,21 @@ MonoBehaviour: votre taille" m_Metadata: m_Items: [] + - m_Id: 217070349893754880 + m_Localized: "\xC9chec de la d\xE9tection du VR" + m_Metadata: + m_Items: [] + - m_Id: 217069105871577088 + m_Localized: "Vous pouvez continuer sans casque VR. Choisissez un croquis ci-dessous + pour entrer en mode visualisation avec les commandes suivantes :\n\nSouris + : regardez autour (appuyez sur I pour inverser haut/bas)\nW,A,S,D : avancer/reculer/gauche/droite\nQ,E + : monter/descendre\nMaintenez shift pour vous d\xE9placer plus rapidement" + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Localized: Plus d'informations sur l'utilisation d'Open Brush sans VR + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ja.asset b/Assets/Settings/Localization/Strings/Strings_ja.asset index 4d452e869d..4175e9eeb7 100644 --- a/Assets/Settings/Localization/Strings/Strings_ja.asset +++ b/Assets/Settings/Localization/Strings/Strings_ja.asset @@ -1186,11 +1186,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 68768010396041216 - m_Localized: "\u5B9F\u9A13\u30E2\u30FC\u30C9 \u30AA\u30F3" + m_Localized: "\u5B9F\u9A13\u7684\u306A\u30D6\u30E9\u30B7\u3092\u6709\u52B9\u306B\u3059\u308B" m_Metadata: m_Items: [] - m_Id: 68768580896882688 - m_Localized: "\u5B9F\u9A13\u30E2\u30FC\u30C9 \u30AA\u30D5" + m_Localized: "\u5B9F\u9A13\u7684\u306A\u30D6\u30E9\u30B7\u3092\u7121\u52B9\u306B\u3059\u308B" m_Metadata: m_Items: [] - m_Id: 68773633749745664 @@ -3458,6 +3458,18 @@ MonoBehaviour: m_Localized: "\u30B0\u30EA\u30C3\u30D7\u30DC\u30BF\u30F3\u3092\u62BC\u3057\u306A\u304C\u3089[X]\u307E\u305F\u306F[A]\u30DC\u30BF\u30F3\u3092\u62BC\u3057\u3066\n\u30E6\u30FC\u30B6\u30FC\u306E\u30B5\u30A4\u30BA\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059" m_Metadata: m_Items: [] + - m_Id: 217070349893754880 + m_Localized: "VR \u3092\u691C\u51FA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F" + m_Metadata: + m_Items: [] + - m_Id: 217069105871577088 + m_Localized: "VR\u30D8\u30C3\u30C9\u30BB\u30C3\u30C8\u306A\u3057\u3067\u7D9A\u884C\u3067\u304D\u307E\u3059\u3002\u4EE5\u4E0B\u306E\u30B9\u30B1\u30C3\u30C1\u3092\u9078\u629E\u3057\u3066\u3001\u6B21\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3067\u8996\u8074\u30E2\u30FC\u30C9\u306B\u5165\u308A\u307E\u3059\uFF1A\n\n\u30DE\u30A6\u30B9\uFF1A\u5468\u308A\u3092\u898B\u308B\uFF08\u4E0A/\u4E0B\u3092\u53CD\u8EE2\u3055\u305B\u308B\u306B\u306FI\u3092\u62BC\u3059\uFF09\nW,A,S,D\uFF1A\u524D/\u5F8C/\u5DE6/\u53F3\u306B\u79FB\u52D5\nQ,E\uFF1A\u4E0A/\u4E0B\u306B\u79FB\u52D5\nShift\u3092\u62BC\u3057\u7D9A\u3051\u308B\u3068\u901F\u304F\u79FB\u52D5\u3057\u307E\u3059" + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Localized: "VR\u306A\u3057\u3067Open Brush\u3092\u4F7F\u7528\u3059\u308B\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306E\u8A73\u7D30" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_ko.asset b/Assets/Settings/Localization/Strings/Strings_ko.asset index 38e3dfa0e8..1fdf5c1bfe 100644 --- a/Assets/Settings/Localization/Strings/Strings_ko.asset +++ b/Assets/Settings/Localization/Strings/Strings_ko.asset @@ -1198,11 +1198,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 68768010396041216 - m_Localized: "\uC2E4\uD5D8 \uBAA8\uB4DC \uCF1C\uAE30" + m_Localized: "\uC2E4\uD5D8\uC801 \uBE0C\uB7EC\uC2DC \uC0AC\uC6A9" m_Metadata: m_Items: [] - m_Id: 68768580896882688 - m_Localized: "\uC2E4\uD5D8 \uBAA8\uB4DC \uB044\uAE30" + m_Localized: "\uC2E4\uD5D8\uC801 \uBE0C\uB7EC\uC2DC \uBE44\uD65C\uC131\uD654" m_Metadata: m_Items: [] - m_Id: 68773633749745664 @@ -3517,6 +3517,25 @@ MonoBehaviour: \uD06C\uAE30 \uB9AC\uC14B" m_Metadata: m_Items: [] + - m_Id: 217070349893754880 + m_Localized: "VR \uAC10\uC9C0 \uC2E4\uD328" + m_Metadata: + m_Items: [] + - m_Id: 217069105871577088 + m_Localized: "VR \uD5E4\uB4DC\uC14B \uC5C6\uC774 \uACC4\uC18D\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. + \uC544\uB798\uC758 \uC2A4\uCF00\uCE58 \uC911 \uD558\uB098\uB97C \uC120\uD0DD\uD558\uC5EC + \uB2E4\uC74C \uCEE8\uD2B8\uB864\uB85C \uBCF4\uAE30 \uBAA8\uB4DC\uC5D0 \uB4E4\uC5B4\uAC11\uB2C8\uB2E4:\n\n\uB9C8\uC6B0\uC2A4: + \uC8FC\uBCC0\uC744 \uB458\uB7EC\uBCF4\uAE30 (\uC704/\uC544\uB798 \uBC18\uC804\uD558\uB824\uBA74 + I\uB97C \uB204\uB974\uC138\uC694)\nW,A,S,D: \uC55E/\uB4A4/\uC67C\uCABD/\uC624\uB978\uCABD\uC73C\uB85C + \uC774\uB3D9\nQ,E: \uC704/\uC544\uB798\uB85C \uC774\uB3D9\nShift\uB97C \uB204\uB974\uACE0 + \uC788\uC73C\uBA74 \uB354 \uBE68\uB9AC \uC774\uB3D9\uD569\uB2C8\uB2E4" + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Localized: "VR \uC5C6\uC774 Open Brush \uC0AC\uC6A9\uC5D0 \uB300\uD55C \uC790\uC138\uD55C + \uC815\uBCF4" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Settings/Localization/Strings/Strings_zh.asset b/Assets/Settings/Localization/Strings/Strings_zh.asset index 2ed5830c51..801374490a 100644 --- a/Assets/Settings/Localization/Strings/Strings_zh.asset +++ b/Assets/Settings/Localization/Strings/Strings_zh.asset @@ -1181,11 +1181,11 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 68768010396041216 - m_Localized: "\u5F00\u542F\u5B9E\u9A8C\u6A21\u5F0F" + m_Localized: "\u542F\u7528\u5B9E\u9A8C\u6027\u753B\u7B14" m_Metadata: m_Items: [] - m_Id: 68768580896882688 - m_Localized: "\u5173\u95ED\u5B9E\u9A8C\u6A21\u5F0F" + m_Localized: "\u7981\u7528\u5B9E\u9A8C\u6027\u753B\u7B14" m_Metadata: m_Items: [] - m_Id: 68773633749745664 @@ -3452,6 +3452,20 @@ MonoBehaviour: m_Localized: "\u6309\u6293\u63E1\u952E\u7136\u540E\u6309X\u6216A\u952E\n\u91CD\u7F6E\u4F60\u7684\u5927\u5C0F" m_Metadata: m_Items: [] + - m_Id: 217070349893754880 + m_Localized: "\u672A\u80FD\u68C0\u6D4B\u5230 VR" + m_Metadata: + m_Items: [] + - m_Id: 217069105871577088 + m_Localized: "\u60A8\u53EF\u4EE5\u7EE7\u7EED\uFF0C\u65E0\u9700 VR \u5934\u76D4\u3002\u9009\u62E9\u4E0B\u9762\u7684\u8349\u56FE\u8FDB\u5165\u67E5\u770B\u6A21\u5F0F\uFF0C\u63A7\u5236\u65B9\u5F0F\u5982\u4E0B\uFF1A\n\n\u9F20\u6807\uFF1A\u56DB\u5904\u770B\u770B\uFF08\u6309 + I \u952E\u4EE5\u53CD\u8F6C\u4E0A/\u4E0B\uFF09\nW,A,S,D\uFF1A\u5411\u524D/\u540E/\u5DE6/\u53F3\u79FB\u52A8\nQ,E\uFF1A\u4E0A\u5347/\u4E0B\u964D\n\u6309\u4F4F + shift \u952E\u4EE5\u66F4\u5FEB\u79FB\u52A8" + m_Metadata: + m_Items: [] + - m_Id: 218558579745579008 + m_Localized: "\u5173\u4E8E\u4E0D\u4F7F\u7528 VR \u4F7F\u7528 Open Brush \u7684\u66F4\u591A\u4FE1\u606F" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Textures/Trademarked/AutosaveThumbnail.png.meta b/Assets/Textures/Trademarked/AutosaveThumbnail.png.meta index 529803ba11..cebede81f5 100644 --- a/Assets/Textures/Trademarked/AutosaveThumbnail.png.meta +++ b/Assets/Textures/Trademarked/AutosaveThumbnail.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: dae693ebd770c4113a47406128c6d42e TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,8 @@ TextureImporter: isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +33,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,22 +56,28 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 512 resizeAlgorithm: 0 @@ -80,6 +88,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -87,10 +120,13 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset index a0765d2816..ba48aff798 100644 --- a/Assets/XR/Settings/Open XR Package Settings.asset +++ b/Assets/XR/Settings/Open XR Package Settings.asset @@ -104,6 +104,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-7871932882014305355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d28f705476c80d47acb3dfade3d3142, type: 3} + m_Name: MetaXRFoveationFeature Android + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta XR Foveation + version: 1.0.0 + featureIdInternal: com.meta.openxr.feature.foveation + openxrExtensionStrings: 'XR_FB_foveation XR_FB_foveation_configuration XR_FB_foveation_vulkan ' + company: Meta + priority: 0 + required: 0 --- !u!114 &-7635896756621915544 MonoBehaviour: m_ObjectHideFlags: 0 @@ -369,15 +389,14 @@ MonoBehaviour: m_Name: OculusXRFeature Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: OculusXR Feature + nameUi: Meta XR Feature version: 0.0.1 - featureIdInternal: com.oculus.openxr.feature.oculusxr + featureIdInternal: com.meta.openxr.feature.metaxr openxrExtensionStrings: 'XR_KHR_vulkan_enable XR_KHR_D3D11_enable XR_OCULUS_common_reference_spaces XR_FB_display_refresh_rate XR_EXT_performance_settings XR_FB_composition_layer_image_layout XR_KHR_android_surface_swapchain XR_FB_android_surface_swapchain_create XR_KHR_composition_layer_color_scale_bias XR_FB_color_space XR_EXT_hand_tracking XR_FB_swapchain_update_state XR_FB_swapchain_update_state_opengl_es - XR_FB_swapchain_update_state_vulkan XR_FB_foveation XR_FB_foveation_configuration - XR_FB_foveation_vulkan XR_FB_composition_layer_alpha_blend XR_KHR_composition_layer_depth + XR_FB_swapchain_update_state_vulkan XR_FB_composition_layer_alpha_blend XR_KHR_composition_layer_depth XR_KHR_composition_layer_cylinder XR_KHR_composition_layer_cube XR_KHR_composition_layer_equirect2 XR_KHR_convert_timespec_time XR_KHR_visibility_mask XR_FB_render_model XR_FB_spatial_entity XR_FB_spatial_entity_query XR_FB_spatial_entity_storage XR_META_performance_metrics @@ -385,8 +404,8 @@ MonoBehaviour: XR_FB_eye_tracking XR_FB_keyboard_tracking XR_FB_passthrough XR_FB_triangle_mesh XR_FB_passthrough_keyboard_hands XR_OCULUS_audio_device_guid XR_FB_common_events XR_FB_space_warp XR_FB_hand_tracking_capsules XR_FB_hand_tracking_mesh XR_FB_hand_tracking_aim - XR_FB_touch_controller_pro XR_FB_touch_controller_extras ' - company: Oculus + XR_FB_touch_controller_pro XR_FB_touch_controller_proximity ' + company: Meta priority: 0 required: 0 --- !u!114 &-4469311779315207794 @@ -530,6 +549,7 @@ MonoBehaviour: - {fileID: -4431914812882349843} - {fileID: 3405362293045848653} - {fileID: 7875633773414566808} + - {fileID: -7871932882014305355} - {fileID: -1562417761177608366} - {fileID: -568313750252970699} - {fileID: -238312934105289492} @@ -552,15 +572,14 @@ MonoBehaviour: m_Name: OculusXRFeature Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: OculusXR Feature + nameUi: Meta XR Feature version: 0.0.1 - featureIdInternal: com.oculus.openxr.feature.oculusxr + featureIdInternal: com.meta.openxr.feature.metaxr openxrExtensionStrings: 'XR_KHR_vulkan_enable XR_KHR_D3D11_enable XR_OCULUS_common_reference_spaces XR_FB_display_refresh_rate XR_EXT_performance_settings XR_FB_composition_layer_image_layout XR_KHR_android_surface_swapchain XR_FB_android_surface_swapchain_create XR_KHR_composition_layer_color_scale_bias XR_FB_color_space XR_EXT_hand_tracking XR_FB_swapchain_update_state XR_FB_swapchain_update_state_opengl_es - XR_FB_swapchain_update_state_vulkan XR_FB_foveation XR_FB_foveation_configuration - XR_FB_foveation_vulkan XR_FB_composition_layer_alpha_blend XR_KHR_composition_layer_depth + XR_FB_swapchain_update_state_vulkan XR_FB_composition_layer_alpha_blend XR_KHR_composition_layer_depth XR_KHR_composition_layer_cylinder XR_KHR_composition_layer_cube XR_KHR_composition_layer_equirect2 XR_KHR_convert_timespec_time XR_KHR_visibility_mask XR_FB_render_model XR_FB_spatial_entity XR_FB_spatial_entity_query XR_FB_spatial_entity_storage XR_META_performance_metrics @@ -568,8 +587,8 @@ MonoBehaviour: XR_FB_eye_tracking XR_FB_keyboard_tracking XR_FB_passthrough XR_FB_triangle_mesh XR_FB_passthrough_keyboard_hands XR_OCULUS_audio_device_guid XR_FB_common_events XR_FB_space_warp XR_FB_hand_tracking_capsules XR_FB_hand_tracking_mesh XR_FB_hand_tracking_aim - XR_FB_touch_controller_pro XR_FB_touch_controller_extras ' - company: Oculus + XR_FB_touch_controller_pro XR_FB_touch_controller_proximity ' + company: Meta priority: 0 required: 0 --- !u!114 &-568313750252970699 @@ -714,6 +733,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &1104377150978337437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d28f705476c80d47acb3dfade3d3142, type: 3} + m_Name: MetaXRFoveationFeature Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta XR Foveation + version: 1.0.0 + featureIdInternal: com.meta.openxr.feature.foveation + openxrExtensionStrings: 'XR_FB_foveation XR_FB_foveation_configuration XR_FB_foveation_vulkan ' + company: Meta + priority: 0 + required: 0 --- !u!114 &1263590293311991825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1206,6 +1245,7 @@ MonoBehaviour: - {fileID: 1827103528056647146} - {fileID: 2554124788269052071} - {fileID: 7755255244189431342} + - {fileID: 1104377150978337437} - {fileID: -6490217007365981742} - {fileID: -6553496117388817208} - {fileID: 3442458366111397828} diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset index f7b92131f1..ae01ae95ad 100644 --- a/Assets/XR/XRGeneralSettings.asset +++ b/Assets/XR/XRGeneralSettings.asset @@ -110,7 +110,7 @@ MonoBehaviour: m_Name: Standalone Settings m_EditorClassIdentifier: m_LoaderManagerInstance: {fileID: 8705794667931902858} - m_InitManagerOnStart: 1 + m_InitManagerOnStart: 0 --- !u!114 &6946956650545175336 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Support/steam/app.vdf.j2 b/Support/steam/app.vdf.j2 index 28ccf6527d..bee4ff242f 100644 --- a/Support/steam/app.vdf.j2 +++ b/Support/steam/app.vdf.j2 @@ -10,6 +10,6 @@ "depots" { "{{ OPEN_BRUSH_WINDOWS_DEPOT_ID }}" build_windows_openxr/main_depot.vdf - "{{ OPEN_BRUSH_MAC_DEPOT_ID }}" build_macos_monoscopic/main_depot.vdf + "{{ OPEN_BRUSH_MAC_DEPOT_ID }}" build_macos/main_depot.vdf } } diff --git a/Support/steam/main_depot.mac.vdf.j2 b/Support/steam/main_depot.mac.vdf.j2 index c31997ab80..0629e15f4d 100644 --- a/Support/steam/main_depot.mac.vdf.j2 +++ b/Support/steam/main_depot.mac.vdf.j2 @@ -3,7 +3,7 @@ // # Set your assigned depot ID here "DepotID" "{{ OPEN_BRUSH_MAC_DEPOT_ID }}" - "ContentRoot" "build_macos_monoscopic/StandaloneOSX" + "ContentRoot" "build_macos/StandaloneOSX" "FileMapping" {