fix some performance and stuff

Tanza3D · Aug 20, 2020 · e77bbcc · e77bbcc
1 parent 54fd1bc
commit e77bbcc
Show file tree

Hide file tree

Showing 26 changed files with 84 additions and 360 deletions.
diff --git a/.vs/osu-trigen/v16/.suo b/.vs/osu-trigen/v16/.suo
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_BPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_BPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.22285073, g: 0.10353859, b: 0, a: 1}
-    - _Color2: {r: 0.22285073, g: 0.10353859, b: 1, a: 1}
+    - _Color1: {r: 1, g: 1, b: 0, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_GPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_GPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.22285073, g: 0, b: 0.10353859, a: 1}
-    - _Color2: {r: 0.22285073, g: 1, b: 0.10353859, a: 1}
+    - _Color1: {r: 1, g: 0, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_HPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_HPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.22285073, g: 0.10353859, b: 0.10353859, a: 1}
-    - _Color2: {r: 0.22285073, g: 0.10353859, b: 0.10355054, a: 1}
+    - _Color1: {r: 1, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_MainPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_MainPicker.mat
@@ -78,4 +78,5 @@ Material:
     - _Color1: {r: 0, g: 0, b: 0, a: 1}
     - _Color2: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_Preview.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_Preview.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.22285073, g: 0.10353859, b: 0.10353859, a: 1}
-    - _Color2: {r: 0.22285073, g: 0.10353859, b: 0.10353859, a: 1}
+    - _Color1: {r: 1, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_RPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_RPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0, g: 0.10353859, b: 0.10353859, a: 1}
-    - _Color2: {r: 1, g: 0.10353859, b: 0.10353859, a: 1}
+    - _Color1: {r: 0, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_SPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_SPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.22285073, g: 0.22285073, b: 0.22285073, a: 1}
-    - _Color2: {r: 0.22285073, g: 0, b: 0, a: 1}
+    - _Color1: {r: 1, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_VPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_VPicker.mat
@@ -76,6 +76,7 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Color1: {r: 0, g: 0, b: 0, a: 1}
-    - _Color2: {r: 1, g: 0.46460962, b: 0.46460962, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_BPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_BPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.5941611, g: 0.5941611, b: 0, a: 1}
-    - _Color2: {r: 0.5941611, g: 0.5941611, b: 1, a: 1}
+    - _Color1: {r: 1, g: 1, b: 0, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_GPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_GPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.5941611, g: 0, b: 0.5941611, a: 1}
-    - _Color2: {r: 0.5941611, g: 1, b: 0.5941611, a: 1}
+    - _Color1: {r: 1, g: 0, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_HPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_HPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1}
-    - _Color2: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1}
+    - _Color1: {r: 1, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_MainPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_MainPicker.mat
@@ -78,4 +78,5 @@ Material:
     - _Color1: {r: 0, g: 0, b: 0, a: 1}
     - _Color2: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_Preview.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_Preview.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1}
-    - _Color2: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1}
+    - _Color1: {r: 1, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_RPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_RPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0, g: 0.5941611, b: 0.5941611, a: 1}
-    - _Color2: {r: 1, g: 0.5941611, b: 0.5941611, a: 1}
+    - _Color1: {r: 0, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_SPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_SPicker.mat
@@ -75,7 +75,8 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Color1: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1}
-    - _Color2: {r: 0.5941611, g: 0, b: 0, a: 1}
+    - _Color1: {r: 1, g: 1, b: 1, a: 1}
+    - _Color2: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_VPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_VPicker.mat
@@ -78,4 +78,5 @@ Material:
     - _Color1: {r: 0, g: 0, b: 0, a: 1}
     - _Color2: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1}
+    - _HSV: {r: 0, g: 0, b: 1, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Prefabs/Tri.prefab b/Assets/Prefabs/Tri.prefab
@@ -1,35 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2403520182960563424
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7216553239716735542}
-  m_Layer: 8
-  m_Name: GameObject
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7216553239716735542
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2403520182960563424}
-  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: 5048106504107860607}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5048106504107860594
 GameObject:
   m_ObjectHideFlags: 0
@@ -60,9 +30,7 @@ Transform:
   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: 7216553239716735542}
-  - {fileID: 1075663844432516530}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -81,6 +49,7 @@ SpriteRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -152,8 +121,9 @@ MonoBehaviour:
   hextext: 
   clicked: 0
   finalspeedsaved: 0
-  selectionbox: {fileID: 5981298913771357358}
+  selectionbox: {fileID: 0}
   hexcodetext: 
+  sr: {fileID: 0}
 --- !u!58 &721770064225118233
 CircleCollider2D:
   m_ObjectHideFlags: 0
@@ -266,84 +236,3 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!1 &5981298913771357358
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1075663844432516530}
-  - component: {fileID: 2035819112348166496}
-  m_Layer: 0
-  m_Name: selection-square
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1075663844432516530
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5981298913771357358}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -4.39}
-  m_LocalScale: {x: 1, y: 1, z: 7.12}
-  m_Children: []
-  m_Father: {fileID: 5048106504107860607}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &2035819112348166496
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5981298913771357358}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 84c5832b80460df4cb31ed75a47bb3a4, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 20.48, y: 20.48}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
diff --git a/Assets/Scripts/ColourMan.cs b/Assets/Scripts/ColourMan.cs
@@ -261,8 +261,6 @@ void HideShowUI()
     }
     void Update()
     {
-
-
         accentr =  sld_accentr  .value;
         pancolr =  sld_pancolr  .value;
         textcolr = sld_textcolr .value;
@@ -366,7 +364,6 @@ public void resetcol()
 
     public void SavePressed()
     {
-
         // sets string "fileoutput" to all the variablenames and the variables themselves
         string fileOutput
             //sld_accentr.value

diff --git a/Assets/Scripts/ThemeInitiator.cs b/Assets/Scripts/ThemeInitiator.cs
@@ -18,8 +18,6 @@ public class ThemeInitiator : MonoBehaviour
     public ColourMan colourman;
     public GameObject colcontrol;
     public Button open;
-    // Start is called before the first frame update
-
 
     public string GetHtmlFromUri(string resource)
     {
@@ -34,9 +32,6 @@ public string GetHtmlFromUri(string resource)
                 {
                     using (StreamReader reader = new StreamReader(resp.GetResponseStream()))
                     {
-                        //We are limiting the array to 80 so we don't have
-                        //to parse the entire html document feel free to 
-                        //adjust (probably stay under 300)
                         char[] cs = new char[80];
                         reader.Read(cs, 0, cs.Length);
                         foreach (char ch in cs)
@@ -137,9 +132,6 @@ public void addfilestoarray()
 
     // Update is called once per frame
     void Update() {
-
-
-
         if (www.isDone && !isUnzipped)
         {
             string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);

diff --git a/Assets/Scripts/Toolbarman.cs b/Assets/Scripts/Toolbarman.cs