9.0.60

poiyomi · Sep 12, 2024 · 9cc389e · 9cc389e
1 parent b9a5bc0
commit 9cc389e
Show file tree

Hide file tree

Showing 286 changed files with 17,617 additions and 9,340 deletions.
diff --git a/_PoiyomiShaders/Prefabs.meta b/_PoiyomiShaders/Prefabs.meta
diff --git a/_PoiyomiShaders/Prefabs/DepthGet.prefab b/_PoiyomiShaders/Prefabs/DepthGet.prefab
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1259802800977766
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4106851629791990}
+  - component: {fileID: 108814990146528582}
+  m_Layer: 0
+  m_Name: DepthGet
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4106851629791990
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1259802800977766}
+  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: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!108 &108814990146528582
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1259802800977766}
+  m_Enabled: 1
+  serializedVersion: 8
+  m_Type: 1
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 0.001
+  m_Range: 10
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 1
+    m_Resolution: 0
+    m_CustomResolution: -1
+    m_Strength: 0
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 0
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
diff --git a/_PoiyomiShaders/Prefabs/DepthGet.prefab.meta b/_PoiyomiShaders/Prefabs/DepthGet.prefab.meta
diff --git a/_PoiyomiShaders/Scripts.meta b/_PoiyomiShaders/Scripts.meta
diff --git a/_PoiyomiShaders/Scripts/ThryEditor/Editor/Config.cs b/_PoiyomiShaders/Scripts/ThryEditor/Editor/Config.cs
@@ -11,7 +11,7 @@ public class Config
     {
         // consts
         private const string PATH_CONFIG_FILE = "Thry/Config.json";
-        private const string VERSION = "2.51.7";
+        private const string VERSION = "2.56.5";
 
         // static
         private static Config config;
@@ -44,15 +44,22 @@ public static void OnCompile()
             }
         }
 
+        private static bool LoadFromFile(ref Config config)
+        {
+            if (!File.Exists(PATH_CONFIG_FILE)) return false;
+            string data = FileHelper.ReadFileIntoString(PATH_CONFIG_FILE);
+            if (string.IsNullOrWhiteSpace(data)) return false;
+            config = JsonUtility.FromJson<Config>(data);
+            return true;
+        }
+
         public static Config Singleton
         {
             get
             {
                 if (config == null)
                 {
-                    if (File.Exists(PATH_CONFIG_FILE))
-                        config = JsonUtility.FromJson<Config>(FileHelper.ReadFileIntoString(PATH_CONFIG_FILE));
-                    else
+                    if(!LoadFromFile(ref config))
                         config = new Config().Save();
                 }
                 return config;
@@ -63,6 +70,7 @@ public static Config Singleton
         public TextureDisplayType default_texture_type = TextureDisplayType.small;
         public bool showRenderQueue = true;
         public bool showManualReloadButton = false;
+        public bool showColorspaceWarnings = true;
         public bool allowCustomLockingRenaming = false;
         public bool autoMarkPropertiesAnimated = true;
         public TextureImporterFormat texturePackerCompressionWithAlphaOverwrite = TextureImporterFormat.Automatic;
@@ -191,4 +199,9 @@ public override int GetHashCode()
             return base.GetHashCode();
         }
     }
+
+    public enum TextureDisplayType
+    {
+        small, big, big_basic
+    }
 }
diff --git a/_PoiyomiShaders/Scripts/ThryEditor/Editor/CrossEditor.cs b/_PoiyomiShaders/Scripts/ThryEditor/Editor/CrossEditor.cs
@@ -152,10 +152,14 @@ private void OnGUI()
                 EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);
 
                 // Cursed but makes it render similar to the inspector
+
                 EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.Space(15);
+                EditorGUILayout.Space(30);
                 EditorGUILayout.BeginVertical();
+                bool wideMode = EditorGUIUtility.wideMode;
+                EditorGUIUtility.wideMode = true;
                 _shaderEditor.OnGUI(_materialEditor, _materialProperties);
+                EditorGUIUtility.wideMode = wideMode;
                 EditorGUILayout.EndVertical();
                 EditorGUILayout.EndHorizontal();