From c922584d38d122f0cfd39b0301618af31f41bb57 Mon Sep 17 00:00:00 2001 From: Katboi01 Date: Thu, 25 Apr 2024 02:16:49 +0200 Subject: [PATCH] Eversoul: -compatibility improvements Core: -new settings class --- .gitignore | 1 + .../Scripts/DanMachiModelViewerMain.cs | 7 +- Assets/Eversoul/Eversoul.unity | 439 ++++++++- Assets/Eversoul/Scripts/Containers.meta | 8 + .../EversoulCharacterContainer.cs | 76 +- .../EversoulCharacterContainer.cs.meta | 0 .../Eversoul/Scripts/EversoulAssetLibrary.cs | 46 +- Assets/Eversoul/Scripts/EversoulInterface.cs | 1 + Assets/Eversoul/Scripts/EversoulMain.cs | 5 + Assets/Eversoul/Shaders/BasicEye.shader | 852 +++++++++++++++++ Assets/Eversoul/Shaders/BasicEye.shader.meta | 10 + Assets/Eversoul/Shaders/Glass.shader | 874 +++++++++++++++++ Assets/Eversoul/Shaders/Glass.shader.meta | 10 + Assets/Prefabs/SharedResources.prefab | 1 + .../UI/ModelViewerBase/Settings Panel.prefab | 888 ++++++++++++++++++ .../Settings Panel.prefab.meta | 7 + .../UI/ModelViewerBase/TextInput.prefab | 744 +++++++++++++++ .../UI/ModelViewerBase/TextInput.prefab.meta | 7 + .../Scripts/ModelViewerBase/AssetLibrary.cs | 2 +- .../ModelViewerBase/ModelViewerBase.asmdef | 3 +- .../ModelViewerBase/ModelViewerInterface.cs | 7 +- .../ModelViewerBase/ModelViewerMain.cs | 9 +- .../ModelViewerBase/ModelViewerSettings.cs | 122 +++ ...el.cs.meta => ModelViewerSettings.cs.meta} | 2 +- .../ModelViewerBase/SharedResources.cs | 1 + .../ModelViewerBase/UI/HandleSettingsPanel.cs | 3 +- .../UI/UICameraSettingsPanel.cs | 12 - .../ModelViewerBase/UI/UIDraggableProxy.cs | 1 - .../ModelViewerBase/UI/UISaveLoadPanel.cs | 191 ++-- .../ModelViewerBase/UI/UISettingsPanel.cs | 43 + ...rPanel.cs.meta => UISettingsPanel.cs.meta} | 2 +- .../Scripts/ModelViewerBase/UI/UITextInput.cs | 67 ++ .../ModelViewerBase/UI/UITextInput.cs.meta | 11 + .../ModelViewerBase/UI/UIToolbarPanel.cs | 20 - Assets/Scripts/RuntimeGizmo/TransformGizmo.cs | 15 +- Packages/manifest.json | 6 +- Packages/packages-lock.json | 19 +- ProjectSettings/ProjectSettings.asset | 5 +- ProjectSettings/ProjectVersion.txt | 4 +- 39 files changed, 4302 insertions(+), 219 deletions(-) create mode 100644 Assets/Eversoul/Scripts/Containers.meta rename Assets/Eversoul/Scripts/{ => Containers}/EversoulCharacterContainer.cs (80%) rename Assets/Eversoul/Scripts/{ => Containers}/EversoulCharacterContainer.cs.meta (100%) create mode 100644 Assets/Eversoul/Shaders/BasicEye.shader create mode 100644 Assets/Eversoul/Shaders/BasicEye.shader.meta create mode 100644 Assets/Eversoul/Shaders/Glass.shader create mode 100644 Assets/Eversoul/Shaders/Glass.shader.meta create mode 100644 Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab create mode 100644 Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab.meta create mode 100644 Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab create mode 100644 Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab.meta create mode 100644 Assets/Scripts/ModelViewerBase/ModelViewerSettings.cs rename Assets/Scripts/ModelViewerBase/{UI/UICameraSettingsPanel.cs.meta => ModelViewerSettings.cs.meta} (83%) delete mode 100644 Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs create mode 100644 Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs rename Assets/Scripts/ModelViewerBase/UI/{UIToolbarPanel.cs.meta => UISettingsPanel.cs.meta} (83%) create mode 100644 Assets/Scripts/ModelViewerBase/UI/UITextInput.cs create mode 100644 Assets/Scripts/ModelViewerBase/UI/UITextInput.cs.meta delete mode 100644 Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs diff --git a/.gitignore b/.gitignore index fed5b36..4e9fd92 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ crashlytics-build.properties /Scenes /Screenshots /[Aa]ssets/AmplifyShaderEditor +/_settings.json diff --git a/Assets/DanMachi/Scripts/DanMachiModelViewerMain.cs b/Assets/DanMachi/Scripts/DanMachiModelViewerMain.cs index 641f925..cb9330e 100644 --- a/Assets/DanMachi/Scripts/DanMachiModelViewerMain.cs +++ b/Assets/DanMachi/Scripts/DanMachiModelViewerMain.cs @@ -12,8 +12,8 @@ public class DanMachiModelViewerMain : ModelViewerMain protected override void Awake() { - _backupTimers = _backupTimes.ToArray(); CurrentScene = SceneContainer.Create(this); + base.Awake(); } private IEnumerator Start() @@ -33,11 +33,6 @@ public class DanMachiModelViewerMain : ModelViewerMain } yield return 0; } - - if (!MainCameraOrbit.Frames.Any()) - MainCameraOrbit.SetDefaultFrame(); - - _mainInstance = this; } private void Update() diff --git a/Assets/Eversoul/Eversoul.unity b/Assets/Eversoul/Eversoul.unity index dce5721..127b1e3 100644 --- a/Assets/Eversoul/Eversoul.unity +++ b/Assets/Eversoul/Eversoul.unity @@ -247,7 +247,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 356089378092153583, guid: e6a0b0367b83a71448776cb8fbf425f8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 356089378092153583, guid: e6a0b0367b83a71448776cb8fbf425f8, type: 3} propertyPath: m_AnchorMax.x @@ -371,7 +371,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2850199927690474493, guid: 43204d1c227fee442a505dddd825ad93, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 2850199927690474493, guid: 43204d1c227fee442a505dddd825ad93, type: 3} propertyPath: m_AnchorMax.x @@ -447,6 +447,22 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43204d1c227fee442a505dddd825ad93, type: 3} +--- !u!224 &498578031 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + m_PrefabInstance: {fileID: 1551259237423093990} + m_PrefabAsset: {fileID: 0} +--- !u!114 &498578033 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 373880450823286313, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + m_PrefabInstance: {fileID: 1551259237423093990} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cabaf29aa96c5f44d807cc8c0e1996d7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &552746170 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2850199927690474493, guid: 43204d1c227fee442a505dddd825ad93, type: 3} @@ -640,6 +656,123 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cabaf29aa96c5f44d807cc8c0e1996d7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &636676556 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1070666702} + m_Modifications: + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965023, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: Draggable + value: + objectReference: {fileID: 498578033} + - target: {fileID: 4765104224628965023, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: InitializeOnAwake + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965023, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: InitializeOnStart + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965025, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_Name + value: Settings Proxy + objectReference: {fileID: 0} + - target: {fileID: 4765104224628965025, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4765104225157735664, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + propertyPath: m_text + value: Settings + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} --- !u!224 &637337910 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6118629306177284436, guid: c5986ffbd90f7ee4fab57ae38782d281, type: 3} @@ -949,15 +1082,13 @@ MonoBehaviour: ScenePresetToggle: {fileID: 0} PosePresetToggle: {fileID: 0} SelectedHandlesPanel: {fileID: 1671269287} - TopbarPanels: [] - TogglesContent: {fileID: 0} SaveLoadPanel: {fileID: 0} - CameraSettingsPanel: {fileID: 0} ProgressBar: {fileID: 1298182843} MainCanvas: {fileID: 2041328473} Tooltip: {fileID: 0} TooltipText: {fileID: 0} CharacterSelection: {fileID: 691071881} + SelectedObjectToolbar: {fileID: 1564805931} --- !u!4 &898591890 Transform: m_ObjectHideFlags: 0 @@ -998,8 +1129,12 @@ MonoBehaviour: m_EditorClassIdentifier: Shaders: - {fileID: 4800000, guid: 6d189178f0830e64eba99ac278f6d858, type: 3} + - {fileID: 4800000, guid: ac5df90b96b13e74dbde27dee0628da2, type: 3} + - {fileID: 4800000, guid: b826360bb1a4e1f48a4f9825dfe20c2e, type: 3} - {fileID: 4800000, guid: 7b70faecc875a174c8e11f5dae674f87, type: 3} - LocalFilesPath: + - {fileID: 4800000, guid: 18e10df8c52942544848ec723ace49bb, type: 3} + - {fileID: 4800000, guid: 1651798b9d47a38498a28526349aa568, type: 3} + - {fileID: 4800000, guid: 4cc65c7a69946b240b4954d393a1e021, type: 3} CharacterAssets: [] AnimationAssets: [] Characters: [] @@ -1021,6 +1156,11 @@ MonoBehaviour: CurrentScene: {fileID: 0} SelectedObject: {fileID: 0} SelectedObjects: [] +--- !u!224 &970027465 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4765104224628965022, guid: 91642e1030ae9b64e8872f9542aa319a, type: 3} + m_PrefabInstance: {fileID: 636676556} + m_PrefabAsset: {fileID: 0} --- !u!1 &970714220 GameObject: m_ObjectHideFlags: 0 @@ -1061,8 +1201,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_AnchoredPosition: {x: -80.00012, y: 0} + m_SizeDelta: {x: -160, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!114 &970714222 MonoBehaviour: @@ -1152,6 +1292,124 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} m_PrefabInstance: {fileID: 2648405317185078881} m_PrefabAsset: {fileID: 0} +--- !u!1 &1070666701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1070666702} + - component: {fileID: 1070666706} + - component: {fileID: 1070666705} + - component: {fileID: 1070666704} + - component: {fileID: 1070666703} + m_Layer: 5 + m_Name: Top Toolbar (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1070666702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070666701} + 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_Children: + - {fileID: 970027465} + m_Father: {fileID: 2041328474} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1070666703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070666701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1070666704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070666701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a9923479002682f41b647b4fb8e812fd, type: 3} + m_Name: + m_EditorClassIdentifier: + ElementMask: 0 + Layout: 0 +--- !u!114 &1070666705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070666701} + 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: 0.392} + 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: 10907, 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 +--- !u!222 &1070666706 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070666701} + m_CullTransparentMesh: 1 --- !u!1001 &1071324482 PrefabInstance: m_ObjectHideFlags: 0 @@ -1389,7 +1647,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1749559174530117196, guid: 0f5ca676a1c6be74f9c2a0d17cb28fcc, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1749559174530117196, guid: 0f5ca676a1c6be74f9c2a0d17cb28fcc, type: 3} propertyPath: m_AnchorMax.x @@ -1755,7 +2013,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6118629306177284436, guid: c5986ffbd90f7ee4fab57ae38782d281, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6118629306177284436, guid: c5986ffbd90f7ee4fab57ae38782d281, type: 3} propertyPath: m_AnchorMax.x @@ -2483,12 +2741,14 @@ RectTransform: m_Children: - {fileID: 1564374523} - {fileID: 970714221} + - {fileID: 1070666702} - {fileID: 1130169202} - {fileID: 202027801} - {fileID: 637337910} - {fileID: 691071877} - {fileID: 1058592650} - {fileID: 552746170} + - {fileID: 498578031} - {fileID: 1298182842} m_Father: {fileID: 0} m_RootOrder: 6 @@ -2567,7 +2827,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 421009298008460753, guid: aec051166b59e154c8bddd6ae1b7dd0d, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 421009298008460753, guid: aec051166b59e154c8bddd6ae1b7dd0d, type: 3} propertyPath: m_AnchorMax.x @@ -2643,6 +2903,159 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aec051166b59e154c8bddd6ae1b7dd0d, type: 3} +--- !u!1001 &1551259237423093990 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2041328474} + m_Modifications: + - target: {fileID: 200140088289488815, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 200140088289488815, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286308, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_Name + value: Settings Panel + objectReference: {fileID: 0} + - target: {fileID: 373880450823286308, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_SizeDelta.x + value: 379.05322 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_SizeDelta.y + value: 529.061 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 373880450823286309, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2128408860036517571, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2128408860036517571, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2128408860036517571, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3926013446514820482, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3926013446514820482, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_SizeDelta.x + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 7217105903303998302, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7217105903303998302, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7217105903303998302, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_SizeDelta.x + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 7217105903303998302, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_SizeDelta.y + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 8281873352695723972, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8281873352695723972, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} + propertyPath: m_SizeDelta.y + value: -17 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 37fa6d2e74e6be74abadbafcc6a8d717, type: 3} --- !u!1001 &2648405317185078881 PrefabInstance: m_ObjectHideFlags: 0 @@ -2668,7 +3081,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} propertyPath: m_AnchorMax.x @@ -3669,7 +4082,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4976386519114087309, guid: 7d8f08cd4dfc6ac49b871e08702fbd39, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4976386519114087309, guid: 7d8f08cd4dfc6ac49b871e08702fbd39, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Eversoul/Scripts/Containers.meta b/Assets/Eversoul/Scripts/Containers.meta new file mode 100644 index 0000000..5e60ab8 --- /dev/null +++ b/Assets/Eversoul/Scripts/Containers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d5bef7f2ad289347b89e09aafc21308 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Eversoul/Scripts/EversoulCharacterContainer.cs b/Assets/Eversoul/Scripts/Containers/EversoulCharacterContainer.cs similarity index 80% rename from Assets/Eversoul/Scripts/EversoulCharacterContainer.cs rename to Assets/Eversoul/Scripts/Containers/EversoulCharacterContainer.cs index a69dd4a..f8bcd60 100644 --- a/Assets/Eversoul/Scripts/EversoulCharacterContainer.cs +++ b/Assets/Eversoul/Scripts/Containers/EversoulCharacterContainer.cs @@ -1,9 +1,6 @@ using System.Collections; using System.Collections.Generic; -using System.ComponentModel; -using System.IO; using System.Linq; -using UnityEditor.VersionControl; using UnityEngine; public class EversoulCharacterContainer : ObjectContainer, IAnimated @@ -12,6 +9,7 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated public string AnimationSet; public string Animation; + public MorphPanel MorphPanel; public List Animations; private Animator _animator; private AnimatorOverrideController _animatorController; @@ -19,10 +17,18 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated public override void Select() { + if (MorphPanel != null) + { + MorphPanel.gameObject.SetActive(true); + } } public override void Deselect() { + if (MorphPanel != null) + { + MorphPanel.gameObject.SetActive(false); + } } public IEnumerator Build(CharacterAsset model) @@ -31,6 +37,7 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated var path = EversoulAssetLibrary.Instance.GetResourcePath(model.ResourceName, out var dependencies); var modelPath = EversoulAssetLibrary.Instance.LocalFilesPath + path; var dependencyPaths = dependencies.Select(path => EversoulAssetLibrary.Instance.LocalFilesPath + path).ToList(); + Debug.LogError(modelPath); yield return EversoulAssetLibrary.Instance.LoadAssets(dependencyPaths); @@ -52,6 +59,7 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated _animator.applyRootMotion = false; _animator.runtimeAnimatorController = _animatorController = Instantiate(SharedResources.Instance.GenericAnimatorController); SetBones(); + CreateMorphPanel(); } public void PlayAnimation(AnimationClip anim) @@ -86,9 +94,15 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated case "NineArk/Character/PC_Basic_Body_Transparent": material.shader = Shader.Find("Eversoul/Lit Transparent"); break; + case "NineArk/Character/NPC_Glass": + material.shader = Shader.Find("Eversoul/Glass"); + break; case "NineArk/Character/PC_Basic_Face": material.shader = Shader.Find("Eversoul/Unlit"); break; + case "NineArk/Character/PC_Basic_Eye": + material.shader = Shader.Find("Eversoul/BasicEye"); + break; case "NineArk/Outline/PC_Outline": material.shader = Shader.Find("Eversoul/Outline"); break; @@ -96,12 +110,10 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated material.shader = Shader.Find("Eversoul/Outline Transparent"); break; default: - Debug.Log("Shader not found: " + material.shader.name); + Debug.LogError("Shader not found: " + material.shader.name); //material.shader = Shader.Find("Eversoul/Lit"); break; } - Debug.Log(material.shader); - // } } } @@ -109,7 +121,18 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated public void SetBones() { var humanBones = new Dictionary(); - var allBones = _animator.transform.GetComponentsInChildren().ToDictionary(b => b.name, b => b); + var allBones = new Dictionary(); + foreach(var bone in _animator.transform.GetComponentsInChildren()) + { + if (!allBones.ContainsKey(bone.name)) + { + allBones.Add(bone.name, bone); + } + else + { + Debug.LogWarning("Duplicate bone: " + bone.name); + } + } humanBones.Add(HumanBodyBones.Hips, TryGet(allBones, "Bip001 Pelvis")); humanBones.Add(HumanBodyBones.Spine, TryGet(allBones, "Bip001 Spine")); humanBones.Add(HumanBodyBones.RightUpperLeg, TryGet(allBones, "Bip001 R Thigh")); @@ -181,6 +204,41 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated _humanBones = humanBones; } + public void CreateMorphPanel() + { + if (MorphPanel != null) + { + Destroy(MorphPanel.gameObject); + } + + var morphRenderers = new Dictionary>(); + foreach (var rend in gameObject.GetComponentsInChildren()) + { + if (rend.sharedMesh.blendShapeCount > 0) + { + morphRenderers.Add(rend, new List()); + } + } + + if (morphRenderers.Count == 0) return; + + MorphPanel = MorphPanel.Create(morphRenderers.Select(mr => mr.Key.sharedMesh.name).ToList()); + MorphPanel.name = $"{Data.Name} Morphs"; + + foreach (var rend in morphRenderers) + { + var mesh = rend.Key.sharedMesh; + for (int i = 0; i < mesh.blendShapeCount; i++) + { + MorphPanel.CreateMorph(mesh.name, this, rend.Key, i, mesh.GetBlendShapeName(i)); + } + } + + Morphs = morphRenderers; + EversoulInterface.Instance.SelectedObjectToolbar.AttachToThis(MorphPanel.GetComponent()); + } + + public T TryGet(Dictionary dict, string key) { if (dict.ContainsKey(key)) @@ -202,6 +260,10 @@ public class EversoulCharacterContainer : ObjectContainer, IAnimated protected override void OnDestroy() { if (_applicationQuitting) return; + if (MorphPanel != null) + { + Destroy(MorphPanel.gameObject); + } base.OnDestroy(); } diff --git a/Assets/Eversoul/Scripts/EversoulCharacterContainer.cs.meta b/Assets/Eversoul/Scripts/Containers/EversoulCharacterContainer.cs.meta similarity index 100% rename from Assets/Eversoul/Scripts/EversoulCharacterContainer.cs.meta rename to Assets/Eversoul/Scripts/Containers/EversoulCharacterContainer.cs.meta diff --git a/Assets/Eversoul/Scripts/EversoulAssetLibrary.cs b/Assets/Eversoul/Scripts/EversoulAssetLibrary.cs index ee5e257..1d33a60 100644 --- a/Assets/Eversoul/Scripts/EversoulAssetLibrary.cs +++ b/Assets/Eversoul/Scripts/EversoulAssetLibrary.cs @@ -11,11 +11,6 @@ public class EversoulAssetLibrary : AssetLibrary { public static EversoulAssetLibrary Instance => GetInstance(); - private List assets = new List(); - private Dictionary hashDirectories = new Dictionary(); - private Dictionary hashAssets = new Dictionary(); - private Dictionary assetHashes = new Dictionary(); - public List CharacterAssets = new List(); public List AnimationAssets = new List(); @@ -24,33 +19,42 @@ public class EversoulAssetLibrary : AssetLibrary IEnumerator Start() { var selectedFilePath = new string[0]; + var catalogPath = ModelViewerSettings.Get("CatalogPath", new ModelViewerSettings.Setting("", ModelViewerSettings.SettingType.FilePath)); + var assetsPath = ModelViewerSettings.Get("AssetsPath", new ModelViewerSettings.Setting("", ModelViewerSettings.SettingType.FolderPath)); - while (true) + if (!File.Exists(catalogPath)) { - Debug.LogError("IMPLEMENT SETTINGS!"); - selectedFilePath = StandaloneFileBrowser.OpenFilePanel("Select catalog_eversoul.json", "", "json", false); - if(selectedFilePath.Length > 0 && !string.IsNullOrEmpty(selectedFilePath[0])) + selectedFilePath = new string[0]; + while (true) { - break; + selectedFilePath = StandaloneFileBrowser.OpenFilePanel("Select catalog_eversoul.json", catalogPath, "json", false); + if (selectedFilePath.Length > 0 && !string.IsNullOrEmpty(selectedFilePath[0])) + { + break; + } + yield return new WaitForSeconds(5); } - yield return new WaitForSeconds(5); + catalogPath = selectedFilePath[0]; + ModelViewerSettings.Set("CatalogPath", catalogPath); } - string catalogPath = selectedFilePath[0]; - - selectedFilePath = new string[0]; - while (true) + if (!Directory.Exists(assetsPath)) { - Debug.LogError("IMPLEMENT SETTINGS!"); - selectedFilePath = StandaloneFileBrowser.OpenFolderPanel("Select folder with assets", "", false); - if (selectedFilePath.Length > 0 && !string.IsNullOrEmpty(selectedFilePath[0])) + selectedFilePath = new string[0]; + while (true) { - break; + selectedFilePath = StandaloneFileBrowser.OpenFolderPanel("Select folder with converted assets", assetsPath, false); + if (selectedFilePath.Length > 0 && !string.IsNullOrEmpty(selectedFilePath[0])) + { + break; + } + yield return new WaitForSeconds(5); } - yield return new WaitForSeconds(5); + assetsPath = selectedFilePath[0] + "\\"; + ModelViewerSettings.Set("AssetsPath", assetsPath); } - LocalFilesPath = selectedFilePath[0] + "\\"; + ModelViewerSettings.Save(); yield return LoadAddressableCatalog(catalogPath); diff --git a/Assets/Eversoul/Scripts/EversoulInterface.cs b/Assets/Eversoul/Scripts/EversoulInterface.cs index 8b8f9d3..64ce397 100644 --- a/Assets/Eversoul/Scripts/EversoulInterface.cs +++ b/Assets/Eversoul/Scripts/EversoulInterface.cs @@ -7,4 +7,5 @@ public class EversoulInterface : ModelViewerInterface public static EversoulInterface Instance => GetInstance(); public EversoulCharacterDropdown CharacterSelection; + public UIToolbar SelectedObjectToolbar; } diff --git a/Assets/Eversoul/Scripts/EversoulMain.cs b/Assets/Eversoul/Scripts/EversoulMain.cs index d928355..06fa5d8 100644 --- a/Assets/Eversoul/Scripts/EversoulMain.cs +++ b/Assets/Eversoul/Scripts/EversoulMain.cs @@ -5,4 +5,9 @@ using UnityEngine; public class EversoulMain : ModelViewerMain { public static EversoulMain Instance => GetInstance(); + + private void Awake() + { + base.Awake(); + } } diff --git a/Assets/Eversoul/Shaders/BasicEye.shader b/Assets/Eversoul/Shaders/BasicEye.shader new file mode 100644 index 0000000..9ae4466 --- /dev/null +++ b/Assets/Eversoul/Shaders/BasicEye.shader @@ -0,0 +1,852 @@ +// Made with Amplify Shader Editor +// Available at the Unity Asset Store - http://u3d.as/y3X +Shader "Eversoul/BasicEye" +{ + Properties + { + [HideInInspector] _AlphaCutoff("Alpha Cutoff ", Range(0, 1)) = 0.5 + [HideInInspector] _EmissionColor("Emission Color", Color) = (1,1,1,1) + [ASEBegin]_IrisTex("IrisTex", 2D) = "white" {} + [ASEEnd]_IrisColor("_IrisColor", Color) = (1,1,1,1) + [HideInInspector] _texcoord( "", 2D ) = "white" {} + + //_TessPhongStrength( "Tess Phong Strength", Range( 0, 1 ) ) = 0.5 + //_TessValue( "Tess Max Tessellation", Range( 1, 32 ) ) = 16 + //_TessMin( "Tess Min Distance", Float ) = 10 + //_TessMax( "Tess Max Distance", Float ) = 25 + //_TessEdgeLength ( "Tess Edge length", Range( 2, 50 ) ) = 16 + //_TessMaxDisp( "Tess Max Displacement", Float ) = 25 + } + + SubShader + { + LOD 0 + + + Tags { "RenderPipeline"="UniversalPipeline" "RenderType"="Opaque" "Queue"="Geometry" } + + Cull Back + AlphaToMask Off + HLSLINCLUDE + #pragma target 2.0 + + float4 FixedTess( float tessValue ) + { + return tessValue; + } + + float CalcDistanceTessFactor (float4 vertex, float minDist, float maxDist, float tess, float4x4 o2w, float3 cameraPos ) + { + float3 wpos = mul(o2w,vertex).xyz; + float dist = distance (wpos, cameraPos); + float f = clamp(1.0 - (dist - minDist) / (maxDist - minDist), 0.01, 1.0) * tess; + return f; + } + + float4 CalcTriEdgeTessFactors (float3 triVertexFactors) + { + float4 tess; + tess.x = 0.5 * (triVertexFactors.y + triVertexFactors.z); + tess.y = 0.5 * (triVertexFactors.x + triVertexFactors.z); + tess.z = 0.5 * (triVertexFactors.x + triVertexFactors.y); + tess.w = (triVertexFactors.x + triVertexFactors.y + triVertexFactors.z) / 3.0f; + return tess; + } + + float CalcEdgeTessFactor (float3 wpos0, float3 wpos1, float edgeLen, float3 cameraPos, float4 scParams ) + { + float dist = distance (0.5 * (wpos0+wpos1), cameraPos); + float len = distance(wpos0, wpos1); + float f = max(len * scParams.y / (edgeLen * dist), 1.0); + return f; + } + + float DistanceFromPlane (float3 pos, float4 plane) + { + float d = dot (float4(pos,1.0f), plane); + return d; + } + + bool WorldViewFrustumCull (float3 wpos0, float3 wpos1, float3 wpos2, float cullEps, float4 planes[6] ) + { + float4 planeTest; + planeTest.x = (( DistanceFromPlane(wpos0, planes[0]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[0]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[0]) > -cullEps) ? 1.0f : 0.0f ); + planeTest.y = (( DistanceFromPlane(wpos0, planes[1]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[1]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[1]) > -cullEps) ? 1.0f : 0.0f ); + planeTest.z = (( DistanceFromPlane(wpos0, planes[2]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[2]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[2]) > -cullEps) ? 1.0f : 0.0f ); + planeTest.w = (( DistanceFromPlane(wpos0, planes[3]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[3]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[3]) > -cullEps) ? 1.0f : 0.0f ); + return !all (planeTest); + } + + float4 DistanceBasedTess( float4 v0, float4 v1, float4 v2, float tess, float minDist, float maxDist, float4x4 o2w, float3 cameraPos ) + { + float3 f; + f.x = CalcDistanceTessFactor (v0,minDist,maxDist,tess,o2w,cameraPos); + f.y = CalcDistanceTessFactor (v1,minDist,maxDist,tess,o2w,cameraPos); + f.z = CalcDistanceTessFactor (v2,minDist,maxDist,tess,o2w,cameraPos); + + return CalcTriEdgeTessFactors (f); + } + + float4 EdgeLengthBasedTess( float4 v0, float4 v1, float4 v2, float edgeLength, float4x4 o2w, float3 cameraPos, float4 scParams ) + { + float3 pos0 = mul(o2w,v0).xyz; + float3 pos1 = mul(o2w,v1).xyz; + float3 pos2 = mul(o2w,v2).xyz; + float4 tess; + tess.x = CalcEdgeTessFactor (pos1, pos2, edgeLength, cameraPos, scParams); + tess.y = CalcEdgeTessFactor (pos2, pos0, edgeLength, cameraPos, scParams); + tess.z = CalcEdgeTessFactor (pos0, pos1, edgeLength, cameraPos, scParams); + tess.w = (tess.x + tess.y + tess.z) / 3.0f; + return tess; + } + + float4 EdgeLengthBasedTessCull( float4 v0, float4 v1, float4 v2, float edgeLength, float maxDisplacement, float4x4 o2w, float3 cameraPos, float4 scParams, float4 planes[6] ) + { + float3 pos0 = mul(o2w,v0).xyz; + float3 pos1 = mul(o2w,v1).xyz; + float3 pos2 = mul(o2w,v2).xyz; + float4 tess; + + if (WorldViewFrustumCull(pos0, pos1, pos2, maxDisplacement, planes)) + { + tess = 0.0f; + } + else + { + tess.x = CalcEdgeTessFactor (pos1, pos2, edgeLength, cameraPos, scParams); + tess.y = CalcEdgeTessFactor (pos2, pos0, edgeLength, cameraPos, scParams); + tess.z = CalcEdgeTessFactor (pos0, pos1, edgeLength, cameraPos, scParams); + tess.w = (tess.x + tess.y + tess.z) / 3.0f; + } + return tess; + } + ENDHLSL + + + Pass + { + + Name "Forward" + Tags { "LightMode"="UniversalForward" } + + Blend One Zero, One Zero + ZWrite On + ZTest LEqual + Offset 0 , 0 + ColorMask RGBA + + + HLSLPROGRAM + #pragma multi_compile_instancing + #define ASE_SRP_VERSION 999999 + + #pragma prefer_hlslcc gles + #pragma exclude_renderers d3d11_9x + + #pragma vertex vert + #pragma fragment frag + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityInstancing.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" + + #if ASE_SRP_VERSION <= 70108 + #define REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR + #endif + + + + struct VertexInput + { + float4 vertex : POSITION; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct VertexOutput + { + float4 clipPos : SV_POSITION; + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 worldPos : TEXCOORD0; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + float4 shadowCoord : TEXCOORD1; + #endif + #ifdef ASE_FOG + float fogFactor : TEXCOORD2; + #endif + float4 ase_texcoord3 : TEXCOORD3; + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO + }; + + CBUFFER_START(UnityPerMaterial) + float4 _IrisTex_ST; + float4 _IrisColor; + #ifdef TESSELLATION_ON + float _TessPhongStrength; + float _TessValue; + float _TessMin; + float _TessMax; + float _TessEdgeLength; + float _TessMaxDisp; + #endif + CBUFFER_END + sampler2D _IrisTex; + + + + VertexOutput VertexFunction ( VertexInput v ) + { + VertexOutput o = (VertexOutput)0; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + + o.ase_texcoord3.xy = v.ase_texcoord.xy; + + //setting value to unused interpolator channels and avoid initialization warnings + o.ase_texcoord3.zw = 0; + #ifdef ASE_ABSOLUTE_VERTEX_POS + float3 defaultVertexValue = v.vertex.xyz; + #else + float3 defaultVertexValue = float3(0, 0, 0); + #endif + float3 vertexValue = defaultVertexValue; + #ifdef ASE_ABSOLUTE_VERTEX_POS + v.vertex.xyz = vertexValue; + #else + v.vertex.xyz += vertexValue; + #endif + v.ase_normal = v.ase_normal; + + float3 positionWS = TransformObjectToWorld( v.vertex.xyz ); + float4 positionCS = TransformWorldToHClip( positionWS ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + o.worldPos = positionWS; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + VertexPositionInputs vertexInput = (VertexPositionInputs)0; + vertexInput.positionWS = positionWS; + vertexInput.positionCS = positionCS; + o.shadowCoord = GetShadowCoord( vertexInput ); + #endif + #ifdef ASE_FOG + o.fogFactor = ComputeFogFactor( positionCS.z ); + #endif + o.clipPos = positionCS; + return o; + } + + #if defined(TESSELLATION_ON) + struct VertexControl + { + float4 vertex : INTERNALTESSPOS; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct TessellationFactors + { + float edge[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + VertexControl vert ( VertexInput v ) + { + VertexControl o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + o.vertex = v.vertex; + o.ase_normal = v.ase_normal; + o.ase_texcoord = v.ase_texcoord; + return o; + } + + TessellationFactors TessellationFunction (InputPatch v) + { + TessellationFactors o; + float4 tf = 1; + float tessValue = _TessValue; float tessMin = _TessMin; float tessMax = _TessMax; + float edgeLength = _TessEdgeLength; float tessMaxDisp = _TessMaxDisp; + #if defined(ASE_FIXED_TESSELLATION) + tf = FixedTess( tessValue ); + #elif defined(ASE_DISTANCE_TESSELLATION) + tf = DistanceBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, tessValue, tessMin, tessMax, GetObjectToWorldMatrix(), _WorldSpaceCameraPos ); + #elif defined(ASE_LENGTH_TESSELLATION) + tf = EdgeLengthBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams ); + #elif defined(ASE_LENGTH_CULL_TESSELLATION) + tf = EdgeLengthBasedTessCull(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, tessMaxDisp, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams, unity_CameraWorldClipPlanes ); + #endif + o.edge[0] = tf.x; o.edge[1] = tf.y; o.edge[2] = tf.z; o.inside = tf.w; + return o; + } + + [domain("tri")] + [partitioning("fractional_odd")] + [outputtopology("triangle_cw")] + [patchconstantfunc("TessellationFunction")] + [outputcontrolpoints(3)] + VertexControl HullFunction(InputPatch patch, uint id : SV_OutputControlPointID) + { + return patch[id]; + } + + [domain("tri")] + VertexOutput DomainFunction(TessellationFactors factors, OutputPatch patch, float3 bary : SV_DomainLocation) + { + VertexInput o = (VertexInput) 0; + o.vertex = patch[0].vertex * bary.x + patch[1].vertex * bary.y + patch[2].vertex * bary.z; + o.ase_normal = patch[0].ase_normal * bary.x + patch[1].ase_normal * bary.y + patch[2].ase_normal * bary.z; + o.ase_texcoord = patch[0].ase_texcoord * bary.x + patch[1].ase_texcoord * bary.y + patch[2].ase_texcoord * bary.z; + #if defined(ASE_PHONG_TESSELLATION) + float3 pp[3]; + for (int i = 0; i < 3; ++i) + pp[i] = o.vertex.xyz - patch[i].ase_normal * (dot(o.vertex.xyz, patch[i].ase_normal) - dot(patch[i].vertex.xyz, patch[i].ase_normal)); + float phongStrength = _TessPhongStrength; + o.vertex.xyz = phongStrength * (pp[0]*bary.x + pp[1]*bary.y + pp[2]*bary.z) + (1.0f-phongStrength) * o.vertex.xyz; + #endif + UNITY_TRANSFER_INSTANCE_ID(patch[0], o); + return VertexFunction(o); + } + #else + VertexOutput vert ( VertexInput v ) + { + return VertexFunction( v ); + } + #endif + + half4 frag ( VertexOutput IN ) : SV_Target + { + UNITY_SETUP_INSTANCE_ID( IN ); + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX( IN ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 WorldPosition = IN.worldPos; + #endif + float4 ShadowCoords = float4( 0, 0, 0, 0 ); + + #if defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + ShadowCoords = IN.shadowCoord; + #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + ShadowCoords = TransformWorldToShadowCoord( WorldPosition ); + #endif + #endif + float2 uv_IrisTex = IN.ase_texcoord3.xy * _IrisTex_ST.xy + _IrisTex_ST.zw; + + float3 BakedAlbedo = 0; + float3 BakedEmission = 0; + float3 Color = ( tex2D( _IrisTex, uv_IrisTex ) * _IrisColor ).rgb; + float Alpha = 1; + float AlphaClipThreshold = 0.5; + float AlphaClipThresholdShadow = 0.5; + + #ifdef _ALPHATEST_ON + clip( Alpha - AlphaClipThreshold ); + #endif + + #ifdef LOD_FADE_CROSSFADE + LODDitheringTransition( IN.clipPos.xyz, unity_LODFade.x ); + #endif + + #ifdef ASE_FOG + Color = MixFog( Color, IN.fogFactor ); + #endif + + return half4( Color, Alpha ); + } + + ENDHLSL + } + + + Pass + { + + Name "ShadowCaster" + Tags { "LightMode"="ShadowCaster" } + + ZWrite On + ZTest LEqual + AlphaToMask Off + + HLSLPROGRAM + #pragma multi_compile_instancing + #define ASE_SRP_VERSION 999999 + + #pragma prefer_hlslcc gles + #pragma exclude_renderers d3d11_9x + + #pragma vertex vert + #pragma fragment frag + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl" + + + + struct VertexInput + { + float4 vertex : POSITION; + float3 ase_normal : NORMAL; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct VertexOutput + { + float4 clipPos : SV_POSITION; + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 worldPos : TEXCOORD0; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + float4 shadowCoord : TEXCOORD1; + #endif + + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO + }; + + CBUFFER_START(UnityPerMaterial) + float4 _IrisTex_ST; + float4 _IrisColor; + #ifdef TESSELLATION_ON + float _TessPhongStrength; + float _TessValue; + float _TessMin; + float _TessMax; + float _TessEdgeLength; + float _TessMaxDisp; + #endif + CBUFFER_END + + + + float3 _LightDirection; + + VertexOutput VertexFunction( VertexInput v ) + { + VertexOutput o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO( o ); + + + #ifdef ASE_ABSOLUTE_VERTEX_POS + float3 defaultVertexValue = v.vertex.xyz; + #else + float3 defaultVertexValue = float3(0, 0, 0); + #endif + float3 vertexValue = defaultVertexValue; + #ifdef ASE_ABSOLUTE_VERTEX_POS + v.vertex.xyz = vertexValue; + #else + v.vertex.xyz += vertexValue; + #endif + + v.ase_normal = v.ase_normal; + + float3 positionWS = TransformObjectToWorld( v.vertex.xyz ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + o.worldPos = positionWS; + #endif + + float3 normalWS = TransformObjectToWorldDir( v.ase_normal ); + + float4 clipPos = TransformWorldToHClip( ApplyShadowBias( positionWS, normalWS, _LightDirection ) ); + + #if UNITY_REVERSED_Z + clipPos.z = min(clipPos.z, clipPos.w * UNITY_NEAR_CLIP_VALUE); + #else + clipPos.z = max(clipPos.z, clipPos.w * UNITY_NEAR_CLIP_VALUE); + #endif + + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + VertexPositionInputs vertexInput = (VertexPositionInputs)0; + vertexInput.positionWS = positionWS; + vertexInput.positionCS = clipPos; + o.shadowCoord = GetShadowCoord( vertexInput ); + #endif + o.clipPos = clipPos; + + return o; + } + + #if defined(TESSELLATION_ON) + struct VertexControl + { + float4 vertex : INTERNALTESSPOS; + float3 ase_normal : NORMAL; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct TessellationFactors + { + float edge[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + VertexControl vert ( VertexInput v ) + { + VertexControl o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + o.vertex = v.vertex; + o.ase_normal = v.ase_normal; + + return o; + } + + TessellationFactors TessellationFunction (InputPatch v) + { + TessellationFactors o; + float4 tf = 1; + float tessValue = _TessValue; float tessMin = _TessMin; float tessMax = _TessMax; + float edgeLength = _TessEdgeLength; float tessMaxDisp = _TessMaxDisp; + #if defined(ASE_FIXED_TESSELLATION) + tf = FixedTess( tessValue ); + #elif defined(ASE_DISTANCE_TESSELLATION) + tf = DistanceBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, tessValue, tessMin, tessMax, GetObjectToWorldMatrix(), _WorldSpaceCameraPos ); + #elif defined(ASE_LENGTH_TESSELLATION) + tf = EdgeLengthBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams ); + #elif defined(ASE_LENGTH_CULL_TESSELLATION) + tf = EdgeLengthBasedTessCull(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, tessMaxDisp, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams, unity_CameraWorldClipPlanes ); + #endif + o.edge[0] = tf.x; o.edge[1] = tf.y; o.edge[2] = tf.z; o.inside = tf.w; + return o; + } + + [domain("tri")] + [partitioning("fractional_odd")] + [outputtopology("triangle_cw")] + [patchconstantfunc("TessellationFunction")] + [outputcontrolpoints(3)] + VertexControl HullFunction(InputPatch patch, uint id : SV_OutputControlPointID) + { + return patch[id]; + } + + [domain("tri")] + VertexOutput DomainFunction(TessellationFactors factors, OutputPatch patch, float3 bary : SV_DomainLocation) + { + VertexInput o = (VertexInput) 0; + o.vertex = patch[0].vertex * bary.x + patch[1].vertex * bary.y + patch[2].vertex * bary.z; + o.ase_normal = patch[0].ase_normal * bary.x + patch[1].ase_normal * bary.y + patch[2].ase_normal * bary.z; + + #if defined(ASE_PHONG_TESSELLATION) + float3 pp[3]; + for (int i = 0; i < 3; ++i) + pp[i] = o.vertex.xyz - patch[i].ase_normal * (dot(o.vertex.xyz, patch[i].ase_normal) - dot(patch[i].vertex.xyz, patch[i].ase_normal)); + float phongStrength = _TessPhongStrength; + o.vertex.xyz = phongStrength * (pp[0]*bary.x + pp[1]*bary.y + pp[2]*bary.z) + (1.0f-phongStrength) * o.vertex.xyz; + #endif + UNITY_TRANSFER_INSTANCE_ID(patch[0], o); + return VertexFunction(o); + } + #else + VertexOutput vert ( VertexInput v ) + { + return VertexFunction( v ); + } + #endif + + half4 frag(VertexOutput IN ) : SV_TARGET + { + UNITY_SETUP_INSTANCE_ID( IN ); + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX( IN ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 WorldPosition = IN.worldPos; + #endif + float4 ShadowCoords = float4( 0, 0, 0, 0 ); + + #if defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + ShadowCoords = IN.shadowCoord; + #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + ShadowCoords = TransformWorldToShadowCoord( WorldPosition ); + #endif + #endif + + + float Alpha = 1; + float AlphaClipThreshold = 0.5; + float AlphaClipThresholdShadow = 0.5; + + #ifdef _ALPHATEST_ON + #ifdef _ALPHATEST_SHADOW_ON + clip(Alpha - AlphaClipThresholdShadow); + #else + clip(Alpha - AlphaClipThreshold); + #endif + #endif + + #ifdef LOD_FADE_CROSSFADE + LODDitheringTransition( IN.clipPos.xyz, unity_LODFade.x ); + #endif + return 0; + } + + ENDHLSL + } + + + Pass + { + + Name "DepthOnly" + Tags { "LightMode"="DepthOnly" } + + ZWrite On + ColorMask 0 + AlphaToMask Off + + HLSLPROGRAM + #pragma multi_compile_instancing + #define ASE_SRP_VERSION 999999 + + #pragma prefer_hlslcc gles + #pragma exclude_renderers d3d11_9x + + #pragma vertex vert + #pragma fragment frag + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl" + + + + struct VertexInput + { + float4 vertex : POSITION; + float3 ase_normal : NORMAL; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct VertexOutput + { + float4 clipPos : SV_POSITION; + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 worldPos : TEXCOORD0; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + float4 shadowCoord : TEXCOORD1; + #endif + + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO + }; + + CBUFFER_START(UnityPerMaterial) + float4 _IrisTex_ST; + float4 _IrisColor; + #ifdef TESSELLATION_ON + float _TessPhongStrength; + float _TessValue; + float _TessMin; + float _TessMax; + float _TessEdgeLength; + float _TessMaxDisp; + #endif + CBUFFER_END + + + + VertexOutput VertexFunction( VertexInput v ) + { + VertexOutput o = (VertexOutput)0; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + + + #ifdef ASE_ABSOLUTE_VERTEX_POS + float3 defaultVertexValue = v.vertex.xyz; + #else + float3 defaultVertexValue = float3(0, 0, 0); + #endif + float3 vertexValue = defaultVertexValue; + #ifdef ASE_ABSOLUTE_VERTEX_POS + v.vertex.xyz = vertexValue; + #else + v.vertex.xyz += vertexValue; + #endif + + v.ase_normal = v.ase_normal; + + float3 positionWS = TransformObjectToWorld( v.vertex.xyz ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + o.worldPos = positionWS; + #endif + + o.clipPos = TransformWorldToHClip( positionWS ); + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + VertexPositionInputs vertexInput = (VertexPositionInputs)0; + vertexInput.positionWS = positionWS; + vertexInput.positionCS = clipPos; + o.shadowCoord = GetShadowCoord( vertexInput ); + #endif + return o; + } + + #if defined(TESSELLATION_ON) + struct VertexControl + { + float4 vertex : INTERNALTESSPOS; + float3 ase_normal : NORMAL; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct TessellationFactors + { + float edge[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + VertexControl vert ( VertexInput v ) + { + VertexControl o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + o.vertex = v.vertex; + o.ase_normal = v.ase_normal; + + return o; + } + + TessellationFactors TessellationFunction (InputPatch v) + { + TessellationFactors o; + float4 tf = 1; + float tessValue = _TessValue; float tessMin = _TessMin; float tessMax = _TessMax; + float edgeLength = _TessEdgeLength; float tessMaxDisp = _TessMaxDisp; + #if defined(ASE_FIXED_TESSELLATION) + tf = FixedTess( tessValue ); + #elif defined(ASE_DISTANCE_TESSELLATION) + tf = DistanceBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, tessValue, tessMin, tessMax, GetObjectToWorldMatrix(), _WorldSpaceCameraPos ); + #elif defined(ASE_LENGTH_TESSELLATION) + tf = EdgeLengthBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams ); + #elif defined(ASE_LENGTH_CULL_TESSELLATION) + tf = EdgeLengthBasedTessCull(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, tessMaxDisp, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams, unity_CameraWorldClipPlanes ); + #endif + o.edge[0] = tf.x; o.edge[1] = tf.y; o.edge[2] = tf.z; o.inside = tf.w; + return o; + } + + [domain("tri")] + [partitioning("fractional_odd")] + [outputtopology("triangle_cw")] + [patchconstantfunc("TessellationFunction")] + [outputcontrolpoints(3)] + VertexControl HullFunction(InputPatch patch, uint id : SV_OutputControlPointID) + { + return patch[id]; + } + + [domain("tri")] + VertexOutput DomainFunction(TessellationFactors factors, OutputPatch patch, float3 bary : SV_DomainLocation) + { + VertexInput o = (VertexInput) 0; + o.vertex = patch[0].vertex * bary.x + patch[1].vertex * bary.y + patch[2].vertex * bary.z; + o.ase_normal = patch[0].ase_normal * bary.x + patch[1].ase_normal * bary.y + patch[2].ase_normal * bary.z; + + #if defined(ASE_PHONG_TESSELLATION) + float3 pp[3]; + for (int i = 0; i < 3; ++i) + pp[i] = o.vertex.xyz - patch[i].ase_normal * (dot(o.vertex.xyz, patch[i].ase_normal) - dot(patch[i].vertex.xyz, patch[i].ase_normal)); + float phongStrength = _TessPhongStrength; + o.vertex.xyz = phongStrength * (pp[0]*bary.x + pp[1]*bary.y + pp[2]*bary.z) + (1.0f-phongStrength) * o.vertex.xyz; + #endif + UNITY_TRANSFER_INSTANCE_ID(patch[0], o); + return VertexFunction(o); + } + #else + VertexOutput vert ( VertexInput v ) + { + return VertexFunction( v ); + } + #endif + + half4 frag(VertexOutput IN ) : SV_TARGET + { + UNITY_SETUP_INSTANCE_ID(IN); + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX( IN ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 WorldPosition = IN.worldPos; + #endif + float4 ShadowCoords = float4( 0, 0, 0, 0 ); + + #if defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + ShadowCoords = IN.shadowCoord; + #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + ShadowCoords = TransformWorldToShadowCoord( WorldPosition ); + #endif + #endif + + + float Alpha = 1; + float AlphaClipThreshold = 0.5; + + #ifdef _ALPHATEST_ON + clip(Alpha - AlphaClipThreshold); + #endif + + #ifdef LOD_FADE_CROSSFADE + LODDitheringTransition( IN.clipPos.xyz, unity_LODFade.x ); + #endif + return 0; + } + ENDHLSL + } + + + } + CustomEditor "UnityEditor.ShaderGraph.PBRMasterGUI" + Fallback "Hidden/InternalErrorShader" + +} +/*ASEBEGIN +Version=18500 +234;516;995;443;1555.12;755.6974;1.732671;True;False +Node;AmplifyShaderEditor.SamplerNode;6;-563.2662,-139.1945;Inherit;True;Property;_MaskTex;Mask Texture (R:Emissive, G:Shadow, B:Specular);1;0;Create;False;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.ColorNode;7;-978.7308,-311.4169;Inherit;False;Property;_BaseColor;_BaseColor;2;0;Create;True;0;0;False;0;False;1,1,1,1;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.ColorNode;8;-987.2006,-119.6642;Inherit;False;Property;_Color;_Color;3;0;Create;True;0;0;False;0;False;1,1,1,1;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.ColorNode;9;-764.6183,-601.8691;Inherit;False;Property;_IrisColor;_IrisColor;4;0;Create;True;0;0;False;0;False;1,1,1,1;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SamplerNode;5;-839.7493,-796.374;Inherit;True;Property;_IrisTex;IrisTex;0;0;Create;True;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;10;-426.8922,-630.7787;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;0;0,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;3;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;ExtraPrePass;0;0;ExtraPrePass;5;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;True;1;1;False;-1;0;False;-1;0;1;False;-1;0;False;-1;False;False;False;False;False;False;False;False;True;0;False;-1;True;True;True;True;True;0;False;-1;False;False;False;True;False;255;False;-1;255;False;-1;255;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;True;1;False;-1;True;3;False;-1;True;True;0;False;-1;0;False;-1;True;0;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;1;0,0;Float;False;True;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;3;Eversoul/BasicEye;2992e84f91cbeb14eab234972e07ea9d;True;Forward;0;1;Forward;8;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;True;1;1;False;-1;0;False;-1;1;1;False;-1;0;False;-1;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;-1;False;False;False;True;False;255;False;-1;255;False;-1;255;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;True;1;False;-1;True;3;False;-1;True;True;0;False;-1;0;False;-1;True;1;LightMode=UniversalForward;False;0;Hidden/InternalErrorShader;0;0;Standard;22;Surface;0; Blend;0;Two Sided;1;Cast Shadows;1; Use Shadow Threshold;0;Receive Shadows;1;GPU Instancing;1;LOD CrossFade;0;Built-in Fog;0;DOTS Instancing;0;Meta Pass;0;Extra Pre Pass;0;Tessellation;0; Phong;0; Strength;0.5,False,-1; Type;0; Tess;16,False,-1; Min;10,False,-1; Max;25,False,-1; Edge Length;16,False,-1; Max Displacement;25,False,-1;Vertex Position,InvertActionOnDeselection;1;0;5;False;True;True;True;False;False;;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;2;0,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;3;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;ShadowCaster;0;2;ShadowCaster;0;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;False;False;False;False;False;False;False;False;True;0;False;-1;False;False;False;False;False;False;True;1;False;-1;True;3;False;-1;False;True;1;LightMode=ShadowCaster;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;3;0,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;3;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;DepthOnly;0;3;DepthOnly;0;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;False;False;False;False;False;False;False;False;True;0;False;-1;False;True;False;False;False;False;0;False;-1;False;False;False;False;True;1;False;-1;False;False;True;1;LightMode=DepthOnly;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;4;0,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;3;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;Meta;0;4;Meta;0;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;False;False;False;False;False;False;False;False;False;True;2;False;-1;False;False;False;False;False;False;False;False;True;1;LightMode=Meta;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +WireConnection;10;0;5;0 +WireConnection;10;1;9;0 +WireConnection;1;2;10;0 +ASEEND*/ +//CHKSM=CBF8DA574045E301DD36E2CA450CF02929721161 \ No newline at end of file diff --git a/Assets/Eversoul/Shaders/BasicEye.shader.meta b/Assets/Eversoul/Shaders/BasicEye.shader.meta new file mode 100644 index 0000000..02fc1e3 --- /dev/null +++ b/Assets/Eversoul/Shaders/BasicEye.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4cc65c7a69946b240b4954d393a1e021 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Eversoul/Shaders/Glass.shader b/Assets/Eversoul/Shaders/Glass.shader new file mode 100644 index 0000000..10237f6 --- /dev/null +++ b/Assets/Eversoul/Shaders/Glass.shader @@ -0,0 +1,874 @@ +// Made with Amplify Shader Editor +// Available at the Unity Asset Store - http://u3d.as/y3X +Shader "Eversoul/Glass" +{ + Properties + { + [HideInInspector] _AlphaCutoff("Alpha Cutoff ", Range(0, 1)) = 0.5 + [HideInInspector] _EmissionColor("Emission Color", Color) = (1,1,1,1) + [ASEBegin]_MainTex("BaseColor Texture", 2D) = "white" {} + [ASEEnd]_Color("Color", Color) = (0,0,0,0) + [HideInInspector] _texcoord( "", 2D ) = "white" {} + + //_TessPhongStrength( "Tess Phong Strength", Range( 0, 1 ) ) = 0.5 + //_TessValue( "Tess Max Tessellation", Range( 1, 32 ) ) = 16 + //_TessMin( "Tess Min Distance", Float ) = 10 + //_TessMax( "Tess Max Distance", Float ) = 25 + //_TessEdgeLength ( "Tess Edge length", Range( 2, 50 ) ) = 16 + //_TessMaxDisp( "Tess Max Displacement", Float ) = 25 + } + + SubShader + { + LOD 0 + + + Tags { "RenderPipeline"="UniversalPipeline" "RenderType"="Transparent" "Queue"="Transparent" } + + Cull Back + AlphaToMask Off + HLSLINCLUDE + #pragma target 2.0 + + float4 FixedTess( float tessValue ) + { + return tessValue; + } + + float CalcDistanceTessFactor (float4 vertex, float minDist, float maxDist, float tess, float4x4 o2w, float3 cameraPos ) + { + float3 wpos = mul(o2w,vertex).xyz; + float dist = distance (wpos, cameraPos); + float f = clamp(1.0 - (dist - minDist) / (maxDist - minDist), 0.01, 1.0) * tess; + return f; + } + + float4 CalcTriEdgeTessFactors (float3 triVertexFactors) + { + float4 tess; + tess.x = 0.5 * (triVertexFactors.y + triVertexFactors.z); + tess.y = 0.5 * (triVertexFactors.x + triVertexFactors.z); + tess.z = 0.5 * (triVertexFactors.x + triVertexFactors.y); + tess.w = (triVertexFactors.x + triVertexFactors.y + triVertexFactors.z) / 3.0f; + return tess; + } + + float CalcEdgeTessFactor (float3 wpos0, float3 wpos1, float edgeLen, float3 cameraPos, float4 scParams ) + { + float dist = distance (0.5 * (wpos0+wpos1), cameraPos); + float len = distance(wpos0, wpos1); + float f = max(len * scParams.y / (edgeLen * dist), 1.0); + return f; + } + + float DistanceFromPlane (float3 pos, float4 plane) + { + float d = dot (float4(pos,1.0f), plane); + return d; + } + + bool WorldViewFrustumCull (float3 wpos0, float3 wpos1, float3 wpos2, float cullEps, float4 planes[6] ) + { + float4 planeTest; + planeTest.x = (( DistanceFromPlane(wpos0, planes[0]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[0]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[0]) > -cullEps) ? 1.0f : 0.0f ); + planeTest.y = (( DistanceFromPlane(wpos0, planes[1]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[1]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[1]) > -cullEps) ? 1.0f : 0.0f ); + planeTest.z = (( DistanceFromPlane(wpos0, planes[2]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[2]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[2]) > -cullEps) ? 1.0f : 0.0f ); + planeTest.w = (( DistanceFromPlane(wpos0, planes[3]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos1, planes[3]) > -cullEps) ? 1.0f : 0.0f ) + + (( DistanceFromPlane(wpos2, planes[3]) > -cullEps) ? 1.0f : 0.0f ); + return !all (planeTest); + } + + float4 DistanceBasedTess( float4 v0, float4 v1, float4 v2, float tess, float minDist, float maxDist, float4x4 o2w, float3 cameraPos ) + { + float3 f; + f.x = CalcDistanceTessFactor (v0,minDist,maxDist,tess,o2w,cameraPos); + f.y = CalcDistanceTessFactor (v1,minDist,maxDist,tess,o2w,cameraPos); + f.z = CalcDistanceTessFactor (v2,minDist,maxDist,tess,o2w,cameraPos); + + return CalcTriEdgeTessFactors (f); + } + + float4 EdgeLengthBasedTess( float4 v0, float4 v1, float4 v2, float edgeLength, float4x4 o2w, float3 cameraPos, float4 scParams ) + { + float3 pos0 = mul(o2w,v0).xyz; + float3 pos1 = mul(o2w,v1).xyz; + float3 pos2 = mul(o2w,v2).xyz; + float4 tess; + tess.x = CalcEdgeTessFactor (pos1, pos2, edgeLength, cameraPos, scParams); + tess.y = CalcEdgeTessFactor (pos2, pos0, edgeLength, cameraPos, scParams); + tess.z = CalcEdgeTessFactor (pos0, pos1, edgeLength, cameraPos, scParams); + tess.w = (tess.x + tess.y + tess.z) / 3.0f; + return tess; + } + + float4 EdgeLengthBasedTessCull( float4 v0, float4 v1, float4 v2, float edgeLength, float maxDisplacement, float4x4 o2w, float3 cameraPos, float4 scParams, float4 planes[6] ) + { + float3 pos0 = mul(o2w,v0).xyz; + float3 pos1 = mul(o2w,v1).xyz; + float3 pos2 = mul(o2w,v2).xyz; + float4 tess; + + if (WorldViewFrustumCull(pos0, pos1, pos2, maxDisplacement, planes)) + { + tess = 0.0f; + } + else + { + tess.x = CalcEdgeTessFactor (pos1, pos2, edgeLength, cameraPos, scParams); + tess.y = CalcEdgeTessFactor (pos2, pos0, edgeLength, cameraPos, scParams); + tess.z = CalcEdgeTessFactor (pos0, pos1, edgeLength, cameraPos, scParams); + tess.w = (tess.x + tess.y + tess.z) / 3.0f; + } + return tess; + } + ENDHLSL + + + Pass + { + + Name "Forward" + Tags { "LightMode"="UniversalForward" } + + Blend SrcAlpha OneMinusSrcAlpha, One OneMinusSrcAlpha + ZWrite Off + ZTest LEqual + Offset 0 , 0 + ColorMask RGBA + Stencil + { + Ref 1 + Comp Always + Pass Replace + Fail Keep + ZFail Keep + } + + HLSLPROGRAM + #pragma multi_compile_instancing + #define ASE_SRP_VERSION 999999 + + #pragma prefer_hlslcc gles + #pragma exclude_renderers d3d11_9x + + #pragma vertex vert + #pragma fragment frag + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityInstancing.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" + + #if ASE_SRP_VERSION <= 70108 + #define REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR + #endif + + + + struct VertexInput + { + float4 vertex : POSITION; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct VertexOutput + { + float4 clipPos : SV_POSITION; + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 worldPos : TEXCOORD0; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + float4 shadowCoord : TEXCOORD1; + #endif + #ifdef ASE_FOG + float fogFactor : TEXCOORD2; + #endif + float4 ase_texcoord3 : TEXCOORD3; + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO + }; + + CBUFFER_START(UnityPerMaterial) + float4 _MainTex_ST; + float4 _Color; + #ifdef TESSELLATION_ON + float _TessPhongStrength; + float _TessValue; + float _TessMin; + float _TessMax; + float _TessEdgeLength; + float _TessMaxDisp; + #endif + CBUFFER_END + sampler2D _MainTex; + + + + VertexOutput VertexFunction ( VertexInput v ) + { + VertexOutput o = (VertexOutput)0; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + + o.ase_texcoord3.xy = v.ase_texcoord.xy; + + //setting value to unused interpolator channels and avoid initialization warnings + o.ase_texcoord3.zw = 0; + #ifdef ASE_ABSOLUTE_VERTEX_POS + float3 defaultVertexValue = v.vertex.xyz; + #else + float3 defaultVertexValue = float3(0, 0, 0); + #endif + float3 vertexValue = defaultVertexValue; + #ifdef ASE_ABSOLUTE_VERTEX_POS + v.vertex.xyz = vertexValue; + #else + v.vertex.xyz += vertexValue; + #endif + v.ase_normal = v.ase_normal; + + float3 positionWS = TransformObjectToWorld( v.vertex.xyz ); + float4 positionCS = TransformWorldToHClip( positionWS ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + o.worldPos = positionWS; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + VertexPositionInputs vertexInput = (VertexPositionInputs)0; + vertexInput.positionWS = positionWS; + vertexInput.positionCS = positionCS; + o.shadowCoord = GetShadowCoord( vertexInput ); + #endif + #ifdef ASE_FOG + o.fogFactor = ComputeFogFactor( positionCS.z ); + #endif + o.clipPos = positionCS; + return o; + } + + #if defined(TESSELLATION_ON) + struct VertexControl + { + float4 vertex : INTERNALTESSPOS; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct TessellationFactors + { + float edge[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + VertexControl vert ( VertexInput v ) + { + VertexControl o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + o.vertex = v.vertex; + o.ase_normal = v.ase_normal; + o.ase_texcoord = v.ase_texcoord; + return o; + } + + TessellationFactors TessellationFunction (InputPatch v) + { + TessellationFactors o; + float4 tf = 1; + float tessValue = _TessValue; float tessMin = _TessMin; float tessMax = _TessMax; + float edgeLength = _TessEdgeLength; float tessMaxDisp = _TessMaxDisp; + #if defined(ASE_FIXED_TESSELLATION) + tf = FixedTess( tessValue ); + #elif defined(ASE_DISTANCE_TESSELLATION) + tf = DistanceBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, tessValue, tessMin, tessMax, GetObjectToWorldMatrix(), _WorldSpaceCameraPos ); + #elif defined(ASE_LENGTH_TESSELLATION) + tf = EdgeLengthBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams ); + #elif defined(ASE_LENGTH_CULL_TESSELLATION) + tf = EdgeLengthBasedTessCull(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, tessMaxDisp, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams, unity_CameraWorldClipPlanes ); + #endif + o.edge[0] = tf.x; o.edge[1] = tf.y; o.edge[2] = tf.z; o.inside = tf.w; + return o; + } + + [domain("tri")] + [partitioning("fractional_odd")] + [outputtopology("triangle_cw")] + [patchconstantfunc("TessellationFunction")] + [outputcontrolpoints(3)] + VertexControl HullFunction(InputPatch patch, uint id : SV_OutputControlPointID) + { + return patch[id]; + } + + [domain("tri")] + VertexOutput DomainFunction(TessellationFactors factors, OutputPatch patch, float3 bary : SV_DomainLocation) + { + VertexInput o = (VertexInput) 0; + o.vertex = patch[0].vertex * bary.x + patch[1].vertex * bary.y + patch[2].vertex * bary.z; + o.ase_normal = patch[0].ase_normal * bary.x + patch[1].ase_normal * bary.y + patch[2].ase_normal * bary.z; + o.ase_texcoord = patch[0].ase_texcoord * bary.x + patch[1].ase_texcoord * bary.y + patch[2].ase_texcoord * bary.z; + #if defined(ASE_PHONG_TESSELLATION) + float3 pp[3]; + for (int i = 0; i < 3; ++i) + pp[i] = o.vertex.xyz - patch[i].ase_normal * (dot(o.vertex.xyz, patch[i].ase_normal) - dot(patch[i].vertex.xyz, patch[i].ase_normal)); + float phongStrength = _TessPhongStrength; + o.vertex.xyz = phongStrength * (pp[0]*bary.x + pp[1]*bary.y + pp[2]*bary.z) + (1.0f-phongStrength) * o.vertex.xyz; + #endif + UNITY_TRANSFER_INSTANCE_ID(patch[0], o); + return VertexFunction(o); + } + #else + VertexOutput vert ( VertexInput v ) + { + return VertexFunction( v ); + } + #endif + + half4 frag ( VertexOutput IN ) : SV_Target + { + UNITY_SETUP_INSTANCE_ID( IN ); + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX( IN ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 WorldPosition = IN.worldPos; + #endif + float4 ShadowCoords = float4( 0, 0, 0, 0 ); + + #if defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + ShadowCoords = IN.shadowCoord; + #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + ShadowCoords = TransformWorldToShadowCoord( WorldPosition ); + #endif + #endif + float2 uv_MainTex = IN.ase_texcoord3.xy * _MainTex_ST.xy + _MainTex_ST.zw; + float4 temp_output_47_0 = ( tex2D( _MainTex, uv_MainTex ) * _Color ); + + float3 BakedAlbedo = 0; + float3 BakedEmission = 0; + float3 Color = temp_output_47_0.rgb; + float Alpha = temp_output_47_0.a; + float AlphaClipThreshold = 0.5; + float AlphaClipThresholdShadow = 0.5; + + #ifdef _ALPHATEST_ON + clip( Alpha - AlphaClipThreshold ); + #endif + + #ifdef LOD_FADE_CROSSFADE + LODDitheringTransition( IN.clipPos.xyz, unity_LODFade.x ); + #endif + + #ifdef ASE_FOG + Color = MixFog( Color, IN.fogFactor ); + #endif + + return half4( Color, Alpha ); + } + + ENDHLSL + } + + + Pass + { + + Name "ShadowCaster" + Tags { "LightMode"="ShadowCaster" } + + ZWrite On + ZTest LEqual + AlphaToMask Off + + HLSLPROGRAM + #pragma multi_compile_instancing + #define ASE_SRP_VERSION 999999 + + #pragma prefer_hlslcc gles + #pragma exclude_renderers d3d11_9x + + #pragma vertex vert + #pragma fragment frag + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl" + + + + struct VertexInput + { + float4 vertex : POSITION; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct VertexOutput + { + float4 clipPos : SV_POSITION; + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 worldPos : TEXCOORD0; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + float4 shadowCoord : TEXCOORD1; + #endif + float4 ase_texcoord2 : TEXCOORD2; + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO + }; + + CBUFFER_START(UnityPerMaterial) + float4 _MainTex_ST; + float4 _Color; + #ifdef TESSELLATION_ON + float _TessPhongStrength; + float _TessValue; + float _TessMin; + float _TessMax; + float _TessEdgeLength; + float _TessMaxDisp; + #endif + CBUFFER_END + sampler2D _MainTex; + + + + float3 _LightDirection; + + VertexOutput VertexFunction( VertexInput v ) + { + VertexOutput o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO( o ); + + o.ase_texcoord2.xy = v.ase_texcoord.xy; + + //setting value to unused interpolator channels and avoid initialization warnings + o.ase_texcoord2.zw = 0; + #ifdef ASE_ABSOLUTE_VERTEX_POS + float3 defaultVertexValue = v.vertex.xyz; + #else + float3 defaultVertexValue = float3(0, 0, 0); + #endif + float3 vertexValue = defaultVertexValue; + #ifdef ASE_ABSOLUTE_VERTEX_POS + v.vertex.xyz = vertexValue; + #else + v.vertex.xyz += vertexValue; + #endif + + v.ase_normal = v.ase_normal; + + float3 positionWS = TransformObjectToWorld( v.vertex.xyz ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + o.worldPos = positionWS; + #endif + + float3 normalWS = TransformObjectToWorldDir( v.ase_normal ); + + float4 clipPos = TransformWorldToHClip( ApplyShadowBias( positionWS, normalWS, _LightDirection ) ); + + #if UNITY_REVERSED_Z + clipPos.z = min(clipPos.z, clipPos.w * UNITY_NEAR_CLIP_VALUE); + #else + clipPos.z = max(clipPos.z, clipPos.w * UNITY_NEAR_CLIP_VALUE); + #endif + + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + VertexPositionInputs vertexInput = (VertexPositionInputs)0; + vertexInput.positionWS = positionWS; + vertexInput.positionCS = clipPos; + o.shadowCoord = GetShadowCoord( vertexInput ); + #endif + o.clipPos = clipPos; + + return o; + } + + #if defined(TESSELLATION_ON) + struct VertexControl + { + float4 vertex : INTERNALTESSPOS; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct TessellationFactors + { + float edge[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + VertexControl vert ( VertexInput v ) + { + VertexControl o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + o.vertex = v.vertex; + o.ase_normal = v.ase_normal; + o.ase_texcoord = v.ase_texcoord; + return o; + } + + TessellationFactors TessellationFunction (InputPatch v) + { + TessellationFactors o; + float4 tf = 1; + float tessValue = _TessValue; float tessMin = _TessMin; float tessMax = _TessMax; + float edgeLength = _TessEdgeLength; float tessMaxDisp = _TessMaxDisp; + #if defined(ASE_FIXED_TESSELLATION) + tf = FixedTess( tessValue ); + #elif defined(ASE_DISTANCE_TESSELLATION) + tf = DistanceBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, tessValue, tessMin, tessMax, GetObjectToWorldMatrix(), _WorldSpaceCameraPos ); + #elif defined(ASE_LENGTH_TESSELLATION) + tf = EdgeLengthBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams ); + #elif defined(ASE_LENGTH_CULL_TESSELLATION) + tf = EdgeLengthBasedTessCull(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, tessMaxDisp, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams, unity_CameraWorldClipPlanes ); + #endif + o.edge[0] = tf.x; o.edge[1] = tf.y; o.edge[2] = tf.z; o.inside = tf.w; + return o; + } + + [domain("tri")] + [partitioning("fractional_odd")] + [outputtopology("triangle_cw")] + [patchconstantfunc("TessellationFunction")] + [outputcontrolpoints(3)] + VertexControl HullFunction(InputPatch patch, uint id : SV_OutputControlPointID) + { + return patch[id]; + } + + [domain("tri")] + VertexOutput DomainFunction(TessellationFactors factors, OutputPatch patch, float3 bary : SV_DomainLocation) + { + VertexInput o = (VertexInput) 0; + o.vertex = patch[0].vertex * bary.x + patch[1].vertex * bary.y + patch[2].vertex * bary.z; + o.ase_normal = patch[0].ase_normal * bary.x + patch[1].ase_normal * bary.y + patch[2].ase_normal * bary.z; + o.ase_texcoord = patch[0].ase_texcoord * bary.x + patch[1].ase_texcoord * bary.y + patch[2].ase_texcoord * bary.z; + #if defined(ASE_PHONG_TESSELLATION) + float3 pp[3]; + for (int i = 0; i < 3; ++i) + pp[i] = o.vertex.xyz - patch[i].ase_normal * (dot(o.vertex.xyz, patch[i].ase_normal) - dot(patch[i].vertex.xyz, patch[i].ase_normal)); + float phongStrength = _TessPhongStrength; + o.vertex.xyz = phongStrength * (pp[0]*bary.x + pp[1]*bary.y + pp[2]*bary.z) + (1.0f-phongStrength) * o.vertex.xyz; + #endif + UNITY_TRANSFER_INSTANCE_ID(patch[0], o); + return VertexFunction(o); + } + #else + VertexOutput vert ( VertexInput v ) + { + return VertexFunction( v ); + } + #endif + + half4 frag(VertexOutput IN ) : SV_TARGET + { + UNITY_SETUP_INSTANCE_ID( IN ); + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX( IN ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 WorldPosition = IN.worldPos; + #endif + float4 ShadowCoords = float4( 0, 0, 0, 0 ); + + #if defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + ShadowCoords = IN.shadowCoord; + #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + ShadowCoords = TransformWorldToShadowCoord( WorldPosition ); + #endif + #endif + + float2 uv_MainTex = IN.ase_texcoord2.xy * _MainTex_ST.xy + _MainTex_ST.zw; + float4 temp_output_47_0 = ( tex2D( _MainTex, uv_MainTex ) * _Color ); + + float Alpha = temp_output_47_0.a; + float AlphaClipThreshold = 0.5; + float AlphaClipThresholdShadow = 0.5; + + #ifdef _ALPHATEST_ON + #ifdef _ALPHATEST_SHADOW_ON + clip(Alpha - AlphaClipThresholdShadow); + #else + clip(Alpha - AlphaClipThreshold); + #endif + #endif + + #ifdef LOD_FADE_CROSSFADE + LODDitheringTransition( IN.clipPos.xyz, unity_LODFade.x ); + #endif + return 0; + } + + ENDHLSL + } + + + Pass + { + + Name "DepthOnly" + Tags { "LightMode"="DepthOnly" } + + ZWrite On + ColorMask 0 + AlphaToMask Off + + HLSLPROGRAM + #pragma multi_compile_instancing + #define ASE_SRP_VERSION 999999 + + #pragma prefer_hlslcc gles + #pragma exclude_renderers d3d11_9x + + #pragma vertex vert + #pragma fragment frag + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" + #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl" + + + + struct VertexInput + { + float4 vertex : POSITION; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct VertexOutput + { + float4 clipPos : SV_POSITION; + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 worldPos : TEXCOORD0; + #endif + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + float4 shadowCoord : TEXCOORD1; + #endif + float4 ase_texcoord2 : TEXCOORD2; + UNITY_VERTEX_INPUT_INSTANCE_ID + UNITY_VERTEX_OUTPUT_STEREO + }; + + CBUFFER_START(UnityPerMaterial) + float4 _MainTex_ST; + float4 _Color; + #ifdef TESSELLATION_ON + float _TessPhongStrength; + float _TessValue; + float _TessMin; + float _TessMax; + float _TessEdgeLength; + float _TessMaxDisp; + #endif + CBUFFER_END + sampler2D _MainTex; + + + + VertexOutput VertexFunction( VertexInput v ) + { + VertexOutput o = (VertexOutput)0; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + + o.ase_texcoord2.xy = v.ase_texcoord.xy; + + //setting value to unused interpolator channels and avoid initialization warnings + o.ase_texcoord2.zw = 0; + #ifdef ASE_ABSOLUTE_VERTEX_POS + float3 defaultVertexValue = v.vertex.xyz; + #else + float3 defaultVertexValue = float3(0, 0, 0); + #endif + float3 vertexValue = defaultVertexValue; + #ifdef ASE_ABSOLUTE_VERTEX_POS + v.vertex.xyz = vertexValue; + #else + v.vertex.xyz += vertexValue; + #endif + + v.ase_normal = v.ase_normal; + + float3 positionWS = TransformObjectToWorld( v.vertex.xyz ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + o.worldPos = positionWS; + #endif + + o.clipPos = TransformWorldToHClip( positionWS ); + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) && defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + VertexPositionInputs vertexInput = (VertexPositionInputs)0; + vertexInput.positionWS = positionWS; + vertexInput.positionCS = clipPos; + o.shadowCoord = GetShadowCoord( vertexInput ); + #endif + return o; + } + + #if defined(TESSELLATION_ON) + struct VertexControl + { + float4 vertex : INTERNALTESSPOS; + float3 ase_normal : NORMAL; + float4 ase_texcoord : TEXCOORD0; + + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct TessellationFactors + { + float edge[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + VertexControl vert ( VertexInput v ) + { + VertexControl o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_TRANSFER_INSTANCE_ID(v, o); + o.vertex = v.vertex; + o.ase_normal = v.ase_normal; + o.ase_texcoord = v.ase_texcoord; + return o; + } + + TessellationFactors TessellationFunction (InputPatch v) + { + TessellationFactors o; + float4 tf = 1; + float tessValue = _TessValue; float tessMin = _TessMin; float tessMax = _TessMax; + float edgeLength = _TessEdgeLength; float tessMaxDisp = _TessMaxDisp; + #if defined(ASE_FIXED_TESSELLATION) + tf = FixedTess( tessValue ); + #elif defined(ASE_DISTANCE_TESSELLATION) + tf = DistanceBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, tessValue, tessMin, tessMax, GetObjectToWorldMatrix(), _WorldSpaceCameraPos ); + #elif defined(ASE_LENGTH_TESSELLATION) + tf = EdgeLengthBasedTess(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams ); + #elif defined(ASE_LENGTH_CULL_TESSELLATION) + tf = EdgeLengthBasedTessCull(v[0].vertex, v[1].vertex, v[2].vertex, edgeLength, tessMaxDisp, GetObjectToWorldMatrix(), _WorldSpaceCameraPos, _ScreenParams, unity_CameraWorldClipPlanes ); + #endif + o.edge[0] = tf.x; o.edge[1] = tf.y; o.edge[2] = tf.z; o.inside = tf.w; + return o; + } + + [domain("tri")] + [partitioning("fractional_odd")] + [outputtopology("triangle_cw")] + [patchconstantfunc("TessellationFunction")] + [outputcontrolpoints(3)] + VertexControl HullFunction(InputPatch patch, uint id : SV_OutputControlPointID) + { + return patch[id]; + } + + [domain("tri")] + VertexOutput DomainFunction(TessellationFactors factors, OutputPatch patch, float3 bary : SV_DomainLocation) + { + VertexInput o = (VertexInput) 0; + o.vertex = patch[0].vertex * bary.x + patch[1].vertex * bary.y + patch[2].vertex * bary.z; + o.ase_normal = patch[0].ase_normal * bary.x + patch[1].ase_normal * bary.y + patch[2].ase_normal * bary.z; + o.ase_texcoord = patch[0].ase_texcoord * bary.x + patch[1].ase_texcoord * bary.y + patch[2].ase_texcoord * bary.z; + #if defined(ASE_PHONG_TESSELLATION) + float3 pp[3]; + for (int i = 0; i < 3; ++i) + pp[i] = o.vertex.xyz - patch[i].ase_normal * (dot(o.vertex.xyz, patch[i].ase_normal) - dot(patch[i].vertex.xyz, patch[i].ase_normal)); + float phongStrength = _TessPhongStrength; + o.vertex.xyz = phongStrength * (pp[0]*bary.x + pp[1]*bary.y + pp[2]*bary.z) + (1.0f-phongStrength) * o.vertex.xyz; + #endif + UNITY_TRANSFER_INSTANCE_ID(patch[0], o); + return VertexFunction(o); + } + #else + VertexOutput vert ( VertexInput v ) + { + return VertexFunction( v ); + } + #endif + + half4 frag(VertexOutput IN ) : SV_TARGET + { + UNITY_SETUP_INSTANCE_ID(IN); + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX( IN ); + + #if defined(ASE_NEEDS_FRAG_WORLD_POSITION) + float3 WorldPosition = IN.worldPos; + #endif + float4 ShadowCoords = float4( 0, 0, 0, 0 ); + + #if defined(ASE_NEEDS_FRAG_SHADOWCOORDS) + #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) + ShadowCoords = IN.shadowCoord; + #elif defined(MAIN_LIGHT_CALCULATE_SHADOWS) + ShadowCoords = TransformWorldToShadowCoord( WorldPosition ); + #endif + #endif + + float2 uv_MainTex = IN.ase_texcoord2.xy * _MainTex_ST.xy + _MainTex_ST.zw; + float4 temp_output_47_0 = ( tex2D( _MainTex, uv_MainTex ) * _Color ); + + float Alpha = temp_output_47_0.a; + float AlphaClipThreshold = 0.5; + + #ifdef _ALPHATEST_ON + clip(Alpha - AlphaClipThreshold); + #endif + + #ifdef LOD_FADE_CROSSFADE + LODDitheringTransition( IN.clipPos.xyz, unity_LODFade.x ); + #endif + return 0; + } + ENDHLSL + } + + + } + CustomEditor "UnityEditor.ShaderGraph.PBRMasterGUI" + Fallback "Hidden/InternalErrorShader" + +} +/*ASEBEGIN +Version=18500 +418;573;995;449;996.8841;217.5147;1.135025;True;False +Node;AmplifyShaderEditor.ColorNode;46;-557.6697,26.77738;Inherit;False;Property;_Color;Color;1;0;Create;True;0;0;False;0;False;0,0,0,0;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SamplerNode;6;-551.6948,-153.326;Inherit;True;Property;_MainTex;BaseColor Texture;0;0;Create;False;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;47;-254.9497,-19.80906;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.BreakToComponentsNode;48;-272.7649,78.45039;Inherit;False;COLOR;1;0;COLOR;0,0,0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;12;1.3,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;1;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;ExtraPrePass;0;0;ExtraPrePass;5;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;True;1;1;False;-1;0;False;-1;0;1;False;-1;0;False;-1;False;False;False;False;False;False;False;False;True;0;False;-1;True;True;True;True;True;0;False;-1;False;False;False;True;False;255;False;-1;255;False;-1;255;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;True;1;False;-1;True;3;False;-1;True;True;0;False;-1;0;False;-1;True;0;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;15;1.3,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;1;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;DepthOnly;0;3;DepthOnly;0;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;False;False;False;False;False;False;False;False;True;0;False;-1;False;True;False;False;False;False;0;False;-1;False;False;False;False;True;1;False;-1;False;False;True;1;LightMode=DepthOnly;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;16;1.3,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;1;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;Meta;0;4;Meta;0;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;False;False;False;False;False;False;False;False;False;True;2;False;-1;False;False;False;False;False;False;False;False;True;1;LightMode=Meta;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;14;1.3,0;Float;False;False;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;1;New Amplify Shader;2992e84f91cbeb14eab234972e07ea9d;True;ShadowCaster;0;2;ShadowCaster;0;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Opaque=RenderType;Queue=Geometry=Queue=0;True;0;0;False;False;False;False;False;False;False;False;True;0;False;-1;False;False;False;False;False;False;True;1;False;-1;True;3;False;-1;False;True;1;LightMode=ShadowCaster;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;13;1.3,0;Float;False;True;-1;2;UnityEditor.ShaderGraph.PBRMasterGUI;0;3;Eversoul/Glass;2992e84f91cbeb14eab234972e07ea9d;True;Forward;0;1;Forward;8;False;False;False;False;False;False;False;False;True;0;False;-1;True;0;False;-1;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;0;True;1;5;False;-1;10;False;-1;1;1;False;-1;10;False;-1;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;-1;False;False;False;True;True;1;False;-1;255;False;-1;255;False;-1;7;False;-1;3;False;-1;1;False;-1;1;False;-1;7;False;-1;1;False;-1;1;False;-1;1;False;-1;True;2;False;-1;True;3;False;-1;True;True;0;False;-1;0;False;-1;True;1;LightMode=UniversalForward;False;0;Hidden/InternalErrorShader;0;0;Standard;22;Surface;1; Blend;0;Two Sided;1;Cast Shadows;1; Use Shadow Threshold;0;Receive Shadows;1;GPU Instancing;1;LOD CrossFade;0;Built-in Fog;0;DOTS Instancing;0;Meta Pass;0;Extra Pre Pass;0;Tessellation;0; Phong;0; Strength;0.5,False,-1; Type;0; Tess;16,False,-1; Min;10,False,-1; Max;25,False,-1; Edge Length;16,False,-1; Max Displacement;25,False,-1;Vertex Position,InvertActionOnDeselection;1;0;5;False;True;True;True;False;False;;False;0 +WireConnection;47;0;6;0 +WireConnection;47;1;46;0 +WireConnection;48;0;47;0 +WireConnection;13;2;47;0 +WireConnection;13;3;48;3 +ASEEND*/ +//CHKSM=71B9E6768483D6B6D4AED65905D4268CF4A6AF9B \ No newline at end of file diff --git a/Assets/Eversoul/Shaders/Glass.shader.meta b/Assets/Eversoul/Shaders/Glass.shader.meta new file mode 100644 index 0000000..622cd25 --- /dev/null +++ b/Assets/Eversoul/Shaders/Glass.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1651798b9d47a38498a28526349aa568 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SharedResources.prefab b/Assets/Prefabs/SharedResources.prefab index bf5f11b..5f70f1f 100644 --- a/Assets/Prefabs/SharedResources.prefab +++ b/Assets/Prefabs/SharedResources.prefab @@ -53,6 +53,7 @@ MonoBehaviour: TimelineFrame: {fileID: 8365622947359172780, guid: 1ba333d8867aaff4a83b7f38ca5da17f, type: 3} PopupMessage: {fileID: 5911967300267889618, guid: 26363c27c3cac0e4ca41ff83a7171bf6, type: 3} HandlePopup: {fileID: -653669356491946613, guid: e98e95aa7ddceb1429b9dd61cb777231, type: 3} + UITextInput: {fileID: 792577980641478892, guid: 5c7b4304b8550944794c56270b223ead, type: 3} SliderPanel: {fileID: 3429042815596282063, guid: 3fa934d4f6395884f9e0102bddcfdc69, type: 3} TogglePanel: {fileID: 3747929987842206351, guid: 518b78ba2e0bb6741bb018d38d56971e, type: 3} MorphPanel: {fileID: 4248525161878321438, guid: 923e80c59662b0f40abc460f4118c485, type: 3} diff --git a/Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab b/Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab new file mode 100644 index 0000000..65dcbaf --- /dev/null +++ b/Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab @@ -0,0 +1,888 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &857006411463086032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3926013446514820482} + - component: {fileID: 1166646122525756526} + - component: {fileID: 5266124807888016489} + - component: {fileID: 269336117019180192} + m_Layer: 5 + m_Name: Scrollbar Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3926013446514820482 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857006411463086032} + 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_Children: + - {fileID: 2411698483630080781} + m_Father: {fileID: 3700011443601450086} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!222 &1166646122525756526 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857006411463086032} + m_CullTransparentMesh: 1 +--- !u!114 &5266124807888016489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857006411463086032} + 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: 10907, 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 +--- !u!114 &269336117019180192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857006411463086032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 6597536802041583136} + m_HandleRect: {fileID: 2128408860036517571} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2138306399260618583 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2411698483630080781} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2411698483630080781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2138306399260618583} + 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_Children: + - {fileID: 2128408860036517571} + m_Father: {fileID: 3926013446514820482} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4073351700468924064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9137732374505417810} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9137732374505417810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4073351700468924064} + 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_Children: + - {fileID: 200140088289488815} + m_Father: {fileID: 8281873352695723972} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4979583620479427080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2128408860036517571} + - component: {fileID: 5333485236549497914} + - component: {fileID: 6597536802041583136} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2128408860036517571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4979583620479427080} + 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_Children: [] + m_Father: {fileID: 2411698483630080781} + 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: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5333485236549497914 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4979583620479427080} + m_CullTransparentMesh: 1 +--- !u!114 &6597536802041583136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4979583620479427080} + 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: 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 +--- !u!1 &5287612872538645398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 200140088289488815} + - component: {fileID: 5805874725350189978} + - component: {fileID: 8954832662311165676} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &200140088289488815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5287612872538645398} + 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_Children: [] + m_Father: {fileID: 9137732374505417810} + 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: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5805874725350189978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5287612872538645398} + m_CullTransparentMesh: 1 +--- !u!114 &8954832662311165676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5287612872538645398} + 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: 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 +--- !u!1 &5650129262066582579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8281873352695723972} + - component: {fileID: 6524531583709882582} + - component: {fileID: 2792894524929360974} + - component: {fileID: 7049275386574079209} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8281873352695723972 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5650129262066582579} + 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_Children: + - {fileID: 9137732374505417810} + m_Father: {fileID: 3700011443601450086} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!222 &6524531583709882582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5650129262066582579} + m_CullTransparentMesh: 1 +--- !u!114 &2792894524929360974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5650129262066582579} + 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: 10907, 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 +--- !u!114 &7049275386574079209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5650129262066582579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 8954832662311165676} + m_HandleRect: {fileID: 200140088289488815} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6997863811819530782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3700011443601450086} + - component: {fileID: 8856882198241358519} + - component: {fileID: 12576710162954116} + - component: {fileID: 3482253224140129260} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3700011443601450086 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6997863811819530782} + 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_Children: + - {fileID: 7217105903303998302} + - {fileID: 3926013446514820482} + - {fileID: 8281873352695723972} + m_Father: {fileID: 4581438189623567340} + 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 &8856882198241358519 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6997863811819530782} + m_CullTransparentMesh: 1 +--- !u!114 &12576710162954116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6997863811819530782} + 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, g: 0, b: 0, a: 0} + 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: 10907, 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 +--- !u!114 &3482253224140129260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6997863811819530782} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 3982083602491567247} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 90 + m_Viewport: {fileID: 7217105903303998302} + m_HorizontalScrollbar: {fileID: 269336117019180192} + m_VerticalScrollbar: {fileID: 7049275386574079209} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8029561839329618189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7217105903303998302} + - component: {fileID: 5937064374254757271} + - component: {fileID: 785398123982918823} + - component: {fileID: 5500420512442353424} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7217105903303998302 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8029561839329618189} + 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_Children: + - {fileID: 3982083602491567247} + m_Father: {fileID: 3700011443601450086} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5937064374254757271 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8029561839329618189} + m_CullTransparentMesh: 1 +--- !u!114 &785398123982918823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8029561839329618189} + 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: 10917, 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 +--- !u!114 &5500420512442353424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8029561839329618189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1 &9215360624973565278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3982083602491567247} + - component: {fileID: 2569175952494457853} + - component: {fileID: 223501042481070971} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3982083602491567247 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9215360624973565278} + 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_Children: [] + m_Father: {fileID: 7217105903303998302} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2569175952494457853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9215360624973565278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &223501042481070971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9215360624973565278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1001 &3203130079004352578 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2973369283140423270, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_Name + value: Settings Panel + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_SizeDelta.x + value: 379.05322 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_SizeDelta.y + value: 529.061 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423271, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423275, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: ProxyName + value: Settings + objectReference: {fileID: 0} + - target: {fileID: 2973369283140423275, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: LockProxyState + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2973369284565770919, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_text + value: Settings + objectReference: {fileID: 0} + - target: {fileID: 4878202427174256853, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} +--- !u!224 &4581438189623567340 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1434189861388518318, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + m_PrefabInstance: {fileID: 3203130079004352578} + m_PrefabAsset: {fileID: 0} +--- !u!1 &373880450823286308 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2973369283140423270, guid: 2041614864914994c8e1015b2f0a4d51, type: 3} + m_PrefabInstance: {fileID: 3203130079004352578} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5768036383653499586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373880450823286308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4220394708fad7d4782a9f356cb06010, type: 3} + m_Name: + m_EditorClassIdentifier: + Content: {fileID: 3982083602491567247} diff --git a/Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab.meta b/Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab.meta new file mode 100644 index 0000000..485bf76 --- /dev/null +++ b/Assets/Prefabs/UI/ModelViewerBase/Settings Panel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37fa6d2e74e6be74abadbafcc6a8d717 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab b/Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab new file mode 100644 index 0000000..e3f1fcb --- /dev/null +++ b/Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab @@ -0,0 +1,744 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &318306803011409317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2347616162616307813} + - component: {fileID: 7160543191204762923} + - component: {fileID: 2111653134654174274} + - component: {fileID: 1927760245753232004} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2347616162616307813 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318306803011409317} + 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_Children: [] + m_Father: {fileID: 7119968821059131350} + 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 &7160543191204762923 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318306803011409317} + m_CullTransparentMesh: 1 +--- !u!114 &2111653134654174274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318306803011409317} + 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: Enter 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: 2150773298 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + 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: 2 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + 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!114 &1927760245753232004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318306803011409317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &389691927698136442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6345579752285301353} + - component: {fileID: 5943401090128320501} + - component: {fileID: 1600431878975874013} + - component: {fileID: 792577980641478892} + m_Layer: 5 + m_Name: TextInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6345579752285301353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389691927698136442} + 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_Children: + - {fileID: 2811732413862384223} + - {fileID: 7927632923716545227} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5943401090128320501 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389691927698136442} + m_CullTransparentMesh: 1 +--- !u!114 &1600431878975874013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389691927698136442} + 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: 0.392} + 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: 10907, 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 +--- !u!114 &792577980641478892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389691927698136442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce06bef1f916b3d45882cede8f8b1a07, type: 3} + m_Name: + m_EditorClassIdentifier: + Label: {fileID: 2076455774242524841} + InputField: {fileID: 7775437575011451542} +--- !u!1 &4167111668916304480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1280659918631051343} + - component: {fileID: 3869563893997680688} + - component: {fileID: 2745345215765915577} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1280659918631051343 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4167111668916304480} + 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_Children: [] + m_Father: {fileID: 7119968821059131350} + m_RootOrder: 1 + 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 &3869563893997680688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4167111668916304480} + m_CullTransparentMesh: 1 +--- !u!114 &2745345215765915577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4167111668916304480} + 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: "\u200B" + 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: 14 + m_fontSizeBase: 14 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + 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 &5636644555809686490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7927632923716545227} + - component: {fileID: 4791394392116005782} + - component: {fileID: 1905260230744665890} + - component: {fileID: 7775437575011451542} + m_Layer: 5 + m_Name: InputField (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7927632923716545227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5636644555809686490} + 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_Children: + - {fileID: 7119968821059131350} + m_Father: {fileID: 6345579752285301353} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 52.5, y: 0} + m_SizeDelta: {x: -105, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4791394392116005782 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5636644555809686490} + m_CullTransparentMesh: 1 +--- !u!114 &1905260230744665890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5636644555809686490} + 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: 10911, 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 +--- !u!114 &7775437575011451542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5636644555809686490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, 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: 1905260230744665890} + m_TextViewport: {fileID: 7119968821059131350} + m_TextComponent: {fileID: 2745345215765915577} + m_Placeholder: {fileID: 2111653134654174274} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} +--- !u!1 &6476409091440106667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2811732413862384223} + - component: {fileID: 7825463066092681358} + - component: {fileID: 2076455774242524841} + 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 &2811732413862384223 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6476409091440106667} + 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_Children: [] + m_Father: {fileID: 6345579752285301353} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 100, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7825463066092681358 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6476409091440106667} + m_CullTransparentMesh: 1 +--- !u!114 &2076455774242524841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6476409091440106667} + 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: New 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 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 &6621569130762215851 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7119968821059131350} + - component: {fileID: 1755689052378616893} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7119968821059131350 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6621569130762215851} + 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_Children: + - {fileID: 2347616162616307813} + - {fileID: 1280659918631051343} + m_Father: {fileID: 7927632923716545227} + 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.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1755689052378616893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6621569130762215851} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} diff --git a/Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab.meta b/Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab.meta new file mode 100644 index 0000000..c71ea78 --- /dev/null +++ b/Assets/Prefabs/UI/ModelViewerBase/TextInput.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5c7b4304b8550944794c56270b223ead +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ModelViewerBase/AssetLibrary.cs b/Assets/Scripts/ModelViewerBase/AssetLibrary.cs index 603c0be..fbbb6d1 100644 --- a/Assets/Scripts/ModelViewerBase/AssetLibrary.cs +++ b/Assets/Scripts/ModelViewerBase/AssetLibrary.cs @@ -16,7 +16,7 @@ public class AssetLibrary : MonoBehaviour protected static AssetLibrary _mainInstance; public ResourceLocationMap AddressableResourceMap; public List Shaders; - public string LocalFilesPath; + public string LocalFilesPath => ModelViewerSettings.Get("AssetsPath"); private List _addressableKeys; public Dictionary LoadedAssets = new Dictionary(); diff --git a/Assets/Scripts/ModelViewerBase/ModelViewerBase.asmdef b/Assets/Scripts/ModelViewerBase/ModelViewerBase.asmdef index b4d069c..a65b515 100644 --- a/Assets/Scripts/ModelViewerBase/ModelViewerBase.asmdef +++ b/Assets/Scripts/ModelViewerBase/ModelViewerBase.asmdef @@ -7,7 +7,8 @@ "GUID:aee7fa92e14bf364ebccdd24623e1764", "GUID:ee695b84b4c90104b9367eebc6b0d70d", "GUID:9e24947de15b9834991c9d8411ea37cf", - "GUID:84651a3751eca9349aac36a66bba901b" + "GUID:84651a3751eca9349aac36a66bba901b", + "GUID:605c065ed537aa34fa525e662cb3d117" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Scripts/ModelViewerBase/ModelViewerInterface.cs b/Assets/Scripts/ModelViewerBase/ModelViewerInterface.cs index 86845b2..5e53ef8 100644 --- a/Assets/Scripts/ModelViewerBase/ModelViewerInterface.cs +++ b/Assets/Scripts/ModelViewerBase/ModelViewerInterface.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using UIPanels; using UnityEngine; using UnityEngine.UI; @@ -15,11 +14,7 @@ public class ModelViewerInterface : MonoBehaviour public ScrollRect PosePresetToggle; public ScrollRect SelectedHandlesPanel; - public List TopbarPanels; - - public UIPanels.UIToolbarPanel TogglesContent; - public UIPanels.UISaveLoadPanel SaveLoadPanel; - public UIPanels.UICameraSettingsPanel CameraSettingsPanel; + public UISaveLoadPanel SaveLoadPanel; public ProgressBar ProgressBar; public Canvas MainCanvas; diff --git a/Assets/Scripts/ModelViewerBase/ModelViewerMain.cs b/Assets/Scripts/ModelViewerBase/ModelViewerMain.cs index a72298a..f91ee21 100644 --- a/Assets/Scripts/ModelViewerBase/ModelViewerMain.cs +++ b/Assets/Scripts/ModelViewerBase/ModelViewerMain.cs @@ -41,8 +41,15 @@ public class ModelViewerMain : MonoBehaviour protected virtual void Awake() { + ModelViewerSettings.Load(); + _backupTimers = _backupTimes.ToArray(); - CurrentScene = SceneContainer.Create(this); + + if(CurrentScene == null) + { + Debug.LogError("Custom model viewer should create a new scene in Awake()"); + CurrentScene = SceneContainer.Create(this); + } if (!MainCameraOrbit.Frames.Any()) MainCameraOrbit.SetDefaultFrame(); diff --git a/Assets/Scripts/ModelViewerBase/ModelViewerSettings.cs b/Assets/Scripts/ModelViewerBase/ModelViewerSettings.cs new file mode 100644 index 0000000..367ae52 --- /dev/null +++ b/Assets/Scripts/ModelViewerBase/ModelViewerSettings.cs @@ -0,0 +1,122 @@ + +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System.Collections.Generic; +using System.IO; +using UnityEngine; +using static ModelViewerSettings; + +public class ModelViewerSettings +{ + public enum SettingType + { + Text, + FilePath, + FolderPath + } + + public class Setting + { + public SettingType Type; + public string Value; + public bool Editable; + + public Setting(string value, SettingType type = SettingType.Text, bool editable = true) + { + Value = value; + Editable = editable; + Type = type; + } + } + + public static ModelViewerSettings Instance; + + public Dictionary Settings = new Dictionary(); + + public static System.Action OnSettingsSaved; + + public void SetValues(Dictionary defaultSettings) + { + foreach (var keyvalue in defaultSettings) + { + Set(keyvalue.Key, keyvalue.Value); + } + Save(); + } + + public static string Get(string key, string defaultValue = "") + { + var settings = Instance; + if (!settings.Settings.ContainsKey(key)) + { + settings.Settings[key] = new Setting(defaultValue); + } + return settings.Settings[key].Value; + } + + public static string Get(string key, Setting defaultSetting) + { + var settings = Instance; + if (!settings.Settings.ContainsKey(key)) + { + settings.Settings[key] = defaultSetting; + } + return settings.Settings[key].Value; + } + + public static void Set(string key, Setting setting, bool save = false) + { + Instance.Settings[key] = setting; + if (save) Save(); + } + + public static void Set(string key, string value, bool save = false) + { + Debug.Log("Updating " + key + " to " + value); + if (Instance.Settings.ContainsKey(key)) + { + Instance.Settings[key].Value = value; + } + else + { + Instance.Settings[key] = new Setting(value); + } + if (save) Save(); + } + + public static void Load() + { + if (Instance != null) return; + + var filePath = Application.dataPath + "/../_settings.json"; + if(File.Exists(filePath)) + { + var settings = File.ReadAllText(filePath); + try + { + Instance = JsonConvert.DeserializeObject(settings); + } + catch + { + Instance = new ModelViewerSettings(); + } + } + else + { + Instance = new ModelViewerSettings(); + Save(); + } + } + + public static void Save() + { + if(Instance == null) + { + Debug.LogError("Settings have not been initialized!"); + return; + } + var filePath = Application.dataPath + "/../_settings.json"; + File.WriteAllText(filePath, JsonConvert.SerializeObject(Instance)); + OnSettingsSaved?.Invoke(Instance); + } +} \ No newline at end of file diff --git a/Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs.meta b/Assets/Scripts/ModelViewerBase/ModelViewerSettings.cs.meta similarity index 83% rename from Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs.meta rename to Assets/Scripts/ModelViewerBase/ModelViewerSettings.cs.meta index fbfb5ea..1d090b7 100644 --- a/Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs.meta +++ b/Assets/Scripts/ModelViewerBase/ModelViewerSettings.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3825ca5014b129b41995262f1d361a57 +guid: 78e36c43349eaa84ebf1e3ae316b57b5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ModelViewerBase/SharedResources.cs b/Assets/Scripts/ModelViewerBase/SharedResources.cs index 2f48dd8..9f8dfe2 100644 --- a/Assets/Scripts/ModelViewerBase/SharedResources.cs +++ b/Assets/Scripts/ModelViewerBase/SharedResources.cs @@ -14,6 +14,7 @@ public partial class SharedResources : MonoBehaviour public TimelineFrameContainer TimelineFrame ; public UIPopupMessage PopupMessage ; public PopupController HandlePopup ; + public UITextInput UITextInput ; public SliderPanel SliderPanel ; public SliderPanel TogglePanel ; public MorphPanel MorphPanel ; diff --git a/Assets/Scripts/ModelViewerBase/UI/HandleSettingsPanel.cs b/Assets/Scripts/ModelViewerBase/UI/HandleSettingsPanel.cs index 69d4e64..8b4638d 100644 --- a/Assets/Scripts/ModelViewerBase/UI/HandleSettingsPanel.cs +++ b/Assets/Scripts/ModelViewerBase/UI/HandleSettingsPanel.cs @@ -1,10 +1,11 @@ using System; +using UnityEngine; using UnityEngine.UI; using static SerializableBone; namespace KF3.UI.Panels { - public class HandleSettingsPanel : UIPanels.UIToolbarPanel + public class HandleSettingsPanel : MonoBehaviour { public ScrollRect HandleVisibilityToggles; diff --git a/Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs b/Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs deleted file mode 100644 index 0f6732e..0000000 --- a/Assets/Scripts/ModelViewerBase/UI/UICameraSettingsPanel.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UIPanels; -using UnityEngine; -using UnityEngine.UI; - -namespace UIPanels -{ - public class UICameraSettingsPanel : UIToolbarPanel - { - - - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModelViewerBase/UI/UIDraggableProxy.cs b/Assets/Scripts/ModelViewerBase/UI/UIDraggableProxy.cs index ef0761e..f85a8db 100644 --- a/Assets/Scripts/ModelViewerBase/UI/UIDraggableProxy.cs +++ b/Assets/Scripts/ModelViewerBase/UI/UIDraggableProxy.cs @@ -1,4 +1,3 @@ -using UIPanels; using UnityEngine; using UnityEngine.EventSystems; diff --git a/Assets/Scripts/ModelViewerBase/UI/UISaveLoadPanel.cs b/Assets/Scripts/ModelViewerBase/UI/UISaveLoadPanel.cs index da335ce..2c80624 100644 --- a/Assets/Scripts/ModelViewerBase/UI/UISaveLoadPanel.cs +++ b/Assets/Scripts/ModelViewerBase/UI/UISaveLoadPanel.cs @@ -8,113 +8,110 @@ using System.Linq; using UnityEngine; using UnityEngine.UI; -namespace UIPanels +public class UISaveLoadPanel : MonoBehaviour { - public class UISaveLoadPanel : UIToolbarPanel + public ScrollRect ScrollScene; + public ScrollRect ScrollPose; + + public Button ButtonScene; + public Button ButtonPose; + + public List ScenePresetEntries = new List(); + public List PosePresetEntries = new List(); + + public void AddPose(UIPoseContainer pose) { - public ScrollRect ScrollScene; - public ScrollRect ScrollPose; + PosePresetEntries.Add(pose); + } - public Button ButtonScene; - public Button ButtonPose; + public void AddScene(UISceneContainer scene) + { + ScenePresetEntries.Add(scene); + } - public List ScenePresetEntries = new List(); - public List PosePresetEntries = new List(); + public void OnPoseButton() + { + ButtonScene.interactable = true; + ButtonPose.interactable = false; + ScrollScene.gameObject.SetActive(false); + ScrollPose.gameObject.SetActive(true); + } - public void AddPose(UIPoseContainer pose) + public void OnSceneButton() + { + ButtonScene.interactable = false; + ButtonPose.interactable = true; + ScrollScene.gameObject.SetActive(true); + ScrollPose.gameObject.SetActive(false); + } + + public bool GetPoseByName(string name, out UIPoseContainer pose) + { + pose = PosePresetEntries.FirstOrDefault(p => p.PoseName == name); + return pose != null; + } + + public bool GetSceneByName(string name, out UISceneContainer scene) + { + scene = ScenePresetEntries.FirstOrDefault(p => p.SceneData.Filename == name); + return scene != null; + } + + public void Init() + { + InitPoses(); + InitScenes(); + } + + private void InitPoses() + { + string path = Settings.SavePoseDirectory; + + foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".pose"))) { - PosePresetEntries.Add(pose); - } - - public void AddScene(UISceneContainer scene) - { - ScenePresetEntries.Add(scene); - } - - public void OnPoseButton() - { - ButtonScene.interactable = true; - ButtonPose.interactable = false; - ScrollScene.gameObject.SetActive(false); - ScrollPose.gameObject.SetActive(true); - } - - public void OnSceneButton() - { - ButtonScene.interactable = false; - ButtonPose.interactable = true; - ScrollScene.gameObject.SetActive(true); - ScrollPose.gameObject.SetActive(false); - } - - public bool GetPoseByName(string name, out UIPoseContainer pose) - { - pose = PosePresetEntries.FirstOrDefault(p => p.PoseName == name); - return pose != null; - } - - public bool GetSceneByName(string name, out UISceneContainer scene) - { - scene = ScenePresetEntries.FirstOrDefault(p => p.SceneData.Filename == name); - return scene != null; - } - - public void Init() - { - InitPoses(); - InitScenes(); - } - - private void InitPoses() - { - string path = Settings.SavePoseDirectory; - - foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".pose"))) + try { - try - { - string fName = Path.GetFileNameWithoutExtension(fileName); - var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto }; - var bc = JsonConvert.DeserializeObject(File.ReadAllText(fileName), settings); - UIPoseContainer.CreateNew(fName, bc, false); - } - catch (Exception e) - { - Debug.LogWarning(e); - Error.Log(Color.red, "Loading " + fileName + " failed!"); - } + string fName = Path.GetFileNameWithoutExtension(fileName); + var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto }; + var bc = JsonConvert.DeserializeObject(File.ReadAllText(fileName), settings); + UIPoseContainer.CreateNew(fName, bc, false); } - } - - private void InitScenes() - { - string path = Settings.SaveSceneDirectory; - List scenes = new List(); - - foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".scene"))) + catch (Exception e) { - try - { - string fName = Path.GetFileNameWithoutExtension(fileName); - var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto }; - var bc = JsonConvert.DeserializeObject(File.ReadAllText(fileName), settings); - if (string.IsNullOrEmpty(bc.Date)) - { - bc.Date = "1990-01-01 00:00"; - } - scenes.Add(bc); - } - catch (Exception e) - { - Debug.LogWarning(e); - Error.Log(Color.red, "Loading " + fileName + " failed!"); - } - } - - foreach(var scene in scenes.OrderBy(s => DateTime.ParseExact(s.Date, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture)).ThenBy(s=>s.Filename)) - { - UISceneContainer.CreateNew(scene, false); + Debug.LogWarning(e); + Error.Log(Color.red, "Loading " + fileName + " failed!"); } } } + + private void InitScenes() + { + string path = Settings.SaveSceneDirectory; + List scenes = new List(); + + foreach (var fileName in Directory.GetFiles(path).Where(f => f.EndsWith(".scene"))) + { + try + { + string fName = Path.GetFileNameWithoutExtension(fileName); + var settings = new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto }; + var bc = JsonConvert.DeserializeObject(File.ReadAllText(fileName), settings); + if (string.IsNullOrEmpty(bc.Date)) + { + bc.Date = "1990-01-01 00:00"; + } + scenes.Add(bc); + } + catch (Exception e) + { + Debug.LogWarning(e); + Error.Log(Color.red, "Loading " + fileName + " failed!"); + } + } + + foreach (var scene in scenes.OrderBy(s => DateTime.ParseExact(s.Date, "yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture)).ThenBy(s => s.Filename)) + { + UISceneContainer.CreateNew(scene, false); + } + } } \ No newline at end of file diff --git a/Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs b/Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs new file mode 100644 index 0000000..1d685fe --- /dev/null +++ b/Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs @@ -0,0 +1,43 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UISettingsPanel : MonoBehaviour +{ + public Transform Content; + + private void Start() + { + ModelViewerSettings.OnSettingsSaved += UpdateSettings; + } + + private void OnEnable() + { + if(ModelViewerSettings.Instance != null) + { + UpdateSettings(ModelViewerSettings.Instance); + } + } + + public void UpdateSettings(ModelViewerSettings settings) + { + Debug.Log("Updating"); + + for(int i = Content.childCount -1; i >= 0; i--) + { + Destroy(Content.GetChild(i).gameObject); + } + + foreach(var entry in settings.Settings) + { + var setting = entry.Value; + var inputMode = setting.Type == ModelViewerSettings.SettingType.FilePath ? UITextInput.InputMode.FilePicker + : setting.Type == ModelViewerSettings.SettingType.FolderPath ? UITextInput.InputMode.FolderPicker + : UITextInput.InputMode.Text; + UITextInput.Create(entry.Key, setting.Value, setting.Editable, Content, inputMode).SetOnTextChanged((value) => + { + ModelViewerSettings.Set(entry.Key, value, true); + }); + } + } +} diff --git a/Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs.meta b/Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs.meta similarity index 83% rename from Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs.meta rename to Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs.meta index 1029534..9c4761c 100644 --- a/Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs.meta +++ b/Assets/Scripts/ModelViewerBase/UI/UISettingsPanel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 075750077de5e3b4088ca0c9f1fdb524 +guid: 4220394708fad7d4782a9f356cb06010 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/ModelViewerBase/UI/UITextInput.cs b/Assets/Scripts/ModelViewerBase/UI/UITextInput.cs new file mode 100644 index 0000000..c2f9ef0 --- /dev/null +++ b/Assets/Scripts/ModelViewerBase/UI/UITextInput.cs @@ -0,0 +1,67 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class UITextInput : MonoBehaviour +{ + public bool Editable => InputField.interactable; + public TMPro.TMP_Text Label; + public TMPro.TMP_InputField InputField; + public InputMode Mode; + + public enum InputMode + { + Text, + FilePicker, + FolderPicker + } + + public static UITextInput Create(string name, string defaultText, bool editable, Transform parent, InputMode mode = InputMode.Text) + { + var input = Instantiate(SharedResources.Instance.UITextInput, parent); + input.Init(name, defaultText, editable, mode); + return input; + } + + public void Init(string name, string defaultText, bool editable, InputMode mode) + { + Mode = mode; + Label.text = name; + InputField.text = defaultText; + InputField.interactable = editable; + switch (mode) + { + case InputMode.FilePicker: + { + InputField.onSelect.AddListener( + (text) => + { + var result = SFB.StandaloneFileBrowser.OpenFilePanel(name, InputField.text, "", false); + if (result.Length == 0) return; + InputField.text = result[0]; + } + ); + break; + } + case InputMode.FolderPicker: + { + InputField.onSelect.AddListener( + (text) => + { + var result = SFB.StandaloneFileBrowser.OpenFolderPanel(name, InputField.text, false); + if (result.Length == 0) return; + InputField.text = result[0] + "//"; + } + ); + break; + } + } + } + + public void SetOnTextChanged(UnityAction action) + { + InputField.onEndEdit.RemoveAllListeners(); + InputField.onEndEdit.AddListener(action); + } +} diff --git a/Assets/Scripts/ModelViewerBase/UI/UITextInput.cs.meta b/Assets/Scripts/ModelViewerBase/UI/UITextInput.cs.meta new file mode 100644 index 0000000..8f4620b --- /dev/null +++ b/Assets/Scripts/ModelViewerBase/UI/UITextInput.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ce06bef1f916b3d45882cede8f8b1a07 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs b/Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs deleted file mode 100644 index fa8202b..0000000 --- a/Assets/Scripts/ModelViewerBase/UI/UIToolbarPanel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using UnityEngine; - -namespace UIPanels - -{ - public class UIToolbarPanel : MonoBehaviour - { - public bool IsOpen => gameObject.activeSelf; - - public virtual void Open() - { - gameObject.SetActive(true); - } - - public virtual void Close() - { - gameObject.SetActive(false); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/RuntimeGizmo/TransformGizmo.cs b/Assets/Scripts/RuntimeGizmo/TransformGizmo.cs index 6eda638..69fc7a4 100644 --- a/Assets/Scripts/RuntimeGizmo/TransformGizmo.cs +++ b/Assets/Scripts/RuntimeGizmo/TransformGizmo.cs @@ -6,9 +6,6 @@ using System.Collections; using CommandUndoRedo; using System.Linq; using UnityEngine.EventSystems; -using UnityEditor.PackageManager; -using static UnityEngine.Rendering.VirtualTexturing.Debugging; -using static UnityEngine.GraphicsBuffer; namespace RuntimeGizmos { @@ -411,7 +408,9 @@ namespace RuntimeGizmos { if (mainTargetRoot != null) { - if (nearAxis != Axis.None && Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) + bool isModifyingSelection = Input.GetKey(AddSelection) || Input.GetKey(RemoveSelection); + + if (nearAxis != Axis.None && !isModifyingSelection && Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) { StartCoroutine(TransformSelected(translatingType)); } @@ -701,16 +700,16 @@ namespace RuntimeGizmos void GetTarget() { - if (nearAxis == Axis.None && !EventSystem.current.IsPointerOverGameObject()) + bool isAdding = Input.GetKey(AddSelection); + bool isRemoving = Input.GetKey(RemoveSelection); + + if ((nearAxis == Axis.None || isAdding || isRemoving) && !EventSystem.current.IsPointerOverGameObject()) { bool leftClick = Input.GetMouseButtonDown(0); bool rightClick = Input.GetMouseButtonDown(1); if (!leftClick && !rightClick) return; - bool isAdding = Input.GetKey(AddSelection); - bool isRemoving = Input.GetKey(RemoveSelection); - RaycastHit[] hits = Physics.RaycastAll(myCamera.ScreenPointToRay(Input.mousePosition), Mathf.Infinity, selectionMask); if (hits.Length > 0) { diff --git a/Packages/manifest.json b/Packages/manifest.json index 3ab8d00..e4af186 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,9 +1,9 @@ { "dependencies": { "com.unity.addressables": "1.18.19", - "com.unity.collab-proxy": "1.17.6", - "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.collab-proxy": "2.0.4", + "com.unity.ide.rider": "3.0.21", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", "com.unity.render-pipelines.universal": "10.10.1", "com.unity.test-framework": "1.1.33", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index c200a65..cbaba81 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,12 +15,10 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.6", + "version": "2.0.4", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -31,7 +29,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.16", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -40,7 +38,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -98,15 +96,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { "version": "10.10.1", "depth": 1, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8f8ffa5..aca149d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -606,7 +606,7 @@ PlayerSettings: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: - Standalone: 1 + Standalone: 0 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} @@ -620,7 +620,8 @@ PlayerSettings: gcIncremental: 1 assemblyVersionValidation: 0 gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 05fd649..da76706 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.42f1 -m_EditorVersionWithRevision: 2020.3.42f1 (7ade1201f527) +m_EditorVersion: 2020.3.48f1 +m_EditorVersionWithRevision: 2020.3.48f1 (b805b124c6b7)