Fix Color Picker

maikramer · Jun 13, 2022 · 5afe209 · 5afe209
1 parent 0cf3bdf
commit 5afe209
Show file tree

Hide file tree

Showing 20 changed files with 1,254 additions and 32,951 deletions.
diff --git a/.idea/.idea.Materialize/.idea/workspace.xml b/.idea/.idea.Materialize/.idea/workspace.xml
diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity
@@ -2440,7 +2440,7 @@ GameObject:
   m_Component:
   - component: {fileID: 543450652270306334}
   - component: {fileID: 919132148336098981}
-  m_Layer: 0
+  m_Layer: 2
   m_Name: box_plane
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2595,7 +2595,8 @@ GameObject:
   - component: {fileID: 8887890092259829435}
   - component: {fileID: 5965635534347142}
   - component: {fileID: 2161058161197926763}
-  m_Layer: 0
+  - component: {fileID: 8887890092259829436}
+  m_Layer: 6
   m_Name: plane
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2617,3 +2618,17 @@ Transform:
   m_Father: {fileID: 543450652270306334}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!64 &8887890092259829436
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8613582465631233250}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 9166428700591565276, guid: c2cab6d50c049ad48868752e7c23be91, type: 3}
diff --git a/Assets/Scripts/HeightFromDiffuseGui.cs b/Assets/Scripts/HeightFromDiffuseGui.cs
diff --git a/Assets/Scripts/MainGui.cs b/Assets/Scripts/MainGui.cs
@@ -1423,9 +1423,9 @@ private void OpenTextureFile(MapType mapType)
         var path =
             StandaloneFileBrowser.Runtime.StandaloneFileBrowser.OpenFilePanel(title, LastDirectory,
                 _imageLoadFilter, false);
-        if (StringExt.IsNullOrEmpty(path[0])) return;
+        if (path.Length == 0 || StringExt.IsNullOrEmpty(path[0])) return;
         var lastBar = path[0].LastIndexOf(PathChar);
-        LastDirectory = path[0].Substring(0, lastBar + 1);
+        LastDirectory = path[0][..(lastBar + 1)];
         OpenFile(path[0]);
     }
 

diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log
diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log
diff --git a/Logs/AssetImportWorker1-prev.log b/Logs/AssetImportWorker1-prev.log
diff --git a/Logs/AssetImportWorker1.log b/Logs/AssetImportWorker1.log
diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log
@@ -0,0 +1,3 @@
+Base path: '/home/maikeu/Unity3D/2022.1.4f1/Editor/Data', plugins path '/home/maikeu/Unity3D/2022.1.4f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
diff --git a/Logs/shadercompiler-UnityShaderCompiler0.log b/Logs/shadercompiler-UnityShaderCompiler0.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler1.log b/Logs/shadercompiler-UnityShaderCompiler1.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler2.log b/Logs/shadercompiler-UnityShaderCompiler2.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler3.log b/Logs/shadercompiler-UnityShaderCompiler3.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler4.log b/Logs/shadercompiler-UnityShaderCompiler4.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler5.log b/Logs/shadercompiler-UnityShaderCompiler5.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler6.log b/Logs/shadercompiler-UnityShaderCompiler6.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler7.log b/Logs/shadercompiler-UnityShaderCompiler7.log
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
@@ -11,7 +11,7 @@ TagManager:
   - PostProcessing
   - Water
   - UI
-  - 
+  - Plane
   - 
   - 
   - 

diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@@ -24,7 +24,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 109
+  controlID: 2816
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -149,7 +149,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 64
+  controlID: 2780
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -174,7 +174,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 42
+  controlID: 2759
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -235,7 +235,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 24e7ffff6ce7ffffb0e8ffff46efffff8eefffffd2f0ffff06fbffff
+      m_ExpandedIDs: 06fbffff2248000032480000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -708,7 +708,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 82490000
     m_LastClickedID: 18818
-    m_ExpandedIDs: 000000008049000082490000844900008649000000ca9a3bffffff7f
+    m_ExpandedIDs: 0000000080490000824900008449000086490000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -736,7 +736,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000008049000082490000844900008649000088490000
+    m_ExpandedIDs: 0000000080490000824900008449000086490000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -882,7 +882,7 @@ MonoBehaviour:
     m_CachedPref: 160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
+  m_LastInspectedObjectInstanceID: 18496
   m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0

diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1920
     height: 970
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Console
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 457
+  controlID: 453
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 389
+  controlID: 454
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 390
+  controlID: 455
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -233,7 +233,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -242,14 +242,14 @@ MonoBehaviour:
     y: 567
     width: 1352
     height: 353
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 15}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 15}
   - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -408,9 +408,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 2a0a0000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 04fbffff
+      m_ExpandedIDs: 24e7ffff6ce7ffffb0e8ffff46efffff8eefffffd2f0ffff06fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -743,7 +743,7 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: -0.000000095123205, y: 0.70753247, z: -0.00000010249361, w: 0.7066821}
     speed: 2
-    m_Value: {x: -0.000000095123205, y: 0.70753247, z: -0.0000001024936, w: 0.7066821}
+    m_Value: {x: -0.00000009512313, y: 0.70753187, z: -0.00000010249352, w: 0.7066815}
   m_Size:
     m_Target: 7.5248675
     speed: 2
@@ -827,9 +827,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 88490000
-    m_LastClickedID: 18824
-    m_ExpandedIDs: 0000000086490000884900008a4900008c4900008e49000000ca9a3bffffff7f
+    m_SelectedIDs: 82490000
+    m_LastClickedID: 18818
+    m_ExpandedIDs: 000000008049000082490000844900008649000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -857,7 +857,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000086490000884900008a4900008c4900008e49000000ca9a3bffffff7f
+    m_ExpandedIDs: 000000008049000082490000844900008649000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Base path: '/home/maikeu/Unity3D/2022.1.4f1/Editor/Data', plugins path '/home/maikeu/Unity3D/2022.1.4f1/Editor/Data/PlaybackEngines'
		Cmd: initializeCompiler
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ TagManager: @@
       - PostProcessing
       - Water
       - UI
-      -
+      - Plane
       -
       -
       -
@@ Expand Down @@