From beef9405b2f85ac85f835251145e663605df9324 Mon Sep 17 00:00:00 2001 From: mika Date: Mon, 26 Feb 2018 13:33:40 +0800 Subject: [PATCH 001/120] Create UnparentMe.cs --- Assets/Scripts/Editor/Hierarchy/UnparentMe.cs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Assets/Scripts/Editor/Hierarchy/UnparentMe.cs diff --git a/Assets/Scripts/Editor/Hierarchy/UnparentMe.cs b/Assets/Scripts/Editor/Hierarchy/UnparentMe.cs new file mode 100644 index 0000000..18e75b1 --- /dev/null +++ b/Assets/Scripts/Editor/Hierarchy/UnparentMe.cs @@ -0,0 +1,21 @@ +// unparents selected gameobject in hierarchy (by moving to grandparents if available) + +using UnityEditor; + +namespace UnityLibrary +{ + public class UnparentMe + { + // https://docs.unity3d.com/ScriptReference/MenuItem.html + // shift U shortcut key + [MenuItem("GameObject/Unparent #u")] + static void UnParent() + { + // TODO: add undo + if (Selection.activeGameObject != null && Selection.activeGameObject.transform.parent != null) + { + Selection.activeGameObject.transform.parent = Selection.activeGameObject.transform.parent.parent; + } + } + } +} From 31cfac5243cf5478f6934783f716a8f2fd5c6fd5 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 19 Oct 2018 22:43:34 +0800 Subject: [PATCH 002/120] Create HSVDebugger.shader --- Assets/Shaders/2D/Debug/HSVDebugger.shader | 135 +++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 Assets/Shaders/2D/Debug/HSVDebugger.shader diff --git a/Assets/Shaders/2D/Debug/HSVDebugger.shader b/Assets/Shaders/2D/Debug/HSVDebugger.shader new file mode 100644 index 0000000..63f3e20 --- /dev/null +++ b/Assets/Shaders/2D/Debug/HSVDebugger.shader @@ -0,0 +1,135 @@ +// HSV Debugger Shader by UnityCoder.com - https://unitycoder.com/blog/2018/10/19/hsv-debugging-shader/ + +Shader "UnityLibrary/Debug/HSVDebugger" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + _TargetColor ("Target Color", Color) = (1, 0, 0, 1) + _HueThreshold ("Hue Threshold", Float) = 0.1 + _SatThreshold ("Saturation Threshold", Float) = 0.1 + _ValThreshold ("Value Threshold", Float) = 0.1 + [KeywordEnum(None, Hue, Saturation, Value, HueDistance, SaturationDistance, ValueDistance, ColorMatch, RemapHue)] _Mode ("Draw Mode",float) = 1 + _HueTex ("Hue Gradient Texture", 2D) = "white" {} + } + + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile _MODE_NONE _MODE_HUE _MODE_SATURATION _MODE_VALUE _MODE_HUEDISTANCE _MODE_SATURATIONDISTANCE _MODE_VALUEDISTANCE _MODE_COLORMATCH _MODE_REMAPHUE + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + sampler2D _HueTex; + + float4 _MainTex_ST; + float _HueThreshold; + float _SatThreshold; + float _ValThreshold; + float4 _TargetColor; + + // http://lolengine.net/blog/2013/07/27/rgb-to-hsv-in-glsl + float3 rgb2hsv(float3 c) + { + float4 K = float4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0); + float4 p = lerp(float4(c.bg, K.wz), float4(c.gb, K.xy), step(c.b, c.g)); + float4 q = lerp(float4(p.xyw, c.r), float4(c.r, p.yzx), step(p.x, c.r)); + float d = q.x - min(q.w, q.y); + float e = 1.0e-10; + return float3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x); + } + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + // read main texture + fixed4 tex = tex2D(_MainTex, i.uv); + + // convert colors + float3 sourceHSV = rgb2hsv(tex.rgb); + float3 targetHSV = rgb2hsv(_TargetColor.rbg); + + // get distances to our target color + float hueDist = abs(sourceHSV.x - (1-targetHSV.x)); // why -1? + float satDist = abs(sourceHSV.y - targetHSV.y); + float valDist = abs(sourceHSV.z - targetHSV.z); + + float4 results = tex; + + // select results, based on enum dropdowm + #ifdef _MODE_HUE + results.rgb = sourceHSV.x; + #endif + + #ifdef _MODE_SATURATION + results.rgb = sourceHSV.y; + #endif + + #ifdef _MODE_VALUE + results.rgb = sourceHSV.z; + #endif + + #ifdef _MODE_HUEDISTANCE + results.rgb = hueDist; + #endif + + #ifdef _MODE_SATURATIONDISTANCE + results.rgb = satDist; + #endif + + #ifdef _MODE_VALUEDISTANCE + results.rgb = valDist; + #endif + + #ifdef _MODE_REMAPHUE + results.rgb = tex2D(_HueTex, float2(sourceHSV.x,0.5)).rgb; + #endif + + #ifdef _MODE_COLORMATCH + if (hueDist < _HueThreshold) + { + if (satDist < _SatThreshold) + { + if (valDist < _ValThreshold) + { + // display inverted color for matching area + results.rgb = 1-results.rgb; + } + } + } + #endif + + // draw + return results; + } + ENDCG + } // pass + } // subshader +} // shader From 52e3b4714e850d5602a496df88467f51356ed519 Mon Sep 17 00:00:00 2001 From: mika Date: Wed, 31 Oct 2018 15:26:24 +0800 Subject: [PATCH 003/120] Create CullingGroupExample.cs --- .../Docs/UnityEngine/CullingGroupExample.cs | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs diff --git a/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs b/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs new file mode 100644 index 0000000..2f27c2e --- /dev/null +++ b/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs @@ -0,0 +1,85 @@ +// gets nearby objects using CullingGroup +// Assign this script to some gameobject, that the distance is measured from + +using UnityEngine; + +namespace UnityLibrary +{ + public class CullingGroupExample : MonoBehaviour + { + // just some dummy prefab to spawn (use default sphere for example) + public GameObject prefab; + + // distance to search objects from + public float searchDistance = 3; + + int objectCount = 5000; + + // collection of objects + Renderer[] objects; + CullingGroup cullGroup; + BoundingSphere[] bounds; + + void Start() + { + // create culling group + cullGroup = new CullingGroup(); + cullGroup.targetCamera = Camera.main; + + // measure distance to our transform + cullGroup.SetDistanceReferencePoint(transform); + + // search distance "bands" starts from 0, so index=0 is from 0 to searchDistance + cullGroup.SetBoundingDistances(new float[] { searchDistance, float.PositiveInfinity }); + + bounds = new BoundingSphere[objectCount]; + + // spam random objects + objects = new Renderer[objectCount]; + for (int i = 0; i < objectCount; i++) + { + var pos = Random.insideUnitCircle * 30; + var go = Instantiate(prefab, pos, Quaternion.identity); + objects[i] = go.GetComponent(); + + // collect bounds for objects + var b = new BoundingSphere(); + b.position = go.transform.position; + + // get simple radius..works for our sphere + b.radius = go.GetComponent().mesh.bounds.extents.x; + bounds[i] = b; + } + + // set bounds that we track + cullGroup.SetBoundingSpheres(bounds); + cullGroup.SetBoundingSphereCount(objects.Length); + + // subscribe to event + cullGroup.onStateChanged += StateChanged; + } + + // object state has changed in culling group + void StateChanged(CullingGroupEvent e) + { + // if we are in distance band index 0, that is between 0 to searchDistance + if (e.currentDistance == 0) + { + objects[e.index].material.color = Color.green; + } + else // too far, set color to red + { + objects[e.index].material.color = Color.red; + } + } + + // cleanup + private void OnDestroy() + { + cullGroup.onStateChanged -= StateChanged; + cullGroup.Dispose(); + cullGroup = null; + } + + } +} From 844352b4cfbef22bbef4072eab7d9ab3a5e2a356 Mon Sep 17 00:00:00 2001 From: mika Date: Wed, 31 Oct 2018 21:59:17 +0800 Subject: [PATCH 004/120] Update CullingGroupExample.cs --- Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs b/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs index 2f27c2e..2a5f505 100644 --- a/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs +++ b/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs @@ -13,6 +13,8 @@ public class CullingGroupExample : MonoBehaviour // distance to search objects from public float searchDistance = 3; + public bool colorInvisibleObjects = false; + int objectCount = 5000; // collection of objects @@ -62,6 +64,12 @@ void Start() // object state has changed in culling group void StateChanged(CullingGroupEvent e) { + if (colorInvisibleObjects == true && e.isVisible == false) + { + objects[e.index].material.color = Color.gray; + return; + } + // if we are in distance band index 0, that is between 0 to searchDistance if (e.currentDistance == 0) { From 74ba6e8fdf412304b133956aa65563d07781777e Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 10 Nov 2018 21:01:04 +0800 Subject: [PATCH 005/120] add discord chat button --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fffe7a5..7f6ecea 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # Unity Library +
+ +
+
:tada: Welcome to Unity Library :tada: Useful scripts, snippets and shaders here it is gathered for free. From 3f140695956bf96c7613fc75fd2a60709cc96fc6 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 29 Nov 2018 19:24:12 +0200 Subject: [PATCH 006/120] Create FlipBook.shader --- Assets/Shaders/2D/Sprites/FlipBook.shader | 93 +++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 Assets/Shaders/2D/Sprites/FlipBook.shader diff --git a/Assets/Shaders/2D/Sprites/FlipBook.shader b/Assets/Shaders/2D/Sprites/FlipBook.shader new file mode 100644 index 0000000..d548f03 --- /dev/null +++ b/Assets/Shaders/2D/Sprites/FlipBook.shader @@ -0,0 +1,93 @@ +// https://unitycoder.com/blog/2018/11/30/sprite-sheet-flip-book-shader/ + +Shader "UnityLibrary/Sprites/FlipBook (AlphaTest)" +{ + Properties + { + [Header(Texture Sheet)] + _MainTex ("Texture", 2D) = "white" {} + _Cutoff("Alpha Cutoff", Range(0,1)) = 0.15 + [Header(Settings)] + _ColumnsX("Columns (X)", int) = 1 + _RowsY("Rows (Y)", int) = 1 + _AnimationSpeed("Frames Per Seconds", float) = 10 + } + SubShader + { + Tags { + "Queue" = "AlphaTest" + "IgnoreProjector" = "True" + "PreviewType" = "Plane" + "RenderType" = "TransparentCutout" + "DisableBatching" = "True" + } + + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + float _Cutoff; + sampler2D _MainTex; + float4 _MainTex_ST; + int _ColumnsX; + int _RowsY; + float _AnimationSpeed; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + + // based on http://wiki.unity3d.com/index.php?title=Animating_Tiled_texture + + // Calculate index + float index = floor(_Time.y*_AnimationSpeed); + + // repeat when exhausting all frames + index = index % (_ColumnsX * _RowsY); + + // Size of tile + float2 size = float2(1.0f / _ColumnsX, 1.0f / _RowsY); + + // split into horizontal and vertical index + float uIndex = floor(index % _ColumnsX); + float vIndex = floor(index / _RowsY); + + // build offset + // v coordinate is the bottom of the image in opengl so we need to invert. + float2 offset = float2(uIndex * size.x, 1.0f - size.y - vIndex * size.y); + + o.uv = v.uv*size + offset; + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + fixed4 col = tex2D(_MainTex, i.uv); + + // cutout + clip(col.a - _Cutoff); + + return col; + } + ENDCG + } + } +} From 370e5a43f3ec90156368fec71b0be53f390e6879 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 30 Nov 2018 15:49:22 +0200 Subject: [PATCH 007/120] fix flipbook shader --- Assets/Shaders/2D/Sprites/FlipBook.shader | 45 ++++++++++++----------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/Assets/Shaders/2D/Sprites/FlipBook.shader b/Assets/Shaders/2D/Sprites/FlipBook.shader index d548f03..90027e0 100644 --- a/Assets/Shaders/2D/Sprites/FlipBook.shader +++ b/Assets/Shaders/2D/Sprites/FlipBook.shader @@ -1,11 +1,11 @@ // https://unitycoder.com/blog/2018/11/30/sprite-sheet-flip-book-shader/ -Shader "UnityLibrary/Sprites/FlipBook (AlphaTest)" +Shader "UnityLibrary/Sprites/FlipBook (Cutout)" { Properties { [Header(Texture Sheet)] - _MainTex ("Texture", 2D) = "white" {} + _MainTex("Texture", 2D) = "white" {} _Cutoff("Alpha Cutoff", Range(0,1)) = 0.15 [Header(Settings)] _ColumnsX("Columns (X)", int) = 1 @@ -46,39 +46,40 @@ Shader "UnityLibrary/Sprites/FlipBook (AlphaTest)" float _Cutoff; sampler2D _MainTex; float4 _MainTex_ST; - int _ColumnsX; - int _RowsY; + uint _ColumnsX; + uint _RowsY; float _AnimationSpeed; - v2f vert (appdata v) + v2f vert(appdata v) { v2f o; o.vertex = UnityObjectToClipPos(v.vertex); - // based on http://wiki.unity3d.com/index.php?title=Animating_Tiled_texture + // get single sprite size + float2 size = float2(1.0f / _ColumnsX, 1.0f / _RowsY); + uint totalFrames = _ColumnsX * _RowsY; - // Calculate index - float index = floor(_Time.y*_AnimationSpeed); + // use timer to increment index + uint index = _Time.y*_AnimationSpeed; - // repeat when exhausting all frames - index = index % (_ColumnsX * _RowsY); + // wrap x and y indexes + uint indexX = index % _ColumnsX; + uint indexY = floor((index % totalFrames) / _ColumnsX); - // Size of tile - float2 size = float2(1.0f / _ColumnsX, 1.0f / _RowsY); + // get offsets to our sprite index + float2 offset = float2(size.x*indexX,-size.y*indexY); - // split into horizontal and vertical index - float uIndex = floor(index % _ColumnsX); - float vIndex = floor(index / _RowsY); + // get single sprite UV + float2 newUV = v.uv*size; - // build offset - // v coordinate is the bottom of the image in opengl so we need to invert. - float2 offset = float2(uIndex * size.x, 1.0f - size.y - vIndex * size.y); + // flip Y (to start 0 from top) + newUV.y = newUV.y + size.y*(_RowsY - 1); - o.uv = v.uv*size + offset; + o.uv = newUV + offset; return o; } - - fixed4 frag (v2f i) : SV_Target + + fixed4 frag(v2f i) : SV_Target { fixed4 col = tex2D(_MainTex, i.uv); @@ -87,7 +88,7 @@ Shader "UnityLibrary/Sprites/FlipBook (AlphaTest)" return col; } - ENDCG + ENDCG } } } From 9cecf7ef734f50c9999c6493b3adcdefcbec7724 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 21 Dec 2018 11:29:37 +0200 Subject: [PATCH 008/120] Create ResetTransform.cs --- .../Editor/GameObject/ResetTransform.cs | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Assets/Scripts/Editor/GameObject/ResetTransform.cs diff --git a/Assets/Scripts/Editor/GameObject/ResetTransform.cs b/Assets/Scripts/Editor/GameObject/ResetTransform.cs new file mode 100644 index 0000000..8726d41 --- /dev/null +++ b/Assets/Scripts/Editor/GameObject/ResetTransform.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using UnityEditor; + +// reset transform position, rotation and scale + +namespace UnityLibrary +{ + public class ResetTransform : ScriptableObject + { + [MenuItem("GameObject/Reset Transform #r")] + static public void MoveSceneViewCamera() + { + // TODO add multiple object support + var go = Selection.activeGameObject; + if (go != null) + { + // TODO: add undo + go.transform.position = Vector3.zero; + go.transform.rotation = Quaternion.identity; + go.transform.localScale = Vector3.one; + } + } + + } // class +} // namespace From a653b061d6576255c8992f82d74a19ae48f399cd Mon Sep 17 00:00:00 2001 From: Sacristan Date: Thu, 27 Dec 2018 18:20:17 +0200 Subject: [PATCH 009/120] add TerrainTreeReplacer --- Assets/Scripts/Tools/TerrainTreeReplacer.cs | 101 ++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 Assets/Scripts/Tools/TerrainTreeReplacer.cs diff --git a/Assets/Scripts/Tools/TerrainTreeReplacer.cs b/Assets/Scripts/Tools/TerrainTreeReplacer.cs new file mode 100644 index 0000000..dc0b3a2 --- /dev/null +++ b/Assets/Scripts/Tools/TerrainTreeReplacer.cs @@ -0,0 +1,101 @@ +using UnityEngine; +using UnityEditor; +using System.Collections; +using System.Collections.Generic; + +public class TerrainTreeReplacer : EditorWindow +{ + private const string RootObjectName = "TREES_CONVERTED"; + + [MenuItem("Window/Tools/Terrain Tree Replacer")] + public static void ShowWindow() + { + EditorWindow.GetWindow(typeof(TerrainTreeReplacer)); + } + + private Terrain terrain; + + private bool disableDrawTreesAndFoliage = false; + private int treeDivisions = 0; + + private bool DivideTreesIntoGroups { get { return treeDivisions > 0; } } + + void OnGUI() + { + GUILayout.Label("Replace Terrain Trees with Objects", EditorStyles.boldLabel); + + terrain = EditorGUILayout.ObjectField("Terrain:", terrain, typeof(Terrain), true) as Terrain; + disableDrawTreesAndFoliage = EditorGUILayout.ToggleLeft("Disable Drawing Trees and Foliage", disableDrawTreesAndFoliage); + + GUILayout.Label("Tree Division groups: " + treeDivisions); + treeDivisions = (int)GUILayout.HorizontalSlider(treeDivisions, 0, 10); + + if (GUILayout.Button("Replace Terrain trees to Objects!")) Replace(); + if (GUILayout.Button("Clear generated trees!")) Clear(); + } + + public void Replace() + { + if (terrain == null) + { + Debug.LogError("Please Assign Terrain"); + return; + } + + Clear(); + + GameObject treeParent = new GameObject(RootObjectName); + + List> treegroups = new List>(); + + if (DivideTreesIntoGroups) + { + for (int i = 0; i < treeDivisions; i++) + { + treegroups.Add(new List()); + for (int j = 0; j < treeDivisions; j++) + { + GameObject treeGroup = new GameObject("TreeGroup_" + i + "_" + j); + treeGroup.transform.parent = treeParent.transform; + treegroups[i].Add(treeGroup.transform); + } + } + } + + TerrainData terrainData = terrain.terrainData; + + float xDiv = terrainData.size.x / (float)treeDivisions; + float zDiv = terrainData.size.z / (float)treeDivisions; + + foreach (TreeInstance tree in terrainData.treeInstances) + { + GameObject treePrefab = terrainData.treePrototypes[tree.prototypeIndex].prefab; + + Vector3 position = Vector3.Scale(tree.position, terrainData.size); + int xGroup = (int)(position.x / xDiv); + int zGroup = (int)(position.z / zDiv); + + position += terrain.transform.position; + + Vector2 lookRotationVector = new Vector2(Mathf.Cos(tree.rotation - Mathf.PI), Mathf.Sin(tree.rotation - Mathf.PI)); + Quaternion rotation = Quaternion.LookRotation(new Vector3(lookRotationVector.x, 0, lookRotationVector.y), Vector3.up); + + Vector3 scale = new Vector3(tree.widthScale, tree.heightScale, tree.widthScale); + + GameObject spawnedTree = Instantiate(treePrefab, position, rotation) as GameObject; + spawnedTree.name = treePrefab.name; + + spawnedTree.transform.localScale = scale; + + if (DivideTreesIntoGroups) spawnedTree.transform.SetParent(treegroups[xGroup][zGroup]); + else spawnedTree.transform.SetParent(treeParent.transform); + } + + if (disableDrawTreesAndFoliage) terrain.drawTreesAndFoliage = false; + } + + public void Clear() + { + DestroyImmediate(GameObject.Find(RootObjectName)); + } +} \ No newline at end of file From 6239e1ad54f1069c7e0462db1c7587c7b4985a00 Mon Sep 17 00:00:00 2001 From: Sacristan Date: Thu, 27 Dec 2018 18:21:37 +0200 Subject: [PATCH 010/120] cleaned up .vscode cache and add to gitignore --- .gitignore | 1 + .vscode/settings.json | 56 ------------------------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index bc36673..b0055c5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ # Visual Studio 2015 cache directory /.vs/ +/.vscode/ # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 4edd970..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "files.exclude": - { - "**/.DS_Store":true, - "**/.git":true, - "**/.gitignore":true, - "**/.gitmodules":true, - "**/*.booproj":true, - "**/*.pidb":true, - "**/*.suo":true, - "**/*.user":true, - "**/*.userprefs":true, - "**/*.unityproj":true, - "**/*.dll":true, - "**/*.exe":true, - "**/*.pdf":true, - "**/*.mid":true, - "**/*.midi":true, - "**/*.wav":true, - "**/*.gif":true, - "**/*.ico":true, - "**/*.jpg":true, - "**/*.jpeg":true, - "**/*.png":true, - "**/*.psd":true, - "**/*.tga":true, - "**/*.tif":true, - "**/*.tiff":true, - "**/*.3ds":true, - "**/*.3DS":true, - "**/*.fbx":true, - "**/*.FBX":true, - "**/*.lxo":true, - "**/*.LXO":true, - "**/*.ma":true, - "**/*.MA":true, - "**/*.obj":true, - "**/*.OBJ":true, - "**/*.asset":true, - "**/*.cubemap":true, - "**/*.flare":true, - "**/*.mat":true, - "**/*.meta":true, - "**/*.prefab":true, - "**/*.unity":true, - "build/":true, - "Build/":true, - "Library/":true, - "library/":true, - "obj/":true, - "Obj/":true, - "ProjectSettings/":true, - "temp/":true, - "Temp/":true - } -} \ No newline at end of file From 923d458f3413e5c82df32f32078997087eaa8fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=A2irts=20=C4=B6esteris?= Date: Thu, 27 Dec 2018 18:45:35 +0200 Subject: [PATCH 011/120] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f6ecea..6c51035 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ Feel free to [:postbox: Post your ideas/comments/improvements/recommendations](h - [Lootheo (Manuel Otheo)](https://github.com/Lootheo) (Member) - [igorrafael (Igor Rafael de Sousa)](https://github.com/igorrafael) (Member) - [nrlnd](https://github.com/nrlnd) (Member) -- [Sacristan (Ģirts Ķesteris)](https://github.com/nrlnd) (Member) +- [Sacristan (Ģirts Ķesteris)](https://github.com/Sacristan) (Member) - [:sparkles: Join the team](#join-the-community) [:mag: Check out Unity Community People](https://github.com/orgs/UnityCommunity/people) From 57b272041a5308bfc62c4c355a3273f69805db5d Mon Sep 17 00:00:00 2001 From: Sacristan Date: Wed, 2 Jan 2019 11:23:25 +0200 Subject: [PATCH 012/120] add monobehaviour extensions --- .../Example/MonoBehaviorExtensionsExample.cs | 21 +++++++++++ .../MonoBehaviourExtensions.cs | 36 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs create mode 100644 Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs diff --git a/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs b/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs new file mode 100644 index 0000000..20d47a7 --- /dev/null +++ b/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs @@ -0,0 +1,21 @@ +using UnityEngine; +using Sacristan.Utils.Extensions; + +public class MonoBehaviorExtensionsTest : MonoBehaviour +{ + private void Start() + { + this.InvokeRepeatingSafe(Tick, 1f, 1f); + this.InvokeSafe(Tock, 2f); + } + + private void Tick() + { + Debug.Log("Tick"); + } + + private void Tock() + { + Debug.Log("Tock"); + } +} diff --git a/Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs b/Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs new file mode 100644 index 0000000..652e071 --- /dev/null +++ b/Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections; +using UnityEngine; + +namespace Sacristan.Utils.Extensions +{ + public static class MonoBehaviourExtensions + { + public static void InvokeSafe(this MonoBehaviour behavior, System.Action method, float delayInSeconds) + { + behavior.StartCoroutine(InvokeSafeRoutine(method, delayInSeconds)); + } + + public static void InvokeRepeatingSafe(this MonoBehaviour behavior, System.Action method, float delayInSeconds, float repeatRateInSeconds) + { + behavior.StartCoroutine(InvokeSafeRepeatingRoutine(method, delayInSeconds, repeatRateInSeconds)); + } + + private static IEnumerator InvokeSafeRepeatingRoutine(System.Action method, float delayInSeconds, float repeatRateInSeconds) + { + yield return new WaitForSeconds(delayInSeconds); + + while (true) + { + if (method != null) method.Invoke(); + yield return new WaitForSeconds(repeatRateInSeconds); + } + } + + private static IEnumerator InvokeSafeRoutine(System.Action method, float delayInSeconds) + { + yield return new WaitForSeconds(delayInSeconds); + if (method != null) method.Invoke(); + } + } +} From 5a3bec2ce2a75eeca5e2db2f5965c96f00fe4d64 Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 2 Mar 2019 11:12:42 +0200 Subject: [PATCH 013/120] Create GradientTextureMaker.cs --- .../Scripts/Texture/GradientTextureMaker.cs | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 Assets/Scripts/Texture/GradientTextureMaker.cs diff --git a/Assets/Scripts/Texture/GradientTextureMaker.cs b/Assets/Scripts/Texture/GradientTextureMaker.cs new file mode 100644 index 0000000..2db2887 --- /dev/null +++ b/Assets/Scripts/Texture/GradientTextureMaker.cs @@ -0,0 +1,61 @@ +// returns gradient Texture2D (size=256x1) + +using UnityEngine; + +namespace UnityLibrary +{ + public static class GradientTextureMaker + { + const int width = 256; + const int height = 1; + + public static Texture2D Create(Color[] colors, TextureWrapMode textureWrapMode = TextureWrapMode.Clamp, FilterMode filterMode = FilterMode.Point, bool isLinear = false, bool hasMipMap = false) + { + if (colors == null || colors.Length == 0) + { + Debug.LogError("No colors assigned"); + return null; + } + + int length = colors.Length; + if (colors.Length > 8) + { + Debug.LogWarning("Too many colors! maximum is 8, assigned: " + colors.Length); + length = 8; + } + + // build gradient from colors + var colorKeys = new GradientColorKey[length]; + var alphaKeys = new GradientAlphaKey[length]; + + float steps = length - 1f; + for (int i = 0; i < length; i++) + { + float step = i / steps; + colorKeys[i].color = colors[i]; + colorKeys[i].time = step; + alphaKeys[i].alpha = colors[i].a; + alphaKeys[i].time = step; + } + + // create gradient + Gradient gradient = new Gradient(); + gradient.SetKeys(colorKeys, alphaKeys); + + // create texture + Texture2D outputTex = new Texture2D(width, height, TextureFormat.ARGB32, false, isLinear); + outputTex.wrapMode = textureWrapMode; + outputTex.filterMode = filterMode; + + // draw texture + for (int i = 0; i < width; i++) + { + outputTex.SetPixel(i, 0, gradient.Evaluate((float)i / (float)width)); + } + outputTex.Apply(false); + + return outputTex; + } // BuildGradientTexture + + } // class +} // namespcae From 41fa0d32c71299ca67bbf15423527aa67ef882c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa=20Le=C3=B3n?= Date: Tue, 7 May 2019 13:35:30 +0200 Subject: [PATCH 014/120] Updated main communication channel to Discord. Added myself to members in credits section. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c51035..e1add6a 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,9 @@ Send your GitHub id to one of the below ways: Our communities: +- [See](https://discordapp.com/channels/337579253866692608/337579253866692608) | [Join](https://discord.gg/cXT97hU) our Discord Channel (Main) - [See](https://unitylibrary.slack.com/) | [Join](https://join.slack.com/t/unitylibrary/shared_invite/MjE1MDA2NzExNDEwLTE1MDA0OTE5NzktOGJmYTI0ZDlkNA) our Slack Channel - [See](https://gitter.im/UnityCommunity/Lobby) | [Join](https://gitter.im/UnityCommunity/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link) our Gitter Channel -- [See](https://discordapp.com/channels/337579253866692608/337579253866692608) | [Join](https://discord.gg/cXT97hU) our Discord Channel - [See](https://trello.com/b/1sOcvQzd) | [Join](https://trello.com/invite/unitycommunity/239a9f3cdaf3c54cf7efc2540c304279) our Trello Development Board ## Improvements/Ideas/Feedback @@ -86,6 +86,7 @@ Feel free to [:postbox: Post your ideas/comments/improvements/recommendations](h - [igorrafael (Igor Rafael de Sousa)](https://github.com/igorrafael) (Member) - [nrlnd](https://github.com/nrlnd) (Member) - [Sacristan (Ģirts Ķesteris)](https://github.com/Sacristan) (Member) +- [Agarcialeon (Álvaro García León)](https://github.com/agarcialeon) (Member) - [:sparkles: Join the team](#join-the-community) [:mag: Check out Unity Community People](https://github.com/orgs/UnityCommunity/people) From ddb602fe308ec4af930c1208abc6491018fa052f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Garc=C3=ADa=20Le=C3=B3n?= Date: Wed, 8 May 2019 13:16:54 +0200 Subject: [PATCH 015/120] Update README.md Moved Discord chat badget next to link to access it. Removed initial separator. --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index e1add6a..d5b8e6a 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # Unity Library -
- -
-
:tada: Welcome to Unity Library :tada: Useful scripts, snippets and shaders here it is gathered for free. @@ -69,7 +65,7 @@ Send your GitHub id to one of the below ways: Our communities: -- [See](https://discordapp.com/channels/337579253866692608/337579253866692608) | [Join](https://discord.gg/cXT97hU) our Discord Channel (Main) +- [See](https://discordapp.com/channels/337579253866692608/337579253866692608) | [Join](https://discord.gg/cXT97hU) our Discord Channel (Main) - [See](https://unitylibrary.slack.com/) | [Join](https://join.slack.com/t/unitylibrary/shared_invite/MjE1MDA2NzExNDEwLTE1MDA0OTE5NzktOGJmYTI0ZDlkNA) our Slack Channel - [See](https://gitter.im/UnityCommunity/Lobby) | [Join](https://gitter.im/UnityCommunity/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link) our Gitter Channel - [See](https://trello.com/b/1sOcvQzd) | [Join](https://trello.com/invite/unitycommunity/239a9f3cdaf3c54cf7efc2540c304279) our Trello Development Board From 49bf5d2a430e20d352bb4673d5d026c19deefe70 Mon Sep 17 00:00:00 2001 From: mika Date: Wed, 29 May 2019 00:52:55 +0300 Subject: [PATCH 016/120] Create RendererBoundsGizmo.cs --- .../Editor/Gizmos/RendererBoundsGizmo.cs | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs diff --git a/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs b/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs new file mode 100644 index 0000000..1f11866 --- /dev/null +++ b/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs @@ -0,0 +1,24 @@ +// attach this to mesh, draws renderer bounds when gameobject is selected +// original source: http://answers.unity.com/answers/137475/view.html + +using UnityEngine; + +namespace UnityLibrary +{ + public class RendererBoundsGizmo : MonoBehaviour + { + void OnDrawGizmos() + { + OnDrawGizmosSelected(); + } + + void OnDrawGizmosSelected() + { + Gizmos.color = Color.yellow; + //center sphere + //Gizmos.DrawSphere(transform.position, 0.1f); + var r = transform.GetComponent(); + if (r != null) Gizmos.DrawWireCube(transform.position, r.bounds.size); + } + } +} From be2ea7de3fc2d28a5b1dbfdbba350a8068b38799 Mon Sep 17 00:00:00 2001 From: mika Date: Wed, 29 May 2019 00:57:58 +0300 Subject: [PATCH 017/120] Update RendererBoundsGizmo.cs --- Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs b/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs index 1f11866..084224f 100644 --- a/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs +++ b/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs @@ -7,11 +7,6 @@ namespace UnityLibrary { public class RendererBoundsGizmo : MonoBehaviour { - void OnDrawGizmos() - { - OnDrawGizmosSelected(); - } - void OnDrawGizmosSelected() { Gizmos.color = Color.yellow; From 1543589205584b248b0c2051a4f7337d8527b4b3 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 7 Jun 2019 11:55:23 +0300 Subject: [PATCH 018/120] Create GetVideoAspectRatioEditor.cs --- .../ContextMenu/GetVideoAspectRatioEditor.cs | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs diff --git a/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs new file mode 100644 index 0000000..4bee101 --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs @@ -0,0 +1,31 @@ +// Custom Contect menu for VideoPlayer component +// used for scaling quad mesh transform localscale.y to match videoplayer aspect ratio + +using UnityEngine; +using UnityEditor; +using UnityEngine.Video; + +namespace UnityLibrary +{ + public class GetVideoAspectRatioEditor : MonoBehaviour + { + [MenuItem("CONTEXT/VideoPlayer/Get Aspect Ratio for Mesh")] + static void DoubleMass(MenuCommand command) + { + // get aspect ratio + VideoPlayer v = (VideoPlayer)command.context; + if (v.clip == null) + { + Debug.LogError("No videoclip assigned.."); + return; + } + float aspectRatioY = v.height / (float)v.width; + + // scale mesh + Vector3 scale = v.transform.localScale; + // fix only height + scale.y *= aspectRatioY; + v.transform.localScale = scale; + } + } +} From adda230bff5608b59e4807b195f24d241e7cdb6e Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 7 Jun 2019 12:59:36 +0300 Subject: [PATCH 019/120] Create CreateOutlineForPanelEditor.cs --- .../CreateOutlineForPanelEditor.cs | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs diff --git a/Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs b/Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs new file mode 100644 index 0000000..539fbfa --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs @@ -0,0 +1,59 @@ +// Custom Contect menu for UI Image component (in WorldSpace UI canvas) +// used for creating outline for panel (image) using LineRenderer + +using UnityEngine; +using UnityEditor; +using UnityEngine.UI; + +namespace UnityLibrary +{ + public class CreateOutlineForPanelEditor : MonoBehaviour + { + [MenuItem("CONTEXT/Image/Create Outline For Panel")] + static void DoubleMass(MenuCommand command) + { + // get reference + Image comp = (Image)command.context; + if (comp == null) + { + Debug.LogError("No Image component found.."); + return; + } + + // TODO check that its worlspace canvas + + // get worldspace borders, FIXME get root canvas, instead of parent + var canvasRect = comp.transform.parent.GetComponent().GetComponent(); + Vector3[] corners = new Vector3[4]; + canvasRect.GetWorldCorners(corners); + + var line = comp.transform.GetComponent(); + if (line == null) + { + Debug.LogError("Missing LineRenderer component"); + return; + } + + if (line.useWorldSpace == true) + { + Debug.LogWarning("LineRenderer has worlspace enabled, disabling it"); + line.useWorldSpace = false; + } + + // set line points + line.positionCount = corners.Length + 1; + line.SetPositions(corners); + // connect last and first + line.SetPosition(line.positionCount - 1, corners[0]); + + // convert worldspace to localspace + for (int i = 0, len = line.positionCount; i < len; i++) + { + var worldPos = line.GetPosition(i); + var localPos = canvasRect.transform.InverseTransformPoint(worldPos); + line.SetPosition(i, localPos); + } + + } + } +} From b1d607c5526a26567a7a84a3dd476af7f39cb0f5 Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 8 Jun 2019 18:09:18 +0300 Subject: [PATCH 020/120] Update GetVideoAspectRatioEditor.cs add undo to GetVideoAspectRatioEditor.cs --- Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs index 4bee101..23c6600 100644 --- a/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs +++ b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs @@ -21,6 +21,9 @@ static void DoubleMass(MenuCommand command) } float aspectRatioY = v.height / (float)v.width; + // record undo + Undo.RecordObject(v.transform, "Set scale"); + // scale mesh Vector3 scale = v.transform.localScale; // fix only height From ce83de8144ced357d8f36f0c21667a30fb32a14f Mon Sep 17 00:00:00 2001 From: lmckamey Date: Fri, 9 Aug 2019 09:00:45 -0600 Subject: [PATCH 021/120] Added files and working on the sample scene Added UI animation Scripts. Also added a sample scene that is inteded to show off the animations --- Assets/Scenes/UI_Animation_Sample.unity | 296 ++++++++++++++++++ Assets/Scripts/UI/UI Animation/GrowEffect.cs | 69 ++++ .../UI/UI Animation/HelicopterGrowEffect.cs | 50 +++ Assets/Scripts/UI/UI Animation/ImageFade.cs | 150 +++++++++ .../Scripts/UI/UI Animation/LerpFromOffset.cs | 104 ++++++ 5 files changed, 669 insertions(+) create mode 100644 Assets/Scenes/UI_Animation_Sample.unity create mode 100644 Assets/Scripts/UI/UI Animation/GrowEffect.cs create mode 100644 Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs create mode 100644 Assets/Scripts/UI/UI Animation/ImageFade.cs create mode 100644 Assets/Scripts/UI/UI Animation/LerpFromOffset.cs diff --git a/Assets/Scenes/UI_Animation_Sample.unity b/Assets/Scenes/UI_Animation_Sample.unity new file mode 100644 index 0000000..0804034 --- /dev/null +++ b/Assets/Scenes/UI_Animation_Sample.unity @@ -0,0 +1,296 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &922358087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 922358089} + - component: {fileID: 922358088} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &922358088 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922358087} + m_Enabled: 1 + serializedVersion: 9 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &922358089 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922358087} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1953608471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1953608474} + - component: {fileID: 1953608473} + - component: {fileID: 1953608472} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1953608472 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953608471} + m_Enabled: 1 +--- !u!20 &1953608473 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953608471} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1953608474 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953608471} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/UI/UI Animation/GrowEffect.cs b/Assets/Scripts/UI/UI Animation/GrowEffect.cs new file mode 100644 index 0000000..2eaf8ef --- /dev/null +++ b/Assets/Scripts/UI/UI Animation/GrowEffect.cs @@ -0,0 +1,69 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +/// +/// Script that when attached to an object will cause it to grow until it reaches the desired Scale +/// +public class GrowEffect : MonoBehaviour +{ + private enum Effect + { + BOUNCE_IN_OUT, + ELASTIC_IN_OUT, + LINEAR, + CIRCULAR_IN_OUT + } + + [Header("Configuration")] + [Tooltip("The desired scale to grow to")] + [SerializeField] float m_desiredScale = 1.0f; + [Tooltip("How much time it will take to reach the desired scale")] + [SerializeField] float m_timeToReachDesiredScale = 1.0f; + [Tooltip("How much time it takes before the grow effect starts")] + [SerializeField] float m_timeToDelayStart = 0.0f; + [Tooltip("Effect on the grow animation")] + [SerializeField] Effect m_interpolationEffect = Effect.ELASTIC_IN_OUT; + + //private member variables + private float m_currentTime = 0.0f; + + private void Awake() + { + //set the local scale to zero so it can grow + transform.localScale = Vector3.zero; + } + + void Update() + { + if (m_timeToDelayStart <= 0.0) + { + //increment current time by DT + m_currentTime += Time.deltaTime; + + if (!(m_currentTime > m_timeToReachDesiredScale)) + { + //Switch as to which effect will happen + switch (m_interpolationEffect) + { + case Effect.BOUNCE_IN_OUT: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.BounceInOut(m_currentTime / m_timeToReachDesiredScale))); + break; + case Effect.ELASTIC_IN_OUT: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.ElasticInOut(m_currentTime / m_timeToReachDesiredScale))); + break; + case Effect.LINEAR: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.Linear(m_currentTime / m_timeToReachDesiredScale))); + break; + case Effect.CIRCULAR_IN_OUT: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.CircularInOut(m_currentTime / m_timeToReachDesiredScale))); + break; + } + } + } + else + { + //reduce the delay start by DT + m_timeToDelayStart -= Time.deltaTime; + } + } +} diff --git a/Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs b/Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs new file mode 100644 index 0000000..cbbe432 --- /dev/null +++ b/Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs @@ -0,0 +1,50 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HelicopterGrowEffect : MonoBehaviour +{ + [Header("Configuration")] + [Tooltip("The desired Scale to reach")] + [SerializeField] float m_desiredScale = 1.0f; + [Tooltip("How much time it will take to reach the desired scale")] + [SerializeField] float m_timeToReachDesiredScale = 1.0f; + [Tooltip("How fast the helicopter effect will spin")] + [SerializeField] float m_rotationSpeed = 2.0f; + [Tooltip("the angle of rotation per frame")] + [SerializeField] float m_rotationAngle = 10.0f; + + //private member variables + private float m_currentTime = 0.0f; + private Quaternion startingRotation = Quaternion.identity; + + private void Awake() + { + //set the base transform to 0 so it can grow + transform.localScale = Vector3.zero; + //set the staring rotation variable to the current rotation + startingRotation = transform.rotation; + } + + void Update() + { + //increment current time by delta time + m_currentTime += Time.deltaTime; + if (m_currentTime <= m_timeToReachDesiredScale) + { + //rotate the object by the rotation angle and rotation speed + gameObject.transform.Rotate(Vector3.forward, (m_rotationAngle * (m_rotationSpeed * Time.deltaTime))); + //lerp the scale to the desired scale + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.ElasticInOut(m_currentTime/m_timeToReachDesiredScale))); + //leave the function + return; + } + else + { + //when the lerping is done set the rotation to the starting rotation + gameObject.transform.rotation = startingRotation; + //set the scale to the desired scale + gameObject.transform.localScale = Vector3.one * m_desiredScale; + } + } +} diff --git a/Assets/Scripts/UI/UI Animation/ImageFade.cs b/Assets/Scripts/UI/UI Animation/ImageFade.cs new file mode 100644 index 0000000..edca0c0 --- /dev/null +++ b/Assets/Scripts/UI/UI Animation/ImageFade.cs @@ -0,0 +1,150 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.UI; +/// +/// Component that when attached to an Image will fade in or out based on isFadingIn +/// +[RequireComponent(typeof(Image))] +public class ImageFade : MonoBehaviour +{ + [Header("Configuration")] + [Tooltip("The Time it takes for the object to fade")] + [SerializeField] float m_timeToFade = 1.5f; + [Tooltip("The Time it takes before the object begins its fading")] + [SerializeField] float m_delayTimeToStart = 1.5f; + [Tooltip("Boolean to determing if the image is fading in or out")] + [SerializeField] bool m_isFadingIn = true; + [Tooltip("Boolean to determing if the image is a button or out")] + [SerializeField] bool m_doesHaveChildText = false; + + //Sibling Components + private Image m_image; + private TextMeshProUGUI m_text; + + //Member variables + private Color m_startColor; + private Color m_buttonTextStartColor; + private Color m_desiredEndColor; + private float m_timeElapsed = 0.0f; + + private void Awake() + { + GetSiblingComponents(); + //set the starting color to the color of the object + SetStartingColor(); + //Start the Fade Coroutine + StartCoroutine(Fade()); + } + + //Function that sets the image color value determined on if you want to fade in or out + private void SetStartingColor() + { + //start color is set to the images current color + m_startColor = m_image.color; + //create new varibles to be messed with later + Color modifiedColor = m_startColor; + Color modifiedTextColor = default; + if (m_doesHaveChildText) + { + //if this had childed text component buttonTextStartcolor is set to the text's current color + m_buttonTextStartColor = m_text.color; + modifiedTextColor = m_buttonTextStartColor; + } + //sets the starting colors alpha values + if (m_isFadingIn) + { + //if it is fading in set alpha values to 0 + modifiedColor.a = 0.0f; + modifiedTextColor.a = 0.0f; + } + //Set the current colors to be the modified colors for fading + m_image.color = modifiedColor; + if (m_doesHaveChildText) + { + m_text.color = modifiedTextColor; + } + } + + /// + /// Gets the Required Sibling components + /// + private void GetSiblingComponents() + { + m_image = GetComponent(); + if (m_doesHaveChildText) + { + m_text = GetComponentInChildren(); + } + } + + /// + /// Coroutine that fades the Image by lerping the alpha from either 1-0 or 0-1 + /// + IEnumerator Fade() + { + //Wait for the delay + yield return new WaitForSeconds(m_delayTimeToStart); + //create new color + Color newColor = m_startColor; + Color newTextColor = default; + if (m_doesHaveChildText) + { + newTextColor = m_text.color; + } + while (m_timeElapsed < m_timeToFade) + { + float time = m_timeElapsed / m_timeToFade; + if (m_isFadingIn) + { + //set new colors alpha to the lerp value of time + newColor.a = Mathf.Lerp(0, m_startColor.a, time); + if (m_doesHaveChildText) + { + newTextColor.a = Mathf.Lerp(0, m_buttonTextStartColor.a, time); + } + } + else + { + //set new colors alpha to the lerp value of time + newColor.a = Mathf.Lerp(m_startColor.a, 0, time); + if (m_doesHaveChildText) + { + newTextColor.a = Mathf.Lerp(m_buttonTextStartColor.a, 0, time); + } + } + //set image color to the new color + if (m_doesHaveChildText) + { + m_text.color = newTextColor; + } + m_image.color = newColor; + //add deltaTime to time elapsed + m_timeElapsed += Time.deltaTime; + yield return null; + } + //when the loop finishes set the colors to be what they are supposed to be + if (m_isFadingIn) + { + m_image.color = m_startColor; + if (m_doesHaveChildText) + { + m_text.color = m_buttonTextStartColor; + } + } + else + { + //if not is fading in set the alpha values to 0 + Color desiredColor = m_startColor; + desiredColor.a = 0.0f; + m_image.color = desiredColor; + if(m_doesHaveChildText) + { + desiredColor = m_buttonTextStartColor; + desiredColor.a = 0.0f; + m_text.color = desiredColor; + } + } + } +} diff --git a/Assets/Scripts/UI/UI Animation/LerpFromOffset.cs b/Assets/Scripts/UI/UI Animation/LerpFromOffset.cs new file mode 100644 index 0000000..33172b6 --- /dev/null +++ b/Assets/Scripts/UI/UI Animation/LerpFromOffset.cs @@ -0,0 +1,104 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LerpFromOffset : MonoBehaviour +{ + /// + /// Effect Enum only to be used by this class, for chossing which interpolation effect to use + /// + private enum Effect + { + BOUNCE_OUT, + ELASTIC_OUT, + LINEAR, + CIRCULAR_OUT, + CIRCULAR_IN, + CIRCULAR_IN_OUT, + INVERSE_CIRCULAR_IN_OUT + } + + [Header("Configuration")] + [Tooltip("The The Effect you would like to happen")] + [SerializeField] Effect m_effect = default; + [Tooltip("The direction you want the object to lerp from")] + [SerializeField] Vector3 m_offsetDirection = default; + [Tooltip("The the distnace you want to multiply the direction by")] + [SerializeField] float m_offsetDistance = 1.0f; + [Tooltip("How much time it will take for the object to reach its original position")] + [SerializeField] float m_timeToReachPosition = 1.5f; + [Tooltip("How much time it will take to start moving")] + [SerializeField] float m_delayStart = 1.5f; + + + //Memeber variables + private Vector3 m_offset = Vector3.zero; + private Vector3 m_desiredPos = Vector3.zero; + private float m_currentTime = 0.0f; + + void Awake() + { + Setup(); + } + /// + /// Method that sets up all of the needed things and places the object at the calcuated offset + /// + void Setup() + { + //calculate offset position + m_offset = m_offsetDirection.normalized * m_offsetDistance; + //set the desired position to the current position + m_desiredPos = transform.position; + //move the object to the offset position to begin lerping + transform.position = m_desiredPos + m_offset; + } + + void Update() + { + if (m_delayStart <= 0.0f) + { + //add deltaTime to the current time + m_currentTime += Time.deltaTime; + if (m_currentTime < m_timeToReachPosition) + { + //based on which effect is selected this will lerp from the curretn position to the desired position + switch (m_effect) + { + //Lerps using the BouceOut Interpolation + case Effect.BOUNCE_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.BounceOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the ElasticOut Interpolation + case Effect.ELASTIC_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.ElasticOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the Linear Interpolation + case Effect.LINEAR: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.Linear(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the CircularOut Interpolation + case Effect.CIRCULAR_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.CircularOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the CircularInOut Interpolation + case Effect.CIRCULAR_IN_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.CircularInOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the CircularIn Interpolation + case Effect.CIRCULAR_IN: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.SineIn(m_currentTime / m_timeToReachPosition)); + break; + } + + return; + } + //set the current position to the desired position + transform.position = m_desiredPos; + } + else + { + //remove Deltatime from the m_delayStart + m_delayStart -= Time.deltaTime; + } + } +} From 32a7a854da6a6261657056d828340e776289f779 Mon Sep 17 00:00:00 2001 From: lmckamey Date: Fri, 9 Aug 2019 09:25:25 -0600 Subject: [PATCH 022/120] Revert "Added files and working on the sample scene" This reverts commit ce83de8144ced357d8f36f0c21667a30fb32a14f. --- Assets/Scenes/UI_Animation_Sample.unity | 296 ------------------ Assets/Scripts/UI/UI Animation/GrowEffect.cs | 69 ---- .../UI/UI Animation/HelicopterGrowEffect.cs | 50 --- Assets/Scripts/UI/UI Animation/ImageFade.cs | 150 --------- .../Scripts/UI/UI Animation/LerpFromOffset.cs | 104 ------ 5 files changed, 669 deletions(-) delete mode 100644 Assets/Scenes/UI_Animation_Sample.unity delete mode 100644 Assets/Scripts/UI/UI Animation/GrowEffect.cs delete mode 100644 Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs delete mode 100644 Assets/Scripts/UI/UI Animation/ImageFade.cs delete mode 100644 Assets/Scripts/UI/UI Animation/LerpFromOffset.cs diff --git a/Assets/Scenes/UI_Animation_Sample.unity b/Assets/Scenes/UI_Animation_Sample.unity deleted file mode 100644 index 0804034..0000000 --- a/Assets/Scenes/UI_Animation_Sample.unity +++ /dev/null @@ -1,296 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &922358087 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 922358089} - - component: {fileID: 922358088} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &922358088 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 922358087} - m_Enabled: 1 - serializedVersion: 9 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &922358089 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 922358087} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1953608471 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1953608474} - - component: {fileID: 1953608473} - - component: {fileID: 1953608472} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1953608472 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1953608471} - m_Enabled: 1 ---- !u!20 &1953608473 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1953608471} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1953608474 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1953608471} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/UI/UI Animation/GrowEffect.cs b/Assets/Scripts/UI/UI Animation/GrowEffect.cs deleted file mode 100644 index 2eaf8ef..0000000 --- a/Assets/Scripts/UI/UI Animation/GrowEffect.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -/// -/// Script that when attached to an object will cause it to grow until it reaches the desired Scale -/// -public class GrowEffect : MonoBehaviour -{ - private enum Effect - { - BOUNCE_IN_OUT, - ELASTIC_IN_OUT, - LINEAR, - CIRCULAR_IN_OUT - } - - [Header("Configuration")] - [Tooltip("The desired scale to grow to")] - [SerializeField] float m_desiredScale = 1.0f; - [Tooltip("How much time it will take to reach the desired scale")] - [SerializeField] float m_timeToReachDesiredScale = 1.0f; - [Tooltip("How much time it takes before the grow effect starts")] - [SerializeField] float m_timeToDelayStart = 0.0f; - [Tooltip("Effect on the grow animation")] - [SerializeField] Effect m_interpolationEffect = Effect.ELASTIC_IN_OUT; - - //private member variables - private float m_currentTime = 0.0f; - - private void Awake() - { - //set the local scale to zero so it can grow - transform.localScale = Vector3.zero; - } - - void Update() - { - if (m_timeToDelayStart <= 0.0) - { - //increment current time by DT - m_currentTime += Time.deltaTime; - - if (!(m_currentTime > m_timeToReachDesiredScale)) - { - //Switch as to which effect will happen - switch (m_interpolationEffect) - { - case Effect.BOUNCE_IN_OUT: - gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.BounceInOut(m_currentTime / m_timeToReachDesiredScale))); - break; - case Effect.ELASTIC_IN_OUT: - gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.ElasticInOut(m_currentTime / m_timeToReachDesiredScale))); - break; - case Effect.LINEAR: - gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.Linear(m_currentTime / m_timeToReachDesiredScale))); - break; - case Effect.CIRCULAR_IN_OUT: - gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.CircularInOut(m_currentTime / m_timeToReachDesiredScale))); - break; - } - } - } - else - { - //reduce the delay start by DT - m_timeToDelayStart -= Time.deltaTime; - } - } -} diff --git a/Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs b/Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs deleted file mode 100644 index cbbe432..0000000 --- a/Assets/Scripts/UI/UI Animation/HelicopterGrowEffect.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class HelicopterGrowEffect : MonoBehaviour -{ - [Header("Configuration")] - [Tooltip("The desired Scale to reach")] - [SerializeField] float m_desiredScale = 1.0f; - [Tooltip("How much time it will take to reach the desired scale")] - [SerializeField] float m_timeToReachDesiredScale = 1.0f; - [Tooltip("How fast the helicopter effect will spin")] - [SerializeField] float m_rotationSpeed = 2.0f; - [Tooltip("the angle of rotation per frame")] - [SerializeField] float m_rotationAngle = 10.0f; - - //private member variables - private float m_currentTime = 0.0f; - private Quaternion startingRotation = Quaternion.identity; - - private void Awake() - { - //set the base transform to 0 so it can grow - transform.localScale = Vector3.zero; - //set the staring rotation variable to the current rotation - startingRotation = transform.rotation; - } - - void Update() - { - //increment current time by delta time - m_currentTime += Time.deltaTime; - if (m_currentTime <= m_timeToReachDesiredScale) - { - //rotate the object by the rotation angle and rotation speed - gameObject.transform.Rotate(Vector3.forward, (m_rotationAngle * (m_rotationSpeed * Time.deltaTime))); - //lerp the scale to the desired scale - gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.ElasticInOut(m_currentTime/m_timeToReachDesiredScale))); - //leave the function - return; - } - else - { - //when the lerping is done set the rotation to the starting rotation - gameObject.transform.rotation = startingRotation; - //set the scale to the desired scale - gameObject.transform.localScale = Vector3.one * m_desiredScale; - } - } -} diff --git a/Assets/Scripts/UI/UI Animation/ImageFade.cs b/Assets/Scripts/UI/UI Animation/ImageFade.cs deleted file mode 100644 index edca0c0..0000000 --- a/Assets/Scripts/UI/UI Animation/ImageFade.cs +++ /dev/null @@ -1,150 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; -using UnityEngine.UI; -/// -/// Component that when attached to an Image will fade in or out based on isFadingIn -/// -[RequireComponent(typeof(Image))] -public class ImageFade : MonoBehaviour -{ - [Header("Configuration")] - [Tooltip("The Time it takes for the object to fade")] - [SerializeField] float m_timeToFade = 1.5f; - [Tooltip("The Time it takes before the object begins its fading")] - [SerializeField] float m_delayTimeToStart = 1.5f; - [Tooltip("Boolean to determing if the image is fading in or out")] - [SerializeField] bool m_isFadingIn = true; - [Tooltip("Boolean to determing if the image is a button or out")] - [SerializeField] bool m_doesHaveChildText = false; - - //Sibling Components - private Image m_image; - private TextMeshProUGUI m_text; - - //Member variables - private Color m_startColor; - private Color m_buttonTextStartColor; - private Color m_desiredEndColor; - private float m_timeElapsed = 0.0f; - - private void Awake() - { - GetSiblingComponents(); - //set the starting color to the color of the object - SetStartingColor(); - //Start the Fade Coroutine - StartCoroutine(Fade()); - } - - //Function that sets the image color value determined on if you want to fade in or out - private void SetStartingColor() - { - //start color is set to the images current color - m_startColor = m_image.color; - //create new varibles to be messed with later - Color modifiedColor = m_startColor; - Color modifiedTextColor = default; - if (m_doesHaveChildText) - { - //if this had childed text component buttonTextStartcolor is set to the text's current color - m_buttonTextStartColor = m_text.color; - modifiedTextColor = m_buttonTextStartColor; - } - //sets the starting colors alpha values - if (m_isFadingIn) - { - //if it is fading in set alpha values to 0 - modifiedColor.a = 0.0f; - modifiedTextColor.a = 0.0f; - } - //Set the current colors to be the modified colors for fading - m_image.color = modifiedColor; - if (m_doesHaveChildText) - { - m_text.color = modifiedTextColor; - } - } - - /// - /// Gets the Required Sibling components - /// - private void GetSiblingComponents() - { - m_image = GetComponent(); - if (m_doesHaveChildText) - { - m_text = GetComponentInChildren(); - } - } - - /// - /// Coroutine that fades the Image by lerping the alpha from either 1-0 or 0-1 - /// - IEnumerator Fade() - { - //Wait for the delay - yield return new WaitForSeconds(m_delayTimeToStart); - //create new color - Color newColor = m_startColor; - Color newTextColor = default; - if (m_doesHaveChildText) - { - newTextColor = m_text.color; - } - while (m_timeElapsed < m_timeToFade) - { - float time = m_timeElapsed / m_timeToFade; - if (m_isFadingIn) - { - //set new colors alpha to the lerp value of time - newColor.a = Mathf.Lerp(0, m_startColor.a, time); - if (m_doesHaveChildText) - { - newTextColor.a = Mathf.Lerp(0, m_buttonTextStartColor.a, time); - } - } - else - { - //set new colors alpha to the lerp value of time - newColor.a = Mathf.Lerp(m_startColor.a, 0, time); - if (m_doesHaveChildText) - { - newTextColor.a = Mathf.Lerp(m_buttonTextStartColor.a, 0, time); - } - } - //set image color to the new color - if (m_doesHaveChildText) - { - m_text.color = newTextColor; - } - m_image.color = newColor; - //add deltaTime to time elapsed - m_timeElapsed += Time.deltaTime; - yield return null; - } - //when the loop finishes set the colors to be what they are supposed to be - if (m_isFadingIn) - { - m_image.color = m_startColor; - if (m_doesHaveChildText) - { - m_text.color = m_buttonTextStartColor; - } - } - else - { - //if not is fading in set the alpha values to 0 - Color desiredColor = m_startColor; - desiredColor.a = 0.0f; - m_image.color = desiredColor; - if(m_doesHaveChildText) - { - desiredColor = m_buttonTextStartColor; - desiredColor.a = 0.0f; - m_text.color = desiredColor; - } - } - } -} diff --git a/Assets/Scripts/UI/UI Animation/LerpFromOffset.cs b/Assets/Scripts/UI/UI Animation/LerpFromOffset.cs deleted file mode 100644 index 33172b6..0000000 --- a/Assets/Scripts/UI/UI Animation/LerpFromOffset.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LerpFromOffset : MonoBehaviour -{ - /// - /// Effect Enum only to be used by this class, for chossing which interpolation effect to use - /// - private enum Effect - { - BOUNCE_OUT, - ELASTIC_OUT, - LINEAR, - CIRCULAR_OUT, - CIRCULAR_IN, - CIRCULAR_IN_OUT, - INVERSE_CIRCULAR_IN_OUT - } - - [Header("Configuration")] - [Tooltip("The The Effect you would like to happen")] - [SerializeField] Effect m_effect = default; - [Tooltip("The direction you want the object to lerp from")] - [SerializeField] Vector3 m_offsetDirection = default; - [Tooltip("The the distnace you want to multiply the direction by")] - [SerializeField] float m_offsetDistance = 1.0f; - [Tooltip("How much time it will take for the object to reach its original position")] - [SerializeField] float m_timeToReachPosition = 1.5f; - [Tooltip("How much time it will take to start moving")] - [SerializeField] float m_delayStart = 1.5f; - - - //Memeber variables - private Vector3 m_offset = Vector3.zero; - private Vector3 m_desiredPos = Vector3.zero; - private float m_currentTime = 0.0f; - - void Awake() - { - Setup(); - } - /// - /// Method that sets up all of the needed things and places the object at the calcuated offset - /// - void Setup() - { - //calculate offset position - m_offset = m_offsetDirection.normalized * m_offsetDistance; - //set the desired position to the current position - m_desiredPos = transform.position; - //move the object to the offset position to begin lerping - transform.position = m_desiredPos + m_offset; - } - - void Update() - { - if (m_delayStart <= 0.0f) - { - //add deltaTime to the current time - m_currentTime += Time.deltaTime; - if (m_currentTime < m_timeToReachPosition) - { - //based on which effect is selected this will lerp from the curretn position to the desired position - switch (m_effect) - { - //Lerps using the BouceOut Interpolation - case Effect.BOUNCE_OUT: - transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.BounceOut(m_currentTime / m_timeToReachPosition)); - break; - //Lerps using the ElasticOut Interpolation - case Effect.ELASTIC_OUT: - transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.ElasticOut(m_currentTime / m_timeToReachPosition)); - break; - //Lerps using the Linear Interpolation - case Effect.LINEAR: - transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.Linear(m_currentTime / m_timeToReachPosition)); - break; - //Lerps using the CircularOut Interpolation - case Effect.CIRCULAR_OUT: - transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.CircularOut(m_currentTime / m_timeToReachPosition)); - break; - //Lerps using the CircularInOut Interpolation - case Effect.CIRCULAR_IN_OUT: - transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.CircularInOut(m_currentTime / m_timeToReachPosition)); - break; - //Lerps using the CircularIn Interpolation - case Effect.CIRCULAR_IN: - transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.SineIn(m_currentTime / m_timeToReachPosition)); - break; - } - - return; - } - //set the current position to the desired position - transform.position = m_desiredPos; - } - else - { - //remove Deltatime from the m_delayStart - m_delayStart -= Time.deltaTime; - } - } -} From 611127380aa0fc23f70daefc92103d92ee35f038 Mon Sep 17 00:00:00 2001 From: lmckamey Date: Fri, 9 Aug 2019 10:10:51 -0600 Subject: [PATCH 023/120] Added Animation Scripts and Sample Scene Added a few mathmatical Animation Scripts for UI elements, along with a sample scene to show how they work --- Assets/Scenes/ui animation Sample Scene.unity | 1712 +++++++++++++++++ Assets/Scripts/UI/Animation/GrowEffect.cs | 70 + .../UI/Animation/HelicopterGrowEffect.cs | 52 + Assets/Scripts/UI/Animation/ImageFade.cs | 150 ++ Assets/Scripts/UI/Animation/LerpFromOffset.cs | 108 ++ .../UI/Animation/Shared/Interpolation.cs | 220 +++ 6 files changed, 2312 insertions(+) create mode 100644 Assets/Scenes/ui animation Sample Scene.unity create mode 100644 Assets/Scripts/UI/Animation/GrowEffect.cs create mode 100644 Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs create mode 100644 Assets/Scripts/UI/Animation/ImageFade.cs create mode 100644 Assets/Scripts/UI/Animation/LerpFromOffset.cs create mode 100644 Assets/Scripts/UI/Animation/Shared/Interpolation.cs diff --git a/Assets/Scenes/ui animation Sample Scene.unity b/Assets/Scenes/ui animation Sample Scene.unity new file mode 100644 index 0000000..45734bf --- /dev/null +++ b/Assets/Scenes/ui animation Sample Scene.unity @@ -0,0 +1,1712 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 8 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 9 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFiltering: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &60103456 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 60103457} + - component: {fileID: 60103461} + - component: {fileID: 60103460} + - component: {fileID: 60103458} + m_Layer: 5 + m_Name: Helicopter grow effect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &60103457 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 60103456} + 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: 65850448} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &60103458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 60103456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 494ccccf65c01594b87c46d7e6a1f966, type: 3} + m_Name: + m_EditorClassIdentifier: + m_desiredScale: 1 + m_timeToReachDesiredScale: 2 + m_rotationSpeed: 5 + m_rotationAngle: 35 +--- !u!114 &60103460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 60103456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Helicopter Grow Effect +--- !u!222 &60103461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 60103456} +--- !u!1 &65850444 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 65850448} + - component: {fileID: 65850447} + - component: {fileID: 65850446} + - component: {fileID: 65850445} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &65850445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 65850444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &65850446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 65850444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &65850447 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 65850444} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &65850448 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 65850444} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1549637274} + - {fileID: 60103457} + - {fileID: 1326669243} + - {fileID: 647913274} + - {fileID: 1105015894} + - {fileID: 1170391614} + - {fileID: 862420478} + - {fileID: 1669247682} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &523868528 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 523868533} + - component: {fileID: 523868532} + - component: {fileID: 523868531} + - component: {fileID: 523868530} + - component: {fileID: 523868529} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &523868529 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 523868528} + m_Enabled: 1 +--- !u!124 &523868530 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 523868528} + m_Enabled: 1 +--- !u!92 &523868531 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 523868528} + m_Enabled: 1 +--- !u!20 &523868532 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 523868528} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &523868533 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 523868528} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &588481442 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 588481443} + - component: {fileID: 588481445} + - component: {fileID: 588481444} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &588481443 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588481442} + 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: 1669247682} + 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!114 &588481444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588481442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Next +--- !u!222 &588481445 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 588481442} +--- !u!1 &647913273 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 647913274} + - component: {fileID: 647913277} + - component: {fileID: 647913276} + - component: {fileID: 647913275} + m_Layer: 5 + m_Name: Lerp From Offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &647913274 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 647913273} + 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: 65850448} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &647913275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 647913273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8c268e33662234199c5b926b7dfd5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_effect: 4 + m_offsetDirection: {x: 100, y: 100, z: 0} + m_offsetDistance: 100 + m_timeToReachPosition: 1.5 + m_delayStart: 0 +--- !u!114 &647913276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 647913273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Lerp From Offset +--- !u!222 &647913277 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 647913273} +--- !u!1 &764075908 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 764075909} + - component: {fileID: 764075911} + - component: {fileID: 764075910} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &764075909 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 764075908} + 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: 1105015894} + 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!114 &764075910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 764075908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Next +--- !u!222 &764075911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 764075908} +--- !u!1 &862420474 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 862420478} + - component: {fileID: 862420477} + - component: {fileID: 862420476} + - component: {fileID: 862420475} + m_Layer: 5 + m_Name: ImageFadeToLerp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &862420475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 862420474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 862420476} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1326669242} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 647913273} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 862420474} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1669247681} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &862420476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 862420474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &862420477 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 862420474} +--- !u!224 &862420478 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 862420474} + 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: 1392838399} + m_Father: {fileID: 65850448} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 200, y: -200} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1105015893 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1105015894} + - component: {fileID: 1105015897} + - component: {fileID: 1105015896} + - component: {fileID: 1105015895} + m_Layer: 5 + m_Name: GrowEffectToHelicopter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1105015894 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1105015893} + 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: 764075909} + m_Father: {fileID: 65850448} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 200, y: -200} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1105015895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1105015893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1105015896} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1549637273} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 60103456} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1170391613} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1105015893} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1105015896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1105015893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &1105015897 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1105015893} +--- !u!1 &1170391613 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1170391614} + - component: {fileID: 1170391617} + - component: {fileID: 1170391616} + - component: {fileID: 1170391615} + m_Layer: 5 + m_Name: HelicopterToImageFade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1170391614 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1170391613} + 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: 1851853257} + m_Father: {fileID: 65850448} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 200, y: -200} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1170391615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1170391613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1170391616} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 60103456} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1326669242} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1170391613} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 862420474} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1170391616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1170391613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &1170391617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1170391613} +--- !u!1 &1326669242 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1326669243} + - component: {fileID: 1326669246} + - component: {fileID: 1326669245} + - component: {fileID: 1326669244} + m_Layer: 5 + m_Name: Image Fade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1326669243 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1326669242} + 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: 65850448} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1326669244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1326669242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b6641416af12354c82ba88e2c919780, type: 3} + m_Name: + m_EditorClassIdentifier: + m_timeToFade: 1.5 + m_delayTimeToStart: 0 + m_isFadingIn: 1 + m_doesHaveChildText: 0 +--- !u!114 &1326669245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1326669242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &1326669246 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1326669242} +--- !u!1 &1392838398 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1392838399} + - component: {fileID: 1392838401} + - component: {fileID: 1392838400} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1392838399 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1392838398} + 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: 862420478} + 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!114 &1392838400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1392838398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Next +--- !u!222 &1392838401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1392838398} +--- !u!1 &1453411760 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1453411762} + - component: {fileID: 1453411761} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1453411761 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1453411760} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + 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: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_FalloffTable: + m_Table[0]: 0 + m_Table[1]: 0 + m_Table[2]: 0 + m_Table[3]: 0 + m_Table[4]: 0 + m_Table[5]: 0 + m_Table[6]: 0 + m_Table[7]: 0 + m_Table[8]: 0 + m_Table[9]: 0 + m_Table[10]: 0 + m_Table[11]: 0 + m_Table[12]: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1453411762 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1453411760} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1549637273 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1549637274} + - component: {fileID: 1549637277} + - component: {fileID: 1549637276} + - component: {fileID: 1549637275} + m_Layer: 5 + m_Name: Grow Effect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1549637274 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1549637273} + 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: 65850448} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1549637275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1549637273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 130f33757f672504992a0c2e741afbba, type: 3} + m_Name: + m_EditorClassIdentifier: + m_desiredScale: 1 + m_timeToReachDesiredScale: 2 + m_timeToDelayStart: 0 + m_interpolationEffect: 1 +--- !u!114 &1549637276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1549637273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Grow Effect +--- !u!222 &1549637277 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1549637273} +--- !u!1 &1560749332 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1560749335} + - component: {fileID: 1560749334} + - component: {fileID: 1560749333} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1560749333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1560749332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1560749334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1560749332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &1560749335 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1560749332} + 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: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1669247681 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1669247682} + - component: {fileID: 1669247685} + - component: {fileID: 1669247684} + - component: {fileID: 1669247683} + m_Layer: 5 + m_Name: LerpToGrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1669247682 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1669247681} + 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: 588481443} + m_Father: {fileID: 65850448} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 200, y: -200} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1669247683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1669247681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1669247684} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 647913273} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1549637273} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 1669247681} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1105015893} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1669247684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1669247681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &1669247685 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1669247681} +--- !u!1 &1851853256 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1851853257} + - component: {fileID: 1851853259} + - component: {fileID: 1851853258} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1851853257 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1851853256} + 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: 1170391614} + 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!114 &1851853258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1851853256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Next +--- !u!222 &1851853259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1851853256} diff --git a/Assets/Scripts/UI/Animation/GrowEffect.cs b/Assets/Scripts/UI/Animation/GrowEffect.cs new file mode 100644 index 0000000..1f02171 --- /dev/null +++ b/Assets/Scripts/UI/Animation/GrowEffect.cs @@ -0,0 +1,70 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +/// +/// Script that when attached to an object will cause it to grow until it reaches the desired Scale +/// +public class GrowEffect : MonoBehaviour +{ + private enum Effect + { + BOUNCE_IN_OUT, + ELASTIC_IN_OUT, + LINEAR, + CIRCULAR_IN_OUT + } + + [Header("Configuration")] + [Tooltip("The desired scale to grow to")] + [SerializeField] float m_desiredScale = 1.0f; + [Tooltip("How much time it will take to reach the desired scale")] + [SerializeField] float m_timeToReachDesiredScale = 1.0f; + [Tooltip("How much time it takes before the grow effect starts")] + [SerializeField] float m_timeToDelayStart = 0.0f; + [Tooltip("Effect on the grow animation")] + [SerializeField] Effect m_interpolationEffect = Effect.ELASTIC_IN_OUT; + + //private member variables + private float m_currentTime = 0.0f; + + private void OnEnable() + { + //set the local scale to zero so it can grow + transform.localScale = Vector3.zero; + m_currentTime = 0.0f; + } + + void Update() + { + if (m_timeToDelayStart <= 0.0) + { + //increment current time by DT + m_currentTime += Time.deltaTime; + + if (!(m_currentTime > m_timeToReachDesiredScale)) + { + //Switch as to which effect will happen + switch (m_interpolationEffect) + { + case Effect.BOUNCE_IN_OUT: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.BounceInOut(m_currentTime / m_timeToReachDesiredScale))); + break; + case Effect.ELASTIC_IN_OUT: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.ElasticInOut(m_currentTime / m_timeToReachDesiredScale))); + break; + case Effect.LINEAR: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.Linear(m_currentTime / m_timeToReachDesiredScale))); + break; + case Effect.CIRCULAR_IN_OUT: + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.CircularInOut(m_currentTime / m_timeToReachDesiredScale))); + break; + } + } + } + else + { + //reduce the delay start by DT + m_timeToDelayStart -= Time.deltaTime; + } + } +} diff --git a/Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs b/Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs new file mode 100644 index 0000000..07b1323 --- /dev/null +++ b/Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HelicopterGrowEffect : MonoBehaviour +{ + [Header("Configuration")] + [Tooltip("The desired Scale to reach")] + [SerializeField] float m_desiredScale = 1.0f; + [Tooltip("How much time it will take to reach the desired scale")] + [SerializeField] float m_timeToReachDesiredScale = 1.0f; + [Tooltip("How fast the helicopter effect will spin")] + [SerializeField] float m_rotationSpeed = 2.0f; + [Tooltip("the angle of rotation per frame")] + [SerializeField] float m_rotationAngle = 10.0f; + + //private member variables + private float m_currentTime = 0.0f; + private Quaternion startingRotation = Quaternion.identity; + + private void OnEnable() + { + m_currentTime = 0.0f; + //set the base transform to 0 so it can grow + transform.localScale = Vector3.zero; + //set the staring rotation variable to the current rotation + startingRotation = transform.rotation; + + } + + void Update() + { + //increment current time by delta time + m_currentTime += Time.deltaTime; + if (m_currentTime <= m_timeToReachDesiredScale) + { + //rotate the object by the rotation angle and rotation speed + gameObject.transform.Rotate(Vector3.forward, (m_rotationAngle * (m_rotationSpeed * Time.deltaTime))); + //lerp the scale to the desired scale + gameObject.transform.localScale = (Vector3.one * Mathf.LerpUnclamped(0, m_desiredScale, Interpolation.ElasticInOut(m_currentTime/m_timeToReachDesiredScale))); + //leave the function + return; + } + else + { + //when the lerping is done set the rotation to the starting rotation + gameObject.transform.rotation = startingRotation; + //set the scale to the desired scale + gameObject.transform.localScale = Vector3.one * m_desiredScale; + } + } +} diff --git a/Assets/Scripts/UI/Animation/ImageFade.cs b/Assets/Scripts/UI/Animation/ImageFade.cs new file mode 100644 index 0000000..ee1a2ff --- /dev/null +++ b/Assets/Scripts/UI/Animation/ImageFade.cs @@ -0,0 +1,150 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +/// +/// Component that when attached to an Image will fade in or out based on isFadingIn +/// +[RequireComponent(typeof(Image))] +public class ImageFade : MonoBehaviour +{ + [Header("Configuration")] + [Tooltip("The Time it takes for the object to fade")] + [SerializeField] float m_timeToFade = 1.5f; + [Tooltip("The Time it takes before the object begins its fading")] + [SerializeField] float m_delayTimeToStart = 1.5f; + [Tooltip("Boolean to determing if the image is fading in or out")] + [SerializeField] bool m_isFadingIn = true; + [Tooltip("Boolean to determing if the image is a button or out")] + [SerializeField] bool m_doesHaveChildText = false; + + //Sibling Components + private Image m_image; + private Text m_text; + + //Member variables + private Color m_startColor; + private Color m_buttonTextStartColor; + private Color m_desiredEndColor; + private float m_timeElapsed = 0.0f; + + private void OnEnable() + { + m_timeElapsed = 0.0f; + GetSiblingComponents(); + //set the starting color to the color of the object + SetStartingColor(); + //Start the Fade Coroutine + StartCoroutine(Fade()); + } + + //Function that sets the image color value determined on if you want to fade in or out + private void SetStartingColor() + { + //start color is set to the images current color + m_startColor = m_image.color; + //create new varibles to be messed with later + Color modifiedColor = m_startColor; + Color modifiedTextColor = new Color(); + if (m_doesHaveChildText) + { + //if this had childed text component buttonTextStartcolor is set to the text's current color + m_buttonTextStartColor = m_text.color; + modifiedTextColor = m_buttonTextStartColor; + } + //sets the starting colors alpha values + if (m_isFadingIn) + { + //if it is fading in set alpha values to 0 + modifiedColor.a = 0.0f; + modifiedTextColor.a = 0.0f; + } + //Set the current colors to be the modified colors for fading + m_image.color = modifiedColor; + if (m_doesHaveChildText) + { + m_text.color = modifiedTextColor; + } + } + + /// + /// Gets the Required Sibling components + /// + private void GetSiblingComponents() + { + m_image = GetComponent(); + if (m_doesHaveChildText) + { + m_text = GetComponentInChildren(); + } + } + + /// + /// Coroutine that fades the Image by lerping the alpha from either 1-0 or 0-1 + /// + IEnumerator Fade() + { + //Wait for the delay + yield return new WaitForSeconds(m_delayTimeToStart); + //create new color + Color newColor = m_startColor; + Color newTextColor = new Color(); + if (m_doesHaveChildText) + { + newTextColor = m_text.color; + } + while (m_timeElapsed < m_timeToFade) + { + float time = m_timeElapsed / m_timeToFade; + if (m_isFadingIn) + { + //set new colors alpha to the lerp value of time + newColor.a = Mathf.Lerp(0, m_startColor.a, time); + if (m_doesHaveChildText) + { + newTextColor.a = Mathf.Lerp(0, m_buttonTextStartColor.a, time); + } + } + else + { + //set new colors alpha to the lerp value of time + newColor.a = Mathf.Lerp(m_startColor.a, 0, time); + if (m_doesHaveChildText) + { + newTextColor.a = Mathf.Lerp(m_buttonTextStartColor.a, 0, time); + } + } + //set image color to the new color + if (m_doesHaveChildText) + { + m_text.color = newTextColor; + } + m_image.color = newColor; + //add deltaTime to time elapsed + m_timeElapsed += Time.deltaTime; + yield return null; + } + //when the loop finishes set the colors to be what they are supposed to be + if (m_isFadingIn) + { + m_image.color = m_startColor; + if (m_doesHaveChildText) + { + m_text.color = m_buttonTextStartColor; + } + } + else + { + //if not is fading in set the alpha values to 0 + Color desiredColor = m_startColor; + desiredColor.a = 0.0f; + m_image.color = desiredColor; + if(m_doesHaveChildText) + { + desiredColor = m_buttonTextStartColor; + desiredColor.a = 0.0f; + m_text.color = desiredColor; + } + } + } +} diff --git a/Assets/Scripts/UI/Animation/LerpFromOffset.cs b/Assets/Scripts/UI/Animation/LerpFromOffset.cs new file mode 100644 index 0000000..80d74de --- /dev/null +++ b/Assets/Scripts/UI/Animation/LerpFromOffset.cs @@ -0,0 +1,108 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LerpFromOffset : MonoBehaviour +{ + /// + /// Effect Enum only to be used by this class, for chossing which interpolation effect to use + /// + private enum Effect + { + BOUNCE_OUT, + ELASTIC_OUT, + LINEAR, + CIRCULAR_OUT, + CIRCULAR_IN, + CIRCULAR_IN_OUT, + INVERSE_CIRCULAR_IN_OUT + } + + [Header("Configuration")] + [Tooltip("The The Effect you would like to happen")] + [SerializeField] Effect m_effect = Effect.LINEAR; + [Tooltip("The direction you want the object to lerp from")] + [SerializeField] Vector3 m_offsetDirection = Vector3.zero; + [Tooltip("The the distnace you want to multiply the direction by")] + [SerializeField] float m_offsetDistance = 1.0f; + [Tooltip("How much time it will take for the object to reach its original position")] + [SerializeField] float m_timeToReachPosition = 1.5f; + [Tooltip("How much time it will take to start moving")] + [SerializeField] float m_delayStart = 1.5f; + + + //Memeber variables + private Vector3 m_offset = Vector3.zero; + private Vector3 m_desiredPos = Vector3.zero; + private float m_currentTime = 0.0f; + + void OnEnable() + { + m_offset = Vector3.zero; + m_desiredPos = Vector3.zero; + m_currentTime = 0.0f; + + Setup(); + } + /// + /// Method that sets up all of the needed things and places the object at the calcuated offset + /// + void Setup() + { + //calculate offset position + m_offset = m_offsetDirection.normalized * m_offsetDistance; + //set the desired position to the current position + m_desiredPos = transform.position; + //move the object to the offset position to begin lerping + transform.position = m_desiredPos + m_offset; + } + + void Update() + { + if (m_delayStart <= 0.0f) + { + //add deltaTime to the current time + m_currentTime += Time.deltaTime; + if (m_currentTime < m_timeToReachPosition) + { + //based on which effect is selected this will lerp from the curretn position to the desired position + switch (m_effect) + { + //Lerps using the BouceOut Interpolation + case Effect.BOUNCE_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.BounceOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the ElasticOut Interpolation + case Effect.ELASTIC_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.ElasticOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the Linear Interpolation + case Effect.LINEAR: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.Linear(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the CircularOut Interpolation + case Effect.CIRCULAR_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.CircularOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the CircularInOut Interpolation + case Effect.CIRCULAR_IN_OUT: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.CircularInOut(m_currentTime / m_timeToReachPosition)); + break; + //Lerps using the CircularIn Interpolation + case Effect.CIRCULAR_IN: + transform.position = Vector3.LerpUnclamped(m_desiredPos + m_offset, m_desiredPos, Interpolation.SineIn(m_currentTime / m_timeToReachPosition)); + break; + } + + return; + } + //set the current position to the desired position + transform.position = m_desiredPos; + } + else + { + //remove Deltatime from the m_delayStart + m_delayStart -= Time.deltaTime; + } + } +} diff --git a/Assets/Scripts/UI/Animation/Shared/Interpolation.cs b/Assets/Scripts/UI/Animation/Shared/Interpolation.cs new file mode 100644 index 0000000..e441366 --- /dev/null +++ b/Assets/Scripts/UI/Animation/Shared/Interpolation.cs @@ -0,0 +1,220 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Methods that make LERPs nice +/// +static public class Interpolation +{ + + static public float Linear(float t) + { + return t; + } + + static public float SmoothStep(float t) + { + return t * t * (3.0f - 2.0f * t); + } + + static public float SmootherStep(float t) + { + return t * t * t * (t * (6.0f * t - 15.0f) + 10.0f); + } + + static public float SineIn(float t) + { + return Mathf.Sin((t - 1.0f) * Mathf.PI * 0.5f) + 1.0f; + } + + static public float SineOut(float t) + { + return Mathf.Sin(t * Mathf.PI * 0.5f); + } + + static public float SineInOut(float t) + { + return (1.0f - Mathf.Cos(t * Mathf.PI)) * 0.5f; + } + + static public float QuadraticIn(float t) + { + return t * t; + } + + static public float QuadraticOut(float t) + { + return -(t * (t - 2.0f)); + } + + static public float QuadraticInOut(float t) + { + return (t < 0.5f) ? 2.0f * (t * t) : (-2.0f * t * t) + (4 * t) - 1; + } + + static public float CubicIn(float t) + { + return Mathf.Pow(t, 3); + } + + static public float CubicOut(float t) + { + return 1.0f - Mathf.Pow(1.0f - t, 3); + } + + static public float CubicInOut(float t) + { + return (t < 0.5f) ? Mathf.Pow(t * 2.0f, 3) * 0.5f : 1.0f - Mathf.Pow((1.0f - t) * 2.0f, 3) * 0.5f; + } + + static public float QuarticIn(float t) + { + return Mathf.Pow(t, 4); + } + + static public float QuarticOut(float t) + { + return 1.0f - Mathf.Pow(1.0f - t, 4); + } + + static public float QuarticInOut(float t) + { + return (t < 0.5f) ? Mathf.Pow(t * 2.0f, 4) * 0.5f : 1.0f - Mathf.Pow((1.0f - t) * 2.0f, 4) * 0.5f; + } + + static public float QuinticIn(float t) + { + return Mathf.Pow(t, 5); + } + + static public float QuinticOut(float t) + { + return 1.0f - Mathf.Pow(1.0f - t, 5); + } + + static public float QuinticInOut(float t) + { + return (t < 0.5f) ? Mathf.Pow(t * 2.0f, 5) * 0.5f : 1.0f - Mathf.Pow((1.0f - t) * 2.0f, 5) * 0.5f; + } + + static public float CircularIn(float t) + { + return 1.0f - Mathf.Sqrt(1.0f - (t * t)); + } + + static public float CircularOut(float t) + { + return Mathf.Sqrt((2.0f - t) * t); + } + + static public float CircularInOut(float t) + { + return (t < 0.5f) ? (1.0f - Mathf.Sqrt(1.0f - 4.0f * (t * t ))) * 0.5f : (Mathf.Sqrt(-((t * 2.0f) - 3.0f) * ((t * 2.0f) - 1.0f)) + 1.0f) * 0.5f; + } + + static public float ExpoIn(float t) + { + return (t == 0.0f) ? 0.0f : Mathf.Pow(2, 10.0f * (t - 1.0f)); + } + + static public float ExpoOut(float t) + { + return (t == 1.0f) ? 1.0f : 1.0f - Mathf.Pow(2, -10.0f * t); + } + + static public float ExpoInOut(float t) + { + if (t == 0.0f || t == 1.0f) return t; + + t = t * 2.0f; + if (t < 1.0f) + { + return Mathf.Pow(1024.0f, t - 1.0f) * 0.5f; + } + + return (-Mathf.Pow(2.0f, -10.0f * (t - 1.0f)) + 2.0f) * 0.5f; + } + + static public float BackIn(float t) + { + float s = 1.70158f; + + return t * t * ((s + 1.0f) * t - s); + } + + static public float BackOut(float t) + { + float s = 1.70158f; + + t = (t - 1.0f); + return t * t * ((s + 1.0f) * t + s) + 1.0f; + } + + static public float BackInOut(float t) + { + float s = 1.70158f * 1.525f; + + t = t * 2.0f; + if (t < 1.0f) + { + return (t * t * ((s + 1.0f) * t - s)) * 0.5f; + } + + t = t - 2.0f; + return (t * t * ((s + 1.0f) * t + s) + 2.0f) * 0.5f; + } + + static public float BounceIn(float t) + { + return 1.0f - BounceOut(1.0f - t); + } + + static public float BounceOut(float t) + { + if (t < (1.0f / 2.75f)) return 7.5625f * t * t; + else if (t < (2.0f / 2.75f)) return 7.5625f * (t -= (1.5f / 2.75f)) * t + 0.75f; + else if (t < (2.5f / 2.75f)) return 7.5625f * (t -= (2.25f / 2.75f)) * t + 0.9375f; + + return 7.5625f * (t -= (2.625f / 2.75f)) * t + 0.984375f; + } + + static public float BounceInOut(float t) + { + if (t < 0.5f) return BounceIn(t * 2.0f) * 0.5f; + + return BounceOut(t * 2.0f - 1.0f) * 0.5f + 0.5f; + } + + static public float ElasticIn(float t) + { + if (t == 0.0f || t == 1.0f) return t; + + return -Mathf.Pow(2.0f, 10.0f * (t - 1.0f)) * Mathf.Sin((t - 1.1f) * 5.0f * Mathf.PI); + } + + static public float ElasticOut(float t) + { + if (t == 0.0f || t == 1.0f) return t; + + return Mathf.Pow(2.0f, -10.0f * t) * Mathf.Sin((t - 0.1f) * 5.0f * Mathf.PI) + 1.0f; + } + + static public float ElasticInOut(float t) + { + if (t == 0.0f || t == 1.0f) return t; + + t = t * 2.0f; + if (t < 1.0f) + { + return Mathf.Pow(2, 10.0f * (t - 1)) * Mathf.Sin((t - 1.1f) * 5.0f * Mathf.PI) * -0.5f; + } + + return (Mathf.Pow(2.0f, -10.0f * (t - 1)) * Mathf.Sin((t - 1.1f) * 5.0f * Mathf.PI) * 0.5f) + 1.0f; + } + + static public float CatmullRom(float t, float p0, float p1, float p2, float p3) + { + return 0.5f * ((2.0f * p1) + (-p0 + p2) * t + (2.0f * p0 - 5.0f * p1 + 4.0f * p2 - p3) * t * t + (-p0 + 3.0f * p1 - 3.0f * p2 + p3) * t * t * t); + } +} From 2feb99004b2a9a734c75ddbfb80afd65647b320c Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 21 Sep 2019 10:18:29 +0300 Subject: [PATCH 024/120] Create VerticalCameraDistanceFade.shader --- .../3D/Fade/VerticalCameraDistanceFade.shader | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 Assets/Shaders/3D/Fade/VerticalCameraDistanceFade.shader diff --git a/Assets/Shaders/3D/Fade/VerticalCameraDistanceFade.shader b/Assets/Shaders/3D/Fade/VerticalCameraDistanceFade.shader new file mode 100644 index 0000000..822bf7c --- /dev/null +++ b/Assets/Shaders/3D/Fade/VerticalCameraDistanceFade.shader @@ -0,0 +1,127 @@ +// similar to height fog effect, but starts fading from camera.Y distance (with some offset) +// modified standard shader, with custom lighting pass to make faded part completely black + +Shader "UnityLibrary/Standard/Fade/VerticalCameraDistance" +{ + Properties + { + _Color("Color", Color) = (1,1,1,1) + _MainTex("Albedo (RGB)", 2D) = "white" {} + //_BumpMap("Normalmap", 2D) = "bump" {} + _Glossiness("Smoothness", Range(0,1)) = 0.5 + _Metallic("Metallic", Range(0,1)) = 0.0 + _FadeToColor("FadeToColor", Color) = (0,0,0,1) + _FadeStartY("FadeStartFromCameraY", Float) = -2 + _FadeEndY("FadeEndFromCameraY", Float) = -4 + } + + SubShader + { + Tags { "RenderType" = "Opaque" } + LOD 200 + + CGPROGRAM + +// #pragma surface surf Standard fullforwardshadows vertex:vert + #pragma surface surf Custom fullforwardshadows // vertex:vert + #include "UnityPBSLighting.cginc" + + struct appdata { + float4 vertex : POSITION; + float4 tangent : TANGENT; + float3 normal : NORMAL; + float2 texcoord : TEXCOORD0; + float2 texcoord1 : TEXCOORD1; + float2 texcoord2 : TEXCOORD2; + }; + + struct Input { + float2 uv_MainTex; + //float2 uv_BumpMap; + float3 worldPos; + }; + + // Metallic workflow + // modified from UnityPBSLighting.cginc + struct SurfaceOutputStandardCustom + { + fixed3 Albedo; // base (diffuse or specular) color + float3 Normal; // tangent space normal, if written + half3 Emission; + half Metallic; // 0=non-metal, 1=metal + half Smoothness; // 0=rough, 1=smooth + half Occlusion; // occlusion (default 1) + fixed Alpha; // alpha for transparencies + float Fader; // test + }; + + sampler2D _MainTex; + //sampler2D _BumpMap; + + half _Glossiness; + half _Metallic; + fixed4 _Color; + fixed4 _FadeToColor; + float _FadeStartY; + float _FadeEndY; + + float remap(float source, float sourceFrom, float sourceTo, float targetFrom, float targetTo) + { + return targetFrom + (source - sourceFrom)*(targetTo - targetFrom) / (sourceTo - sourceFrom); + } + + // from UnityPBSLighting.cginc + inline half4 LightingCustom(SurfaceOutputStandardCustom s, float3 viewDir, UnityGI gi) + { + s.Normal = normalize(s.Normal); + + half oneMinusReflectivity; + half3 specColor; + s.Albedo = DiffuseAndSpecularFromMetallic(s.Albedo, s.Metallic, /*out*/ specColor, /*out*/ oneMinusReflectivity); + + // shader relies on pre-multiply alpha-blend (_SrcBlend = One, _DstBlend = OneMinusSrcAlpha) + // this is necessary to handle transparency in physically correct way - only diffuse component gets affected by alpha + half outputAlpha; + s.Albedo = PreMultiplyAlpha(s.Albedo, s.Alpha, oneMinusReflectivity, /*out*/ outputAlpha); + + half4 c = UNITY_BRDF_PBS(s.Albedo, specColor, oneMinusReflectivity, s.Smoothness, s.Normal, viewDir, gi.light, gi.indirect); + c.a = outputAlpha; + + // make it black if outside range + return c*(1 - s.Fader); + } + + inline void LightingCustom_GI(SurfaceOutputStandardCustom s,UnityGIInput data,inout UnityGI gi) + { + #if defined(UNITY_PASS_DEFERRED) && UNITY_ENABLE_REFLECTION_BUFFERS + gi = UnityGlobalIllumination(data, s.Occlusion, s.Normal); + #else + Unity_GlossyEnvironmentData g = UnityGlossyEnvironmentSetup(s.Smoothness, data.worldViewDir, s.Normal, lerp(unity_ColorSpaceDielectricSpec.rgb, s.Albedo, s.Metallic)); + gi = UnityGlobalIllumination(data, s.Occlusion, s.Normal, g); + #endif + } + + void surf(Input IN, inout SurfaceOutputStandardCustom o) + { + fixed4 c = tex2D(_MainTex, IN.uv_MainTex) * _Color; + + // fade + float fadeStartY = _WorldSpaceCameraPos.y + _FadeStartY; + float fadeEndY = _WorldSpaceCameraPos.y + _FadeEndY; + float pixelY = clamp(IN.worldPos.y, fadeEndY, fadeStartY); + float distanceY = remap(pixelY, fadeStartY, fadeEndY, 0, 1); + c.rgb = lerp(c.rgb, _FadeToColor, distanceY); + + o.Fader = distanceY; + o.Albedo = c.rgb; + // Metallic and smoothness come from slider variables + o.Metallic = _Metallic; + o.Smoothness = _Glossiness; + //o.Normal = UnpackNormal(tex2D(_BumpMap, IN.uv_BumpMap)); + o.Alpha = c.a; + + } + ENDCG + } + FallBack "Diffuse" +} From f22e6caf9a46e3ec600273ac853d3b03db31a153 Mon Sep 17 00:00:00 2001 From: mika Date: Mon, 30 Sep 2019 19:03:59 +0300 Subject: [PATCH 025/120] rename Fade folder to Effects, add seethrough wall shader --- .../Effects/Standard-SeeThroughWalls.shader | 116 ++++++++++++++++++ .../VerticalCameraDistanceFade.shader | 2 +- 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader rename Assets/Shaders/3D/{Fade => Effects}/VerticalCameraDistanceFade.shader (98%) diff --git a/Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader b/Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader new file mode 100644 index 0000000..e519887 --- /dev/null +++ b/Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader @@ -0,0 +1,116 @@ +// 2 pass shader to draw object with blurry texture and slightly transparent when behind walls + +Shader "UnityLibrary/Standard/Effects/SeeThroughWalls" +{ + Properties + { + _Color("Color", Color) = (1,1,1,1) + _MainTex("Albedo (RGB)", 2D) = "white" {} + _Glossiness("Smoothness", Range(0,1)) = 0.5 + _Metallic("Metallic", Range(0,1)) = 0.0 + _BlurSize("BlurSize", float) = 10 + _SeeThroughOpacity("SeeThroughOpacityAdjust", Range(0,1)) = 0.5 + } + + SubShader + { + // Regular Pass + Tags { "RenderType" = "Opaque" } + LOD 200 + + CGPROGRAM + // Physically based Standard lighting model, and enable shadows on all light types + #pragma surface surf Standard fullforwardshadows + + // Use shader model 3.0 target, to get nicer looking lighting + #pragma target 3.0 + + sampler2D _MainTex; + + struct Input + { + float2 uv_MainTex; + }; + + half _Glossiness; + half _Metallic; + fixed4 _Color; + + // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader. + // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing. + // #pragma instancing_options assumeuniformscaling + UNITY_INSTANCING_BUFFER_START(Props) + // put more per-instance properties here + UNITY_INSTANCING_BUFFER_END(Props) + + void surf(Input IN, inout SurfaceOutputStandard o) + { + // Albedo comes from a texture tinted by color + fixed4 c = tex2D(_MainTex, IN.uv_MainTex) * _Color; + o.Albedo = c.rgb; + // Metallic and smoothness come from slider variables + o.Metallic = _Metallic; + o.Smoothness = _Glossiness; + o.Alpha = c.a; + } + ENDCG + + // see through pass + + Tags{ "Queue" = "Transparent" "RenderType" = "Transparent" } + LOD 200 +// Blend OneMinusDstColor One // Soft Additive + Blend SrcAlpha OneMinusSrcAlpha // Traditional transparency +// Blend One OneMinusSrcAlpha // Premultiplied transparency +// Blend One One // Additive +// Blend OneMinusDstColor One // Soft Additive +// Blend DstColor Zero // Multiplicative +// Blend DstColor SrcColor // 2x Multiplicative + + ZWrite Off + ZTest Greater + + CGPROGRAM + // Physically based Standard lighting model, and enable shadows on all light types + #pragma surface surf Standard alpha:fade + + // Use shader model 3.0 target, to get nicer looking lighting + #pragma target 3.0 + + sampler2D _MainTex; + float4 _MainTex_TexelSize; + float _BlurSize; + float _SeeThroughOpacity; + + struct Input + { + float2 uv_MainTex; + }; + + half _Glossiness; + half _Metallic; + fixed4 _Color; + + UNITY_INSTANCING_BUFFER_START(Props) + // put more per-instance properties here + UNITY_INSTANCING_BUFFER_END(Props) + + void surf(Input IN, inout SurfaceOutputStandard o) + { + // small blur effect on the texture + fixed4 cR = tex2D(_MainTex, float2(IN.uv_MainTex.x + _MainTex_TexelSize.x * _BlurSize,IN.uv_MainTex.y)); + fixed4 cL = tex2D(_MainTex, float2(IN.uv_MainTex.x - _MainTex_TexelSize.x * _BlurSize,IN.uv_MainTex.y)); + fixed4 cT = tex2D(_MainTex, float2(IN.uv_MainTex.x,IN.uv_MainTex.y + _MainTex_TexelSize.y * _BlurSize)); + fixed4 cB = tex2D(_MainTex, float2(IN.uv_MainTex.x,IN.uv_MainTex.y - _MainTex_TexelSize.y * _BlurSize)); + fixed4 c = (cR + cL + cT + cB) * 0.25; + o.Albedo = c; + o.Metallic = _Metallic; + o.Smoothness = _Glossiness; + // make object also bit transparent + o.Alpha = c.a* _SeeThroughOpacity; + } + ENDCG + + } // subshader + FallBack "Diffuse" +} // shader diff --git a/Assets/Shaders/3D/Fade/VerticalCameraDistanceFade.shader b/Assets/Shaders/3D/Effects/VerticalCameraDistanceFade.shader similarity index 98% rename from Assets/Shaders/3D/Fade/VerticalCameraDistanceFade.shader rename to Assets/Shaders/3D/Effects/VerticalCameraDistanceFade.shader index 822bf7c..6b8dbb7 100644 --- a/Assets/Shaders/3D/Fade/VerticalCameraDistanceFade.shader +++ b/Assets/Shaders/3D/Effects/VerticalCameraDistanceFade.shader @@ -1,7 +1,7 @@ // similar to height fog effect, but starts fading from camera.Y distance (with some offset) // modified standard shader, with custom lighting pass to make faded part completely black -Shader "UnityLibrary/Standard/Fade/VerticalCameraDistance" +Shader "UnityLibrary/Standard/Effects/VerticalCameraDistance" { Properties { From 8727b14e2b38307fb89f48e688d93ec16f7c6276 Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 1 Oct 2019 17:12:14 +0300 Subject: [PATCH 026/120] Create RayMarching.shader --- Assets/Shaders/2D/Special/RayMarching.shader | 108 +++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 Assets/Shaders/2D/Special/RayMarching.shader diff --git a/Assets/Shaders/2D/Special/RayMarching.shader b/Assets/Shaders/2D/Special/RayMarching.shader new file mode 100644 index 0000000..fa70a89 --- /dev/null +++ b/Assets/Shaders/2D/Special/RayMarching.shader @@ -0,0 +1,108 @@ +// "ShaderToy Tutorial - Ray Marching for Dummies!" https://www.shadertoy.com/view/XlGBW3 +// by Martijn Steinrucken aka BigWings/CountFrolic - 2018 +// License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. +// This shader is part of a tutorial on YouTube https://youtu.be/PGtv-dBi2wE +// 01-10-2019 converted to unity shader (with some adjusted variable names) : unitycoder.com + +Shader "UnityLibrary/2D/Special/RayMarching" +{ + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #define MAX_STEPS 100 // maximum raycast loops + #define MAX_DIST 100. // ray cannot go further than this distance + #define SURF_DIST .01 // how near to surface we should raycast to + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + float2 uv : TEXCOORD0; + }; + + // returns distance to the scene objects (we have 2 objects here, sphere and ground plane) + float GetDist(float3 p) + { + float4 sphere = float4(0, 1, 6, 1); // x,y,z,radius + float sphereDist = length(p - sphere.xyz) - sphere.w; + float planeDist = p.y; + float distance = min(sphereDist, planeDist); // return closest distance + return distance; + } + + + // jump along the ray until we get close enough to some of our objects + float RayMarch(float3 rayOrigin, float3 rayDirection) + { + float distanceOrigin = 0.; + for (int i = 0; i < MAX_STEPS; i++) + { + float3 p = rayOrigin + rayDirection * distanceOrigin; + float dS = GetDist(p); + distanceOrigin += dS; + if (distanceOrigin > MAX_DIST || dS < SURF_DIST) break; + } + return distanceOrigin; + } + + float3 GetNormal(float3 p) + { + float d = GetDist(p); + float2 e = float2(.01, 0); + float3 n = d - float3(GetDist(p - e.xyy),GetDist(p - e.yxy),GetDist(p - e.yyx)); + return normalize(n); + } + + float GetLight(float3 p) + { + float3 lightPos = float3(0, 5, 6); + lightPos.xz += float2(sin(_Time.y), cos(_Time.y)) * 2.0; + float3 l = normalize(lightPos - p); + float3 n = GetNormal(p); + float dif = clamp(dot(n, l), 0.0, 1.0); + float d = RayMarch(p + n * SURF_DIST * 2.0, l); + if (d < length(lightPos - p)) dif *= 0.1; + return dif; + } + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + float2 uv = (i.uv - 0.5); + float3 col = float3(0,0,0); + + float3 rayOrigin = float3(0,1,0); + float3 rayDirection = normalize(float3(uv.x, uv.y, 1)); + + float distance = RayMarch(rayOrigin, rayDirection); + float3 p = rayOrigin + rayDirection * distance; + + float dif = GetLight(p); + col = float3(dif,dif,dif); + + return float4(col,1); + } + ENDCG + } // pass + } // subshader +} // shader From af94bc209bbdd1d8449a98f74d21b78ea13da468 Mon Sep 17 00:00:00 2001 From: Abhilash Majumder <30946547+abhilash1910@users.noreply.github.com> Date: Mon, 14 Oct 2019 21:39:12 +0530 Subject: [PATCH 027/120] Reverse Disintegration effect by Reverse transparency The unlit shader when use along with particle effects produces a Reverse disintegration effect using transparency . --- .../3D/Unlit/Reverse-DisIntegrate-Shader | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader diff --git a/Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader b/Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader new file mode 100644 index 0000000..6bcbf0e --- /dev/null +++ b/Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader @@ -0,0 +1,76 @@ +Shader "Unlit/Reverse_Disintegrate" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + _color("Color",color)=(1,1,1,1) + _Transparent("Transparency",float)=0.0 + + } + SubShader + { + Tags {"Queue"="Transparent" "RenderType"="Transparent"} + LOD 100 + ZWrite Off + Blend SrcAlpha OneMinusSrcAlpha + + Lighting Off + ColorMask RGB + + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + // make fog work + #pragma multi_compile_fog + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + +sampler2D _MainTex; +float4 _color; +float _Transparent; + struct v2f + { + float2 uv : TEXCOORD0; + UNITY_FOG_COORDS(1) + float4 vertex : SV_POSITION; + }; + + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + UNITY_TRANSFER_FOG(o,o.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + // sample the texture + fixed4 col = tex2D(_MainTex, i.uv)*_color ; + + + _Transparent=_Transparent*(_Time.y*5000); + if(_Transparent<8) + { + col.a=_Transparent; + } + + // apply fog + UNITY_APPLY_FOG(i.fogCoord, col); + return col; + } + ENDCG + } + } +} From a98a9cee3b0f3b5d58add92f2cc01a9a3a88481e Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 28 Dec 2019 18:21:07 +0200 Subject: [PATCH 028/120] Create MarrtsSmoothedMouseLook.cs --- .../Scripts/Camera/MarrtsSmoothedMouseLook.cs | 208 ++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs diff --git a/Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs b/Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs new file mode 100644 index 0000000..c10daf6 --- /dev/null +++ b/Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs @@ -0,0 +1,208 @@ +using UnityEngine; + +//Marrt's simplest Mouselook for https://forum.unity.com/threads/a-free-simple-smooth-mouselook.73117/page-2#post-4652755 + +namespace UnityLibrary +{ + public class MarrtsSmoothedMouseLook : MonoBehaviour + { + [Header("CameraTransform")] + public Transform targetTrans; + [Header("On/Off & Settings")] + public bool inputActive = true; + public bool controlCursor = false; + [Header("Smoothing")] + public bool byPassSmoothing = false; + public float mLambda = 20F; //higher = less latency but also less smoothing + [Header("Sensitivity")] + public float hSens = 4F; + public float vSens = 4F; + public BufferV2 mouseBuffer = new BufferV2(); + + public enum AxisClampMode { None, Hard, Soft } + + [Header("Restricting Look")] + + public AxisClampMode pitchClamp = AxisClampMode.Soft; + [Range(-180F,180F)] public float pMin = -80F; + [Range(-180F,180F)] public float pMax = 80F; + + + [Header("Yaw should be left None, Message me if you really need this functionality")] + + public AxisClampMode yawClamp = AxisClampMode.None; + [Range(-180F,180F)] public float yMin = -140F; + [Range(-180F,180F)] public float yMax = 140F; + + + + //public bool smoothingDependence = Timescale Framerate + + void Update () + { + //if(Input.GetKeyDown(KeyCode.Space)){inputActive = !inputActive;} + if(controlCursor){ //Cursor Control + if( inputActive && Cursor.lockState != CursorLockMode.Locked) { Cursor.lockState = CursorLockMode.Locked; } + if( !inputActive && Cursor.lockState != CursorLockMode.None) { Cursor.lockState = CursorLockMode.None; } + } + if(!inputActive){ return; } //active? + + //Update input + UpdateMouseBuffer(); + targetTrans.rotation = Quaternion.Euler( mouseBuffer.curAbs ); + } + + //consider late Update for applying the rotation if your game needs it (e.g. if camera parents are rotated in Update for some reason) + void LateUpdate() {} + + private void UpdateMouseBuffer() + { + + float rawPitchDelta = vSens * -Input.GetAxisRaw("Mouse Y"); + + switch(pitchClamp){ + case AxisClampMode.None: mouseBuffer.target.x += rawPitchDelta; break; + case AxisClampMode.Hard: mouseBuffer.target.x = Mathf.Clamp(mouseBuffer.target.x +rawPitchDelta, pMin, pMax); break; + case AxisClampMode.Soft: mouseBuffer.target.x += SoftPitchClamping.DeltaMod( mouseBuffer.target.x, rawPitchDelta, Mathf.Abs(pMax*0.5F), Mathf.Abs(pMax) ); break; //symetric clamping only for now, max is used + } + + float rawYawDelta = hSens * Input.GetAxisRaw("Mouse X"); + + switch(yawClamp){ + case AxisClampMode.None: mouseBuffer.target.y += rawYawDelta; break; + case AxisClampMode.Hard: mouseBuffer.target.y = Mathf.Clamp(mouseBuffer.target.y +rawYawDelta, yMin, yMax); break; + case AxisClampMode.Soft: Debug.LogWarning("SoftYaw clamp should be implemented with Quaternions to work in every situation"); + mouseBuffer.target.y += SoftPitchClamping.DeltaMod( mouseBuffer.target.y, rawYawDelta, Mathf.Abs(yMax*0.5F), Mathf.Abs(yMax) ); + break; + } + + mouseBuffer.Update( mLambda, Time.deltaTime, byPassSmoothing ); + } + } + + + + + + #region Helpers + [System.Serializable] + public class BufferV2{ + + public BufferV2(){ + this.target = Vector2.zero; + this.buffer = Vector2.zero; + } + public BufferV2( Vector2 targetInit, Vector2 bufferInit ) { + this.target = targetInit; + this.buffer = bufferInit; + } + + /*private*/public Vector2 target; + /*private*/public Vector2 buffer; + + public Vector2 curDelta; //Delta: apply difference from lastBuffer state to current BufferState //get difference between last and new buffer + public Vector2 curAbs; //absolute + + + + /// Update Buffer By supplying new target + public void UpdateByNewTarget( Vector2 newTarget, float dampLambda, float deltaTime ){ + this.target = newTarget; + Update(dampLambda, deltaTime); + } + /// Update Buffer By supplying the rawDelta to the last target + public void UpdateByDelta( Vector2 rawDelta, float dampLambda, float deltaTime ){ + this.target = this.target +rawDelta; //update Target + Update(dampLambda, deltaTime); + } + + /// Update Buffer + public void Update( float dampLambda, float deltaTime, bool byPass = false ){ + Vector2 last = buffer; //last state of Buffer + this.buffer = byPass? target : DampToTargetLambda( buffer, this.target, dampLambda, deltaTime); //damp current to target + this.curDelta = buffer -last; + this.curAbs = buffer; + } + public static Vector2 DampToTargetLambda( Vector2 current, Vector2 target, float lambda, float dt){ + return Vector2. Lerp(current, target, 1F -Mathf.Exp( -lambda *dt) ); + } + } + + + + + public static class SoftPitchClamping{ + public static float DeltaMod( float currentPitch, float delta, float softMax = 45F, float hardMax = 85F ){ + + //doesnt work for input above 90F pitch, unity might invert roll and decrease pitch again + + //transform into -180 to 180 range (allowed input range = 0-360F ) + float wrapped = Wrap.Float( currentPitch, -180F, 180F ); + + float sign = Mathf.Sign( wrapped ); + float absolute = Mathf.Abs ( wrapped ); + + // treat current as mapped value, so unmap it via reversing + // https://rechneronline.de/function-graphs/ + // revert remap: e^((((log(x/45)+1)*45)/45)-1)*45 + // remap: (log(x/45)+1)*45 + + float remapped = absolute; + if( absolute > softMax ){ + // e^ (( (( log( x/45 )+1 )*45 ) /45 ) -1 )*45 + // remapped = Mathf.Exp(( (( Mathf.Log(remapped/softMax)+1F )*softMax ) /softMax) -1F)*softMax ; + remapped = Mathf.Exp(( remapped /softMax) -1F)*softMax ; + //x*0.5+45*0.5 + } + + //apply delta to unmapped, sign needs to be taken into consideration for delta + remapped += (delta *sign); //float raw = remapped +(delta *sign); + + //remap, only needed if exceeding softrange + if( remapped > softMax ){ + // (( log( x/45 )+1 )*45 ) + remapped = (( Mathf.Log(remapped/softMax)+1F )*softMax ); + + //x*0.5+45*0.5 + + } + + remapped *= sign; + remapped = Mathf.Clamp( remapped, -hardMax, +hardMax); + + float newDelta = ( remapped -wrapped ); + + //print( "wrapped\t"+wrapped+" (from:"+currentPitch+")"+"\nremapped\t"+remapped +" (raw :"+raw+")"); + + return newDelta; + // return delta; + } + + public static class Wrap{ + + //can be used to clamp angles from 0-360 to 0-180 by feeding (value,-180,180) + //https://stackoverflow.com/questions/1628386/normalise-orientation-between-0-and-360 + + //Normalizes any number to an arbitrary range + //by assuming the range wraps around when going below min or above max + public static float Float( float value, float start, float end ){ + float width = end - start ; // + float offsetValue = value - start ; // value relative to 0 + + return ( offsetValue - ( Mathf.Floor( offsetValue / width ) * width ) ) + start ; + // + start to reset back to start of original range + } + + //Normalizes any number to an arbitrary range + //by assuming the range wraps around when going below min or above max + public static int Int( int value, int start, int end ){ + int width = end - start ; // + int offsetValue = value - start ; // value relative to 0 + + return ( offsetValue - ( ( offsetValue / width ) * width ) ) + start ; + // + start to reset back to start of original range + } + } + } + #endregion Helpers +} From 27fac36a6e8e1a5b9ceeec6e725cde9bf01822e0 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 13 Feb 2020 10:38:43 +0200 Subject: [PATCH 029/120] Create WaterBox.shader --- Assets/Shaders/3D/Water/WaterBox.shader | 89 +++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 Assets/Shaders/3D/Water/WaterBox.shader diff --git a/Assets/Shaders/3D/Water/WaterBox.shader b/Assets/Shaders/3D/Water/WaterBox.shader new file mode 100644 index 0000000..ce38468 --- /dev/null +++ b/Assets/Shaders/3D/Water/WaterBox.shader @@ -0,0 +1,89 @@ +// water waves on a single mesh box +// single mesh approach. It's a single 64x64x1 unit box with 128x128 divisions. +// The shader is checking if the starting y for the vertex is >0.5 before it modifies the position, +// and checking the normal is facing up before modifying that +// source: @bgolus https://forum.unity.com/threads/intersect-box-with-wave-plane.826761/#post-5475174 + +Shader "Custom/WaterBox" +{ + Properties + { + _Color ("Color", Color) = (1,1,1,1) + _Color2 ("Color 2", Color) = (1,1,1,1) + _Glossiness ("Smoothness", Range(0,1)) = 0.5 + } + SubShader + { + Tags { "Queue"="Transparent" "RenderType"="Transparent" } + LOD 200 + + CGINCLUDE + struct Input + { + float h; + }; + + half _Glossiness; + fixed4 _Color, _Color2; + + void waves(inout appdata_full v, inout Input IN) + { + IN.h = 0.0; + + float s0x, c0x, s1x, c1x; + float s0y, c0y, s1y, c1y; + sincos(v.vertex.x * 0.6 + _Time.y + v.vertex.z * 0.1, s0x, c0x); + sincos(v.vertex.z * 0.5 + _Time.y * 2.0 + v.vertex.x * 0.1, s0y, c0y); + sincos(v.vertex.x * 0.3 + _Time.y - v.vertex.z * 0.1, s1x, c1x); + sincos(v.vertex.z * 0.21 + _Time.y * 2.0 - v.vertex.x * 0.1, s1y, c1y); + + float offset = (s0x + s0y) * 0.15 + (s1x + s1y) * 1.0 + 1.5; + if (v.vertex.y > 0.5) + { + v.vertex.y += offset; + IN.h = 0.0; + if (v.normal.y > 0.7) + { + v.normal = normalize(v.normal + float3(c0y * 0.15 + c1y * 0.3, 0.0, c0x * 0.15 + c1x * 0.3)); + } + } + else + { + IN.h = offset + 1.0; + } + } + + void surf (Input IN, inout SurfaceOutputStandard o) + { + fixed4 color = lerp(_Color2, _Color, smoothstep(1.5, 0.0, pow(IN.h, 0.5))); + o.Albedo = color.rgb; + o.Metallic = 0; + o.Smoothness = _Glossiness; + o.Alpha = color.a; + } + ENDCG + + Cull Front + CGPROGRAM + #pragma surface surf Standard alpha:premul vertex:vert + #pragma target 3.0 + + void vert(inout appdata_full v, out Input IN) + { + waves(v, IN); + v.normal = -v.normal; + } + ENDCG + + Cull Back + CGPROGRAM + #pragma surface surf Standard alpha:premul vertex:vert + #pragma target 3.0 + + void vert(inout appdata_full v, out Input IN) + { + waves(v, IN); + } + ENDCG + } +} From 445ced13d4f655be74047b59ee6f389b40ef16a7 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 13 Feb 2020 14:08:00 +0200 Subject: [PATCH 030/120] Create ReferenceImageViewer.cs --- .../Editor/Tools/ReferenceImageViewer.cs | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs diff --git a/Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs b/Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs new file mode 100644 index 0000000..d61518e --- /dev/null +++ b/Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs @@ -0,0 +1,61 @@ +// simple image viewer inside unity editor +// use case: to keep reference image visible while working in single monitor + +using UnityEngine; +using UnityEditor; + +namespace UnityLibrary +{ + public class ReferenceImageViewer : EditorWindow + { + Texture2D tex; + bool keepAspectRatio = false; + + [MenuItem("Window/Tools/Reference Image Viewer")] + static void Init() + { + ReferenceImageViewer window = (ReferenceImageViewer)EditorWindow.GetWindow(typeof(ReferenceImageViewer)); + window.titleContent = new GUIContent("ReferenceImageViewer"); + window.Show(); + } + + void OnGUI() + { + EditorGUILayout.BeginHorizontal(); + EditorGUILayout.LabelField("Image", GUILayout.Width(50)); + tex = (Texture2D)EditorGUILayout.ObjectField(tex, typeof(Texture2D), true, GUILayout.MinWidth(100)); + GUILayout.FlexibleSpace(); + keepAspectRatio = EditorGUILayout.ToggleLeft("KeepAspect", keepAspectRatio); + EditorGUILayout.EndHorizontal(); + + if (tex != null) + { + int topOffset = 20; + + // prep + var maxWidth = position.width; + var maxHeight = position.height - topOffset; + var imgWidth = (float)tex.width; + var imgHeight = (float)tex.height; + + // calc + var widthRatio = maxWidth / imgWidth; + var heightRatio = maxHeight / imgHeight; + var bestRatio = Mathf.Min(widthRatio, heightRatio); + + // output + var newWidth = imgWidth * bestRatio; + var newHeight = imgHeight * bestRatio; + + if (keepAspectRatio == true) + { + EditorGUI.DrawPreviewTexture(new Rect(0, topOffset, newWidth, newHeight), tex); + } + else + { + EditorGUI.DrawPreviewTexture(new Rect(0, topOffset, maxWidth, maxHeight), tex); + } + } + } + } +} From c4c8235d717b410a70da527b207b0730311ec0ca Mon Sep 17 00:00:00 2001 From: Eli Davis Date: Mon, 17 Feb 2020 13:46:33 -0600 Subject: [PATCH 031/120] Fix Triangle Count sharedMesh.triangles returns an array of integers that are actually triplets of indices that references different vertices of the mesh. Therefore the total tri count would be the length of the array divided by 3. --- Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs index 06aba89..ad4fc24 100644 --- a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs +++ b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs @@ -31,7 +31,7 @@ void OnGUI() for (int i = 0, length = meshes.Length; i < length; i++) { totalVertices += meshes[i].sharedMesh.vertexCount; - totalTris += meshes[i].sharedMesh.triangles.Length; + totalTris += meshes[i].sharedMesh.triangles.Length / 3; totalMeshes++; } From e8a5cdee06342cf58b7a2f03979c3c8aa6725125 Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 22 Feb 2020 22:06:15 +0200 Subject: [PATCH 032/120] Create CreatePlane.cs --- Assets/Scripts/Editor/Mesh/CreatePlane.cs | 227 ++++++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 Assets/Scripts/Editor/Mesh/CreatePlane.cs diff --git a/Assets/Scripts/Editor/Mesh/CreatePlane.cs b/Assets/Scripts/Editor/Mesh/CreatePlane.cs new file mode 100644 index 0000000..f2633c1 --- /dev/null +++ b/Assets/Scripts/Editor/Mesh/CreatePlane.cs @@ -0,0 +1,227 @@ +// editor tools to create mesh plane with adjustable resolution +// original : http://wiki.unity3d.com/index.php?title=CreatePlane#C.23_-_CreatePlane.cs + +using UnityEngine; +using UnityEditor; +using System.Collections; + +namespace UnityLibrary +{ + public class CreatePlane : ScriptableWizard + { + + public enum Orientation + { + Horizontal, + Vertical + } + + public enum AnchorPoint + { + TopLeft, + TopHalf, + TopRight, + RightHalf, + BottomRight, + BottomHalf, + BottomLeft, + LeftHalf, + Center + } + + public int widthSegments = 1; + public int lengthSegments = 1; + public float width = 1.0f; + public float length = 1.0f; + public Orientation orientation = Orientation.Horizontal; + public AnchorPoint anchor = AnchorPoint.Center; + public bool addCollider = false; + public bool createAtOrigin = true; + public bool flipYZ = false; + public bool twoSided = false; + public string optionalName; + + static Camera cam; + static Camera lastUsedCam; + + + [MenuItem("GameObject/Create Other/Custom Plane...")] + static void CreateWizard() + { + cam = Camera.current; + // Hack because camera.current doesn't return editor camera if scene view doesn't have focus + if (!cam) + cam = lastUsedCam; + else + lastUsedCam = cam; + ScriptableWizard.DisplayWizard("Create Plane",typeof(CreatePlane)); + } + + + void OnWizardUpdate() + { + widthSegments = Mathf.Clamp(widthSegments, 1, 254); + lengthSegments = Mathf.Clamp(lengthSegments, 1, 254); + } + + + void OnWizardCreate() + { + GameObject plane = new GameObject(); + + if (!string.IsNullOrEmpty(optionalName)) + plane.name = optionalName; + else + plane.name = "Plane"; + + if (!createAtOrigin && cam) + plane.transform.position = cam.transform.position + cam.transform.forward*5.0f; + else + plane.transform.position = Vector3.zero; + + Vector2 anchorOffset; + string anchorId; + switch (anchor) + { + case AnchorPoint.TopLeft: + anchorOffset = new Vector2(-width/2.0f,length/2.0f); + anchorId = "TL"; + break; + case AnchorPoint.TopHalf: + anchorOffset = new Vector2(0.0f,length/2.0f); + anchorId = "TH"; + break; + case AnchorPoint.TopRight: + anchorOffset = new Vector2(width/2.0f,length/2.0f); + anchorId = "TR"; + break; + case AnchorPoint.RightHalf: + anchorOffset = new Vector2(width/2.0f,0.0f); + anchorId = "RH"; + break; + case AnchorPoint.BottomRight: + anchorOffset = new Vector2(width/2.0f,-length/2.0f); + anchorId = "BR"; + break; + case AnchorPoint.BottomHalf: + anchorOffset = new Vector2(0.0f,-length/2.0f); + anchorId = "BH"; + break; + case AnchorPoint.BottomLeft: + anchorOffset = new Vector2(-width/2.0f,-length/2.0f); + anchorId = "BL"; + break; + case AnchorPoint.LeftHalf: + anchorOffset = new Vector2(-width/2.0f,0.0f); + anchorId = "LH"; + break; + case AnchorPoint.Center: + default: + anchorOffset = Vector2.zero; + anchorId = "C"; + break; + } + + MeshFilter meshFilter = (MeshFilter)plane.AddComponent(typeof(MeshFilter)); + plane.AddComponent(typeof(MeshRenderer)); + + string planeAssetName = plane.name + widthSegments + "x" + lengthSegments + "W" + width + "L" + length + (orientation == Orientation.Horizontal? "H" : "V") + anchorId + ".asset"; + Mesh m = (Mesh)AssetDatabase.LoadAssetAtPath("Assets/Editor/" + planeAssetName,typeof(Mesh)); + + if (m == null) + { + m = new Mesh(); + m.name = plane.name; + + int hCount2 = widthSegments+1; + int vCount2 = lengthSegments+1; + int numTriangles = widthSegments * lengthSegments * 6; + if (twoSided) { + numTriangles *= 2; + } + int numVertices = hCount2 * vCount2; + + Vector3[] vertices = new Vector3[numVertices]; + Vector2[] uvs = new Vector2[numVertices]; + int[] triangles = new int[numTriangles]; + + int index = 0; + float uvFactorX = 1.0f/widthSegments; + float uvFactorY = 1.0f/lengthSegments; + float scaleX = width/widthSegments; + float scaleY = length/lengthSegments; + for (float y = 0.0f; y < vCount2; y++) + { + for (float x = 0.0f; x < hCount2; x++) + { + if (orientation == Orientation.Horizontal) + { + if (flipYZ) + { + vertices[index] = new Vector3(x*scaleX - width/2f - anchorOffset.x, y*scaleY - length/2f - anchorOffset.y, 0.0f); + }else{ + vertices[index] = new Vector3(x*scaleX - width/2f - anchorOffset.x, 0.0f, y*scaleY - length/2f - anchorOffset.y); + } + } + else + { + if (flipYZ) + { + vertices[index] = new Vector3(x*scaleX - width/2f - anchorOffset.x, 0.0f, y*scaleY - length/2f - anchorOffset.y); + }else{ + vertices[index] = new Vector3(x*scaleX - width/2f - anchorOffset.x, y*scaleY - length/2f - anchorOffset.y, 0.0f); + } + } + uvs[index++] = new Vector2(x*uvFactorX, y*uvFactorY); + } + } + + index = 0; + for (int y = 0; y < lengthSegments; y++) + { + for (int x = 0; x < widthSegments; x++) + { + triangles[index] = (y * hCount2) + x; + triangles[index+1] = ((y+1) * hCount2) + x; + triangles[index+2] = (y * hCount2) + x + 1; + + triangles[index+3] = ((y+1) * hCount2) + x; + triangles[index+4] = ((y+1) * hCount2) + x + 1; + triangles[index+5] = (y * hCount2) + x + 1; + index += 6; + } + if (twoSided) { + // Same tri vertices with order reversed, so normals point in the opposite direction + for (int x = 0; x < widthSegments; x++) + { + triangles[index] = (y * hCount2) + x; + triangles[index+1] = (y * hCount2) + x + 1; + triangles[index+2] = ((y+1) * hCount2) + x; + + triangles[index+3] = ((y+1) * hCount2) + x; + triangles[index+4] = (y * hCount2) + x + 1; + triangles[index+5] = ((y+1) * hCount2) + x + 1; + index += 6; + } + } + } + + m.vertices = vertices; + m.uv = uvs; + m.triangles = triangles; + m.RecalculateNormals(); + + AssetDatabase.CreateAsset(m, "Assets/Editor/" + planeAssetName); + AssetDatabase.SaveAssets(); + } + + meshFilter.sharedMesh = m; + m.RecalculateBounds(); + + if (addCollider) + plane.AddComponent(typeof(BoxCollider)); + + Selection.activeObject = plane; + } + } + } From 7a5919d441810d9307225c59d295f2f8a5e21b54 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 27 Feb 2020 13:09:29 +0200 Subject: [PATCH 033/120] optimize GetSelectedMeshInfo (loop meshes only if selection changed), add TOP10 verts list --- .../Editor/Tools/GetSelectedMeshInfo.cs | 60 +++++++++++++++---- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs index ad4fc24..6124981 100644 --- a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs +++ b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs @@ -1,5 +1,6 @@ // display selected gameobject mesh stats (should work on prefabs,models in project window also) +using System.Collections.Generic; using UnityEditor; using UnityEngine; @@ -7,6 +8,15 @@ namespace UnityLibrary { public class GetSelectedMeshInfo : EditorWindow { + bool selectionChanged = false; + + int totalMeshes = 0; + int totalVertices = 0; + int totalTris = 0; + + List top10 = new List(); + MeshFilter[] meshes; + [MenuItem("Tools/UnityLibrary/GetMeshInfo")] public static void ShowWindow() { @@ -17,34 +27,62 @@ public static void ShowWindow() void OnGUI() { var selection = Selection.activeGameObject; - if (selection != null) { EditorGUILayout.LabelField("Selected: " + selection.name); - int totalMeshes = 0; - int totalVertices = 0; - int totalTris = 0; - - // get all meshes - var meshes = selection.GetComponentsInChildren(); - for (int i = 0, length = meshes.Length; i < length; i++) + // update mesh info only if selection changed + if (selectionChanged == true) { - totalVertices += meshes[i].sharedMesh.vertexCount; - totalTris += meshes[i].sharedMesh.triangles.Length / 3; - totalMeshes++; + top10.Clear(); + + totalMeshes = 0; + totalVertices = 0; + totalTris = 0; + + // get all meshes + meshes = selection.GetComponentsInChildren(); + for (int i = 0, length = meshes.Length; i < length; i++) + { + int verts = meshes[i].sharedMesh.vertexCount; + totalVertices += verts; + totalTris += meshes[i].sharedMesh.triangles.Length / 3; + totalMeshes++; + top10.Add(verts); + } + selectionChanged = false; + + // sort top10 + top10.Sort(); } // display stats EditorGUILayout.LabelField("Meshes: " + totalMeshes); EditorGUILayout.LabelField("Vertices: " + totalVertices); EditorGUILayout.LabelField("Triangles: " + totalTris); + EditorGUILayout.Space(); + EditorGUILayout.LabelField("TOP 10", EditorStyles.boldLabel); + + // top 10 + if (meshes != null) + { + // start from last index + int from = meshes.Length; + // until 10 meshes or if less than 10 + int to = meshes.Length - Mathf.Min(10, from); + for (int i = from-1; i >= to; i--) + { + int percent = (int)(top10[i] / (float)totalVertices * 100f); + EditorGUILayout.LabelField(meshes[i].name + " = " + top10[i] + " (" + percent + "%)"); + } + } } } void OnSelectionChange() { + selectionChanged = true; // force redraw window Repaint(); } From 3245181b3dfb9e330e5ddff94aa7c2f815d9ee69 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 5 Mar 2020 12:41:02 +0200 Subject: [PATCH 034/120] Create CirclesPattern.shader --- .../Shaders/2D/Patterns/CirclesPattern.shader | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 Assets/Shaders/2D/Patterns/CirclesPattern.shader diff --git a/Assets/Shaders/2D/Patterns/CirclesPattern.shader b/Assets/Shaders/2D/Patterns/CirclesPattern.shader new file mode 100644 index 0000000..1ed7c16 --- /dev/null +++ b/Assets/Shaders/2D/Patterns/CirclesPattern.shader @@ -0,0 +1,68 @@ +// draws circle pattern +Shader "UnityLibrary/2D/Patterns/Circles" +{ + Properties + { + _Color ("Color", Color) = (1,1,1,1) + _CircleSize("Size", Range(0,1)) = 0.5 + _Circles("Amount", Range(1,64)) = 8 + } + + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 200 + + CGPROGRAM + #pragma surface surf Standard fullforwardshadows vertex:vert + #pragma target 3.0 + + struct Input + { + float2 texcoord : TEXCOORD0; + }; + + sampler2D _MainTex; + float _Circles; + float _CircleSize; + + half _Glossiness; + half _Metallic; + fixed4 _Color; + + UNITY_INSTANCING_BUFFER_START(Props) + UNITY_INSTANCING_BUFFER_END(Props) + + // https://thebookofshaders.com/09/ + float2 tile(float2 _st, float _zoom) + { + _st *= _zoom; + return frac(_st); + } + + // https://thebookofshaders.com/07/ + float Circle(float2 _st, float _radius) + { + float2 dist = _st - float2(0.5, 0.5); + return 1. - smoothstep(_radius - (_radius * 0.01), _radius + (_radius * 0.01), dot(dist, dist) * 4.0); + } + + void vert(inout appdata_full v, out Input o) + { + UNITY_INITIALIZE_OUTPUT(Input, o); + o.texcoord = v.texcoord; + } + + void surf (Input IN, inout SurfaceOutputStandard o) + { + float2 st = IN.texcoord.xy; + float c = Circle(tile(st, round(_Circles)), _CircleSize); + o.Albedo = c.rrr* _Color; + o.Metallic = _Metallic; + o.Smoothness = _Glossiness; + o.Alpha = c.r; + } + ENDCG + } + FallBack "Diffuse" +} From 0405e0982b6fb8fed98ad96de57b66cce8bf4d3c Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 7 Mar 2020 11:06:25 +0200 Subject: [PATCH 035/120] Add Metaball.cs from unity wiki --- Assets/Scripts/Mesh/Metaball.cs | 979 ++++++++++++++++++++++++++++++++ 1 file changed, 979 insertions(+) create mode 100644 Assets/Scripts/Mesh/Metaball.cs diff --git a/Assets/Scripts/Mesh/Metaball.cs b/Assets/Scripts/Mesh/Metaball.cs new file mode 100644 index 0000000..5bb330d --- /dev/null +++ b/Assets/Scripts/Mesh/Metaball.cs @@ -0,0 +1,979 @@ +// taken from http://wiki.unity3d.com/index.php?title=MetaBalls&oldid=16461 +/** + * Metaball implementation by Brian R. Cowan http://www.briancowan.net/ + * Metaball tables at http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/ + * Examples at http://www.briancowan.net/unity/fx + * + * Code provided as-is. You agree by using this code that I am not liable for any damage + * it could possibly cause to you, your machine, or anything else. And the code is not meant + * to be used for any medical uses or to run nuclear reactors or robots or such and so. + * + * Should be easily portable to any other language, all Unity Specific code is labeled so, + * adapt it to any other environment. To use, attach the script to an empty object with a + * Mesh Renderer and Mesh Filter. The created cubes will be one unit in size in XYZ. + * Modify Update() and Start() to change the amount and movement and size of the blobs. + * + * Id love to see any project you use the code in. + * + * Mail any comments to: brian@briancowan.net (Vector or Vector426 on #otee-unity) + * + * Cheers & God bless + */ + +/** +*There is a small bug in this code that produces 1 to 4 overlapping triangles +*mostly in the centre of the mesh, sometimes on a side resulting in a white patch +*it appears in other shapes than Metaballs. +*if it's too hard to fix the code, scanning duplicate triangles is possible +*the duplicates occur in the 1st 4 triangles and anywhere after +*it seems the code doesn't check duplicates for the 1st 4 triangles +*the above issue is probably relate to the march() function doCube 1x time +*and then sending recurse() function docube in the same space +* so perhaps delete if(doCube(cube)) { condition in march() and just recurse +*also it processes 278700 pts instead of 32768 pts if made to march all spaces +*/ + +/*Unity Specific*/ +using UnityEngine; +using System.Collections; + +namespace UnityLibrary +{ + public class Metaball : MonoBehaviour + { + + /*Amount of cubes in X/Y/Z directions, Dimension will always be from -.5f to .5f in XYZ + remember to call Regen() if changing! + */ + int _dimX = 30; + int _dimY = 30; + int _dimZ = 30; + + public int dimX + { + get { return _dimX; } + set { _dimX = value; Regen(); } + } + public int dimY + { + get { return _dimY; } + set { _dimY = value; Regen(); } + } + public int dimZ + { + get { return _dimZ; } + set { _dimZ = value; Regen(); } + } + /*Blobs are a staggered array of floats, where first index is blob, and second is 0=x, 1=y 2=z 3=power + Multidim might be slightly faster, but staggered made the code a little cleaner IMO*/ + public float[][] blobs; + + /*Cutoff intensity, where the surface of mesh will be created*/ + public float isoLevel = .5f; + + /*Scratch buffers for Vertices/Normals/Tris */ + private Vector3[] newVertex; + private Vector3[] newNormal; + private Vector2[] newUV; + private int[] newTri; + + /*Pointer into scratch buffers for tris and vertices(also used for UVs and Normals) + at the end of a frame it will give the total amount of each*/ + private int triP = 0; + private int vertP = 0; + + /*Generated at startup for dimX,dimY,dimZ, + all the points, edges, cubes in the 3D lattice*/ + private mcPoint[] _points; + private mcEdge[] _edges; + private mcCube[] _cubes; + + + /*Scratch buffers for use within functions, to eliminate the usage of new almost entirely each frame*/ + private Vector3[] tada; + private Vector2[] tada2; + private int tadac, tadac2; + private int tadam = 50000; + + /*Current frame counter*/ + private int pctr = 0; + + /*Cube Class*/ + private class mcCube + { + public mcCube() + { + cntr = 0; + edges = new mcEdge[12]; + for (int i = 0; i < 12; i++) + { + edges[i] = null; + } + points = new mcPoint[8]; + } + + /*12 Edges, see march() for their positioning*/ + public mcEdge[] edges; + + /*8 Points, see march() for their positioning*/ + public mcPoint[] points; + + /*last frame this cube was processed*/ + public int cntr; + + /*Pointers into the latice array*/ + public int px; + public int py; + public int pz; + } + + /*Edge class*/ + private class mcEdge + { + /*the vector of the calculated point*/ + public Vector3 v3; + + /*index into newVertex/Normal/Uv of calculated point*/ + public int vi; + + /*Last frame this was calculated at*/ + public int cntr; + + /*axis of edge*/ + public int axisI; + + public mcEdge(int axisI) + { + this.cntr = 0; + this.axisI = axisI; + } + } + + /*Point (in lattice) class*/ + public class mcPoint + { + /*Calculated Intensity or Power of point*/ + public float _i; + public int px, py, pz; + private Metaball mcblob; + public int cntr; + + /*Object Space position of point*/ + public float[] index; + + public mcPoint(float x, float y, float z, int px, int py, int pz, Metaball thismcblob) + { + this.index = new float[3]; + index[0] = x; index[1] = y; index[2] = z; + + this.px = px; + this.py = py; + this.pz = pz; + this.cntr = 0; + this.mcblob = thismcblob; + } + + /*Axis letter accessors*/ + public float x + { + get { return index[0]; } + set { index[0] = value; } + } + public float y + { + get { return index[1]; } + set { index[1] = value; } + } + public float z + { + get { return index[2]; } + set { index[2] = value; } + } + + /*Calculate the power of a point only if it hasn't been calculated already for this frame*/ + public float i() + { + float pwr; + if (cntr < mcblob.pctr) + { + cntr = mcblob.pctr; + pwr = 0f; + for (int jc = 0; jc < this.mcblob.blobs.Length; jc++) + { + float[] pb = this.mcblob.blobs[jc]; + pwr += (1.0f / Mathf.Sqrt(((pb[0] - this.x) * (pb[0] - this.x)) + ((pb[1] - this.y) * (pb[1] - this.y)) + ((pb[2] - this.z) * (pb[2] - this.z)))) * pb[3]; + } + this._i = pwr; + } + return this._i; + } + + public float this[int idx] + { + get + { + return index[idx]; + } + set + { + index[idx] = value; + } + } + } + + /* Normals are calculated by 'averaging' all the derivatives of the Blob power functions*/ + private Vector3 calcNormal(Vector3 pnt) + { + int jc; + Vector3 result = tada[tadac++]; + result.x = 0; result.y = 0; result.z = 0; + for (jc = 0; jc < blobs.Length; jc++) + { + float[] pb = blobs[jc]; + + Vector3 current = tada[tadac++]; + current.x = pnt.x - pb[0]; + current.y = pnt.y - pb[1]; + current.z = pnt.z - pb[2]; + float mag = current.magnitude; + float pwr = .5f * (1f / (mag * mag * mag)) * pb[3]; + result = result + (current * pwr); + } + return result.normalized; + } + + /*Given xyz indices into lattice, return referring cube */ + private mcCube getCube(int x, int y, int z) + { + if (x < 0 || y < 0 || z < 0 || x >= dimX || y >= dimY || z >= dimZ) { return null; } + return _cubes[z + (y * (dimZ)) + (x * (dimZ) * (dimY))]; + } + + /*Given xyz indices into lattice, return referring vertex */ + private mcPoint getPoint(int x, int y, int z) + { + if (x < 0 || y < 0 || z < 0 || x > dimX || y > dimY || z > dimZ) { return null; } + return _points[z + (y * (dimZ + 1)) + (x * (dimZ + 1) * (dimY + 1))]; + } + + /*Return the interpolated position of point on an Axis*/ + private Vector3 mPos(mcPoint a, mcPoint b, int axisI) + { + float mu = (isoLevel - a.i()) / (b.i() - a.i()); + Vector3 tmp = tada[tadac++]; + tmp[0] = a[0]; tmp[1] = a[1]; tmp[2] = a[2]; + tmp[axisI] = a[axisI] + (mu * (b[axisI] - a[axisI])); + + return tmp; + } + + /*If an edge of a cube has not been processed, find the interpolated point for + that edge (assumes the boundary crosses the edge) and compute the normal + for that point, as well as assigning it an index into the vertex list*/ + private void genEdge(mcCube cube, int edgei, int p1i, int p2i) + { + Vector3 v; + mcEdge e = cube.edges[edgei]; + if (e.cntr < pctr) + { + + v = mPos(cube.points[p1i], cube.points[p2i], e.axisI); + e.v3 = v; + e.vi = vertP; + newNormal[vertP] = calcNormal(v); + newVertex[vertP++] = v; + e.cntr = pctr; + + } + } + + /*Calculate a cube: + First set a boolean pointer made up of all the vertices within the cube + then (if not all in or out of the surface) go through all the edges that + are crossed by the surface and make sure that a vertex&normal is assigned + at the point of crossing. Then add all the triangles that cover the surface + within the cube. + Returns true if the surface crosses the cube, false otherwise.*/ + private bool doCube(mcCube cube) + { + int edgec, vertc; + edgec = 0; vertc = 0; + + int cubeIndex = 0; + + if (cube.points[0].i() > isoLevel) { cubeIndex |= 1; } + if (cube.points[1].i() > isoLevel) { cubeIndex |= 2; } + if (cube.points[2].i() > isoLevel) { cubeIndex |= 4; } + if (cube.points[3].i() > isoLevel) { cubeIndex |= 8; } + if (cube.points[4].i() > isoLevel) { cubeIndex |= 16; } + if (cube.points[5].i() > isoLevel) { cubeIndex |= 32; } + if (cube.points[6].i() > isoLevel) { cubeIndex |= 64; } + if (cube.points[7].i() > isoLevel) { cubeIndex |= 128; } + + int edgeIndex = edgeTable[cubeIndex]; + edgec += edgeIndex; + if (edgeIndex != 0) + { + if ((edgeIndex & 1) > 0) { genEdge(cube, 0, 0, 1); } + if ((edgeIndex & 2) > 0) { genEdge(cube, 1, 1, 2); } + if ((edgeIndex & 4) > 0) { genEdge(cube, 2, 2, 3); } + if ((edgeIndex & 0x8) > 0) { genEdge(cube, 3, 3, 0); } + if ((edgeIndex & 0x10) > 0) { genEdge(cube, 4, 4, 5); } + if ((edgeIndex & 0x20) > 0) { genEdge(cube, 5, 5, 6); } + if ((edgeIndex & 0x40) > 0) { genEdge(cube, 6, 6, 7); } + if ((edgeIndex & 0x80) > 0) { genEdge(cube, 7, 7, 4); } + if ((edgeIndex & 0x100) > 0) { genEdge(cube, 8, 0, 4); } + if ((edgeIndex & 0x200) > 0) { genEdge(cube, 9, 1, 5); } + if ((edgeIndex & 0x400) > 0) { genEdge(cube, 10, 2, 6); } + if ((edgeIndex & 0x800) > 0) { genEdge(cube, 11, 3, 7); } + + int tpi = 0; + int tmp; + while (triTable[cubeIndex, tpi] != -1) + { + tmp = cube.edges[triTable[cubeIndex, tpi + 2]].vi; + newTri[triP++] = tmp; vertc += tmp; + tmp = cube.edges[triTable[cubeIndex, tpi + 1]].vi; + newTri[triP++] = tmp; vertc += tmp; + tmp = cube.edges[triTable[cubeIndex, tpi]].vi; + newTri[triP++] = tmp; vertc += tmp; + tpi += 3; + } + + return true; + } + else + { + return false; + } + } + + /*Recurse all the neighboring cubes where thy contain part of the surface*/ + /*Counter to see how many cubes where processed*/ + int cubec; + private void recurseCube(mcCube cube) + { + mcCube nCube; + int jx, jy, jz; + jx = cube.px; jy = cube.py; jz = cube.pz; + cubec++; + /* Test 6 axis cases. This seems to work well, no need to test all 26 cases */ + nCube = getCube(jx + 1, jy, jz); + if (nCube != null && nCube.cntr < pctr) { nCube.cntr = pctr; if (doCube(nCube)) { recurseCube(nCube); } } + nCube = getCube(jx - 1, jy, jz); + if (nCube != null && nCube.cntr < pctr) { nCube.cntr = pctr; if (doCube(nCube)) { recurseCube(nCube); } } + nCube = getCube(jx, jy + 1, jz); + if (nCube != null && nCube.cntr < pctr) { nCube.cntr = pctr; if (doCube(nCube)) { recurseCube(nCube); } } + nCube = getCube(jx, jy - 1, jz); + if (nCube != null && nCube.cntr < pctr) { nCube.cntr = pctr; if (doCube(nCube)) { recurseCube(nCube); } } + nCube = getCube(jx, jy, jz + 1); + if (nCube != null && nCube.cntr < pctr) { nCube.cntr = pctr; if (doCube(nCube)) { recurseCube(nCube); } } + nCube = getCube(jx, jy, jz - 1); + if (nCube != null && nCube.cntr < pctr) { nCube.cntr = pctr; if (doCube(nCube)) { recurseCube(nCube); } } + } + + /*Go through all the Blobs, and travel from the center outwards in a negative Z direction + until we reach the surface, then begin to recurse around the surface. This isn't flawless + if the blob isn't completely within the lattice boundaries in the minimal Z axis and no + other blob that does check out is in contact with it. The blob will dissapear, but otherwise + works well*/ + private void march() + { + int i, jx, jy, jz; + for (i = 0; i < blobs.Length; i++) + { + float[] pb = blobs[i]; + jx = (int)((pb[0] + .5f) * dimX); + jy = (int)((pb[1] + .5f) * dimY); + jz = (int)((pb[2] + .5f) * dimZ); + + while (jz >= 0) + { + mcCube cube = getCube(jx, jy, jz); + if (cube != null && cube.cntr < pctr) + { + if (doCube(cube)) + { + recurseCube(cube); + jz = -1; + } + cube.cntr = pctr; + } + else + { + jz = -1; + } + jz -= 1; + } + } + } + + /*Unity and Sample Specific, scratch caches to not reallocate vertices/tris/etc...*/ + Vector3[] fv, fn; + int[] ft; + Vector2[] fuv; + + //Last Status Post + private float lt = 0f; + + /*Unity and Sample Specific*/ + private void renderMesh() + { + int i; + + /*Clear the Vertices that don't have any real information assigned to them */ + for (i = 0; i < vertP; i++) + { + fv[i] = newVertex[i]; fn[i] = newNormal[i]; + fuv[i] = tada2[tadac2++]; + Vector3 fuvt = transform.TransformPoint(fn[i]).normalized; + fuv[i].x = (fuvt.x + 1f) * .5f; fuv[i].y = (fuvt.y + 1f) * .5f; + } + // fuv[i].x=fn[i].x;fuv[i].y=fn[i].y;} + + for (i = vertP; i < fv.Length; i++) + { + fv[i][0] = 0; fn[i][0] = 0; fuv[i][0] = 0; + fv[i][1] = 0; fn[i][1] = 0; fuv[i][1] = 0; + fv[i][2] = 0; + } + + for (i = 0; i < triP; i++) { ft[i] = newTri[i]; } + for (i = triP; i < ft.Length; i++) { ft[i] = 0; } + + Mesh mesh = ((MeshFilter)GetComponent("MeshFilter")).mesh; + + mesh.vertices = fv; + mesh.uv = fuv; + mesh.triangles = ft; + mesh.normals = fn; + + /*For Disco Ball Effect*/ + //mesh.RecalculateNormals(); + } + + /*What is needed to do every frame for the calculation and rendering of the Metaballs*/ + void doFrame() + { + tadac = 0; + tadac2 = 0; + cubec = 0; + pctr++; + triP = 0; + vertP = 0; + march(); + renderMesh(); + } + + /*Regenerate Lattice and Connections, when changing Dimensions of Lattice*/ + void Regen() + { + startObjs(); + startEngine(); + } + + //Unity and Sample specific + void Update() + { + //Update FPS and counters every second + //if (lt + 1 < Time.time) + //{ + // lt = Time.time; + // GUIText guit = (GUIText)GameObject.Find("guit").guiText; + // guit.text = "T:" + triP + " V:" + vertP + " C:" + cubec + " FPS:" + (int)(1f / Time.deltaTime); + //} + + blobs[0][0] = .12f + .12f * (float)Mathf.Sin((float)Time.time * .50f); + blobs[0][2] = .06f + .23f * (float)Mathf.Cos((float)Time.time * .2f); + blobs[1][0] = .12f + .12f * (float)Mathf.Sin((float)Time.time * .2f); + blobs[1][2] = -.23f + .10f * (float)Mathf.Cos((float)Time.time * 1f); + blobs[2][1] = -.03f + .24f * (float)Mathf.Sin((float)Time.time * .35f); + blobs[3][1] = .126f + .10f * (float)Mathf.Cos((float)Time.time * .1f); + blobs[4][0] = .206f + .1f * (float)Mathf.Cos((float)Time.time * .5f); + blobs[4][1] = .056f + .2f * (float)Mathf.Sin((float)Time.time * .3f); + blobs[4][2] = .25f + .08f * (float)Mathf.Cos((float)Time.time * .2f); + + transform.Rotate(Time.deltaTime * 10f, 0, Time.deltaTime * .6f); + + doFrame(); + } + + //Unity and Sample Specific + void Start() + { + lt = 0f; + blobs = new float[5][]; + blobs[0] = new float[] { .16f, .26f, .16f, .13f }; + blobs[1] = new float[] { .13f, -.134f, .35f, .12f }; + blobs[2] = new float[] { -.18f, .125f, -.25f, .16f }; + blobs[3] = new float[] { -.13f, .23f, .255f, .13f }; + blobs[4] = new float[] { -.18f, .125f, .35f, .12f }; + isoLevel = 1.95f; + Regen(); + } + + + /*Unity Specific starting of engine*/ + void startEngine() + { + ((MeshFilter)GetComponent("MeshFilter")).mesh = new Mesh(); + } + + /*Generate the Cube Lattice + All shared vertices and edges are connected across cubes, + it's not perfect in that the edges along the lower index borders + are not connected, but all the rest are, this shouldn't make any + noticeable visual impact, and have no performance impact unless + a blob lies along those borders*/ + private void startObjs() + { + int i; + float jx, jy, jz; + int ijx, ijy, ijz; + int pointCount = ((dimX + 1) * (dimY + 1) * (dimZ + 1)); + int cubeCount = (dimX * dimY * dimZ); + int edgeCount = (cubeCount * 3) + ((2 * dimX * dimY) + (2 * dimX * dimZ) + (2 * dimY * dimZ)) + dimX + dimY + dimZ; //Ideal Edge Count + int edgeNow = edgeCount + ((dimX * dimY) + (dimY * dimZ) + (dimZ * dimX)) * 2; //Haven't combined the edges of the 0 index borders + + //Should be a pretty safe amount + int tmpv = (int)(dimX * dimY * dimZ / 7); + tadam = tmpv * 4; + fv = new Vector3[tmpv]; + fn = new Vector3[tmpv]; + fuv = new Vector2[tmpv]; + + //Pretty save amount of Tris as well + ft = new int[(int)(cubeCount * .75)]; + + newVertex = new Vector3[300000]; + newTri = new int[300000]; + newNormal = new Vector3[300000]; + tada = new Vector3[tadam * 2]; + tada2 = new Vector2[tadam * 2]; + + //newUV=new Vector2[300000]; + _cubes = new mcCube[cubeCount]; + _points = new mcPoint[pointCount]; + _edges = new mcEdge[edgeNow]; + + for (i = 0; i < tadam * 2; i++) + { + tada[i] = new Vector3(0, 0, 0); + tada2[i] = new Vector2(0, 0); + } + + for (i = 0; i < edgeNow; i++) + { + _edges[i] = new mcEdge(-1); + } + + + i = 0; + for (jx = 0.0f; jx <= dimX; jx++) + { + for (jy = 0.0f; jy <= dimY; jy++) + { + for (jz = 0.0f; jz <= dimZ; jz++) + { + _points[i] = new mcPoint((jx / dimX) - .5f, (jy / dimY) - .5f, (jz / dimZ) - .5f, (int)jx, (int)jy, (int)jz, this); + + i++; + } + } + } + + for (i = 0; i < cubeCount; i++) + { + _cubes[i] = new mcCube(); + } + int ep = 0; + + mcCube c; + mcCube tc; + i = 0; + + int topo = 0; + for (ijx = 0; ijx < dimX; ijx++) + { + for (ijy = 0; ijy < dimY; ijy++) + { + for (ijz = 0; ijz < dimZ; ijz++) + { + c = _cubes[i]; + i++; + c.px = ijx; c.py = ijy; c.pz = ijz; + + mcPoint[] cpt = c.points; + cpt[0] = getPoint(ijx, ijy, ijz); + cpt[1] = getPoint(ijx + 1, ijy, ijz); + cpt[2] = getPoint(ijx + 1, ijy + 1, ijz); + cpt[3] = getPoint(ijx, ijy + 1, ijz); + cpt[4] = getPoint(ijx, ijy, ijz + 1); + cpt[5] = getPoint(ijx + 1, ijy, ijz + 1); + cpt[6] = getPoint(ijx + 1, ijy + 1, ijz + 1); + cpt[7] = getPoint(ijx, ijy + 1, ijz + 1); + + mcEdge[] e = c.edges; + e[5] = _edges[ep++]; e[5].axisI = 1; + e[6] = _edges[ep++]; e[6].axisI = 0; + e[10] = _edges[ep++]; e[10].axisI = 2; + + tc = getCube(ijx + 1, ijy, ijz); + if (tc != null) { tc.edges[11] = e[10]; tc.edges[7] = e[5]; } + + tc = getCube(ijx, ijy + 1, ijz); + if (tc != null) { tc.edges[4] = c.edges[6]; tc.edges[9] = c.edges[10]; } + + tc = getCube(ijx, ijy + 1, ijz + 1); + if (tc != null) { tc.edges[0] = c.edges[6]; } + + tc = getCube(ijx + 1, ijy, ijz + 1); + if (tc != null) { tc.edges[3] = c.edges[5]; } + + tc = getCube(ijx + 1, ijy + 1, ijz); + if (tc != null) { tc.edges[8] = c.edges[10]; } + + tc = getCube(ijx, ijy, ijz + 1); + if (tc != null) { tc.edges[1] = c.edges[5]; tc.edges[2] = c.edges[6]; } + + if (e[0] == null) + { + e[0] = _edges[ep++]; e[0].axisI = 0; + } + if (e[1] == null) + { + e[1] = _edges[ep++]; e[1].axisI = 1; + } + if (e[2] == null) + { + e[2] = _edges[ep++]; e[2].axisI = 0; + } + else { topo++; } + if (e[3] == null) + { + e[3] = _edges[ep++]; e[3].axisI = 1; + } + if (e[4] == null) + { + e[4] = _edges[ep++]; e[4].axisI = 0; + } + if (e[7] == null) + { + e[7] = _edges[ep++]; e[7].axisI = 1; + } + if (e[8] == null) + { + e[8] = _edges[ep++]; e[8].axisI = 2; + } + if (e[9] == null) + { + e[9] = _edges[ep++]; e[9].axisI = 2; + } + if (e[11] == null) + { + e[11] = _edges[ep++]; e[11].axisI = 2; + } + } + } + } + } + + /*Courtesy of http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/*/ + private int[,] triTable = new int[,] + {{-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 8, 3, 9, 8, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 3, 1, 2, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {9, 2, 10, 0, 2, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {2, 8, 3, 2, 10, 8, 10, 9, 8, -1, -1, -1, -1, -1, -1, -1}, + {3, 11, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 11, 2, 8, 11, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 9, 0, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 11, 2, 1, 9, 11, 9, 8, 11, -1, -1, -1, -1, -1, -1, -1}, + {3, 10, 1, 11, 10, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 10, 1, 0, 8, 10, 8, 11, 10, -1, -1, -1, -1, -1, -1, -1}, + {3, 9, 0, 3, 11, 9, 11, 10, 9, -1, -1, -1, -1, -1, -1, -1}, + {9, 8, 10, 10, 8, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 3, 0, 7, 3, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 1, 9, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 1, 9, 4, 7, 1, 7, 3, 1, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 10, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {3, 4, 7, 3, 0, 4, 1, 2, 10, -1, -1, -1, -1, -1, -1, -1}, + {9, 2, 10, 9, 0, 2, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1}, + {2, 10, 9, 2, 9, 7, 2, 7, 3, 7, 9, 4, -1, -1, -1, -1}, + {8, 4, 7, 3, 11, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {11, 4, 7, 11, 2, 4, 2, 0, 4, -1, -1, -1, -1, -1, -1, -1}, + {9, 0, 1, 8, 4, 7, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1}, + {4, 7, 11, 9, 4, 11, 9, 11, 2, 9, 2, 1, -1, -1, -1, -1}, + {3, 10, 1, 3, 11, 10, 7, 8, 4, -1, -1, -1, -1, -1, -1, -1}, + {1, 11, 10, 1, 4, 11, 1, 0, 4, 7, 11, 4, -1, -1, -1, -1}, + {4, 7, 8, 9, 0, 11, 9, 11, 10, 11, 0, 3, -1, -1, -1, -1}, + {4, 7, 11, 4, 11, 9, 9, 11, 10, -1, -1, -1, -1, -1, -1, -1}, + {9, 5, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {9, 5, 4, 0, 8, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 5, 4, 1, 5, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {8, 5, 4, 8, 3, 5, 3, 1, 5, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 10, 9, 5, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {3, 0, 8, 1, 2, 10, 4, 9, 5, -1, -1, -1, -1, -1, -1, -1}, + {5, 2, 10, 5, 4, 2, 4, 0, 2, -1, -1, -1, -1, -1, -1, -1}, + {2, 10, 5, 3, 2, 5, 3, 5, 4, 3, 4, 8, -1, -1, -1, -1}, + {9, 5, 4, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 11, 2, 0, 8, 11, 4, 9, 5, -1, -1, -1, -1, -1, -1, -1}, + {0, 5, 4, 0, 1, 5, 2, 3, 11, -1, -1, -1, -1, -1, -1, -1}, + {2, 1, 5, 2, 5, 8, 2, 8, 11, 4, 8, 5, -1, -1, -1, -1}, + {10, 3, 11, 10, 1, 3, 9, 5, 4, -1, -1, -1, -1, -1, -1, -1}, + {4, 9, 5, 0, 8, 1, 8, 10, 1, 8, 11, 10, -1, -1, -1, -1}, + {5, 4, 0, 5, 0, 11, 5, 11, 10, 11, 0, 3, -1, -1, -1, -1}, + {5, 4, 8, 5, 8, 10, 10, 8, 11, -1, -1, -1, -1, -1, -1, -1}, + {9, 7, 8, 5, 7, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {9, 3, 0, 9, 5, 3, 5, 7, 3, -1, -1, -1, -1, -1, -1, -1}, + {0, 7, 8, 0, 1, 7, 1, 5, 7, -1, -1, -1, -1, -1, -1, -1}, + {1, 5, 3, 3, 5, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {9, 7, 8, 9, 5, 7, 10, 1, 2, -1, -1, -1, -1, -1, -1, -1}, + {10, 1, 2, 9, 5, 0, 5, 3, 0, 5, 7, 3, -1, -1, -1, -1}, + {8, 0, 2, 8, 2, 5, 8, 5, 7, 10, 5, 2, -1, -1, -1, -1}, + {2, 10, 5, 2, 5, 3, 3, 5, 7, -1, -1, -1, -1, -1, -1, -1}, + {7, 9, 5, 7, 8, 9, 3, 11, 2, -1, -1, -1, -1, -1, -1, -1}, + {9, 5, 7, 9, 7, 2, 9, 2, 0, 2, 7, 11, -1, -1, -1, -1}, + {2, 3, 11, 0, 1, 8, 1, 7, 8, 1, 5, 7, -1, -1, -1, -1}, + {11, 2, 1, 11, 1, 7, 7, 1, 5, -1, -1, -1, -1, -1, -1, -1}, + {9, 5, 8, 8, 5, 7, 10, 1, 3, 10, 3, 11, -1, -1, -1, -1}, + {5, 7, 0, 5, 0, 9, 7, 11, 0, 1, 0, 10, 11, 10, 0, -1}, + {11, 10, 0, 11, 0, 3, 10, 5, 0, 8, 0, 7, 5, 7, 0, -1}, + {11, 10, 5, 7, 11, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {10, 6, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 3, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {9, 0, 1, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 8, 3, 1, 9, 8, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1}, + {1, 6, 5, 2, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 6, 5, 1, 2, 6, 3, 0, 8, -1, -1, -1, -1, -1, -1, -1}, + {9, 6, 5, 9, 0, 6, 0, 2, 6, -1, -1, -1, -1, -1, -1, -1}, + {5, 9, 8, 5, 8, 2, 5, 2, 6, 3, 2, 8, -1, -1, -1, -1}, + {2, 3, 11, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {11, 0, 8, 11, 2, 0, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1}, + {0, 1, 9, 2, 3, 11, 5, 10, 6, -1, -1, -1, -1, -1, -1, -1}, + {5, 10, 6, 1, 9, 2, 9, 11, 2, 9, 8, 11, -1, -1, -1, -1}, + {6, 3, 11, 6, 5, 3, 5, 1, 3, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 11, 0, 11, 5, 0, 5, 1, 5, 11, 6, -1, -1, -1, -1}, + {3, 11, 6, 0, 3, 6, 0, 6, 5, 0, 5, 9, -1, -1, -1, -1}, + {6, 5, 9, 6, 9, 11, 11, 9, 8, -1, -1, -1, -1, -1, -1, -1}, + {5, 10, 6, 4, 7, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 3, 0, 4, 7, 3, 6, 5, 10, -1, -1, -1, -1, -1, -1, -1}, + {1, 9, 0, 5, 10, 6, 8, 4, 7, -1, -1, -1, -1, -1, -1, -1}, + {10, 6, 5, 1, 9, 7, 1, 7, 3, 7, 9, 4, -1, -1, -1, -1}, + {6, 1, 2, 6, 5, 1, 4, 7, 8, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 5, 5, 2, 6, 3, 0, 4, 3, 4, 7, -1, -1, -1, -1}, + {8, 4, 7, 9, 0, 5, 0, 6, 5, 0, 2, 6, -1, -1, -1, -1}, + {7, 3, 9, 7, 9, 4, 3, 2, 9, 5, 9, 6, 2, 6, 9, -1}, + {3, 11, 2, 7, 8, 4, 10, 6, 5, -1, -1, -1, -1, -1, -1, -1}, + {5, 10, 6, 4, 7, 2, 4, 2, 0, 2, 7, 11, -1, -1, -1, -1}, + {0, 1, 9, 4, 7, 8, 2, 3, 11, 5, 10, 6, -1, -1, -1, -1}, + {9, 2, 1, 9, 11, 2, 9, 4, 11, 7, 11, 4, 5, 10, 6, -1}, + {8, 4, 7, 3, 11, 5, 3, 5, 1, 5, 11, 6, -1, -1, -1, -1}, + {5, 1, 11, 5, 11, 6, 1, 0, 11, 7, 11, 4, 0, 4, 11, -1}, + {0, 5, 9, 0, 6, 5, 0, 3, 6, 11, 6, 3, 8, 4, 7, -1}, + {6, 5, 9, 6, 9, 11, 4, 7, 9, 7, 11, 9, -1, -1, -1, -1}, + {10, 4, 9, 6, 4, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 10, 6, 4, 9, 10, 0, 8, 3, -1, -1, -1, -1, -1, -1, -1}, + + + {10, 0, 1, 10, 6, 0, 6, 4, 0, -1, -1, -1, -1, -1, -1, -1}, + {8, 3, 1, 8, 1, 6, 8, 6, 4, 6, 1, 10, -1, -1, -1, -1}, + {1, 4, 9, 1, 2, 4, 2, 6, 4, -1, -1, -1, -1, -1, -1, -1}, + {3, 0, 8, 1, 2, 9, 2, 4, 9, 2, 6, 4, -1, -1, -1, -1}, + {0, 2, 4, 4, 2, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {8, 3, 2, 8, 2, 4, 4, 2, 6, -1, -1, -1, -1, -1, -1, -1}, + {10, 4, 9, 10, 6, 4, 11, 2, 3, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 2, 2, 8, 11, 4, 9, 10, 4, 10, 6, -1, -1, -1, -1}, + {3, 11, 2, 0, 1, 6, 0, 6, 4, 6, 1, 10, -1, -1, -1, -1}, + {6, 4, 1, 6, 1, 10, 4, 8, 1, 2, 1, 11, 8, 11, 1, -1}, + {9, 6, 4, 9, 3, 6, 9, 1, 3, 11, 6, 3, -1, -1, -1, -1}, + {8, 11, 1, 8, 1, 0, 11, 6, 1, 9, 1, 4, 6, 4, 1, -1}, + {3, 11, 6, 3, 6, 0, 0, 6, 4, -1, -1, -1, -1, -1, -1, -1}, + {6, 4, 8, 11, 6, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {7, 10, 6, 7, 8, 10, 8, 9, 10, -1, -1, -1, -1, -1, -1, -1}, + {0, 7, 3, 0, 10, 7, 0, 9, 10, 6, 7, 10, -1, -1, -1, -1}, + {10, 6, 7, 1, 10, 7, 1, 7, 8, 1, 8, 0, -1, -1, -1, -1}, + {10, 6, 7, 10, 7, 1, 1, 7, 3, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 6, 1, 6, 8, 1, 8, 9, 8, 6, 7, -1, -1, -1, -1}, + {2, 6, 9, 2, 9, 1, 6, 7, 9, 0, 9, 3, 7, 3, 9, -1}, + {7, 8, 0, 7, 0, 6, 6, 0, 2, -1, -1, -1, -1, -1, -1, -1}, + {7, 3, 2, 6, 7, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {2, 3, 11, 10, 6, 8, 10, 8, 9, 8, 6, 7, -1, -1, -1, -1}, + {2, 0, 7, 2, 7, 11, 0, 9, 7, 6, 7, 10, 9, 10, 7, -1}, + {1, 8, 0, 1, 7, 8, 1, 10, 7, 6, 7, 10, 2, 3, 11, -1}, + {11, 2, 1, 11, 1, 7, 10, 6, 1, 6, 7, 1, -1, -1, -1, -1}, + {8, 9, 6, 8, 6, 7, 9, 1, 6, 11, 6, 3, 1, 3, 6, -1}, + {0, 9, 1, 11, 6, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {7, 8, 0, 7, 0, 6, 3, 11, 0, 11, 6, 0, -1, -1, -1, -1}, + {7, 11, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {7, 6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {3, 0, 8, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 1, 9, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {8, 1, 9, 8, 3, 1, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1}, + {10, 1, 2, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 10, 3, 0, 8, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1}, + {2, 9, 0, 2, 10, 9, 6, 11, 7, -1, -1, -1, -1, -1, -1, -1}, + {6, 11, 7, 2, 10, 3, 10, 8, 3, 10, 9, 8, -1, -1, -1, -1}, + {7, 2, 3, 6, 2, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {7, 0, 8, 7, 6, 0, 6, 2, 0, -1, -1, -1, -1, -1, -1, -1}, + {2, 7, 6, 2, 3, 7, 0, 1, 9, -1, -1, -1, -1, -1, -1, -1}, + {1, 6, 2, 1, 8, 6, 1, 9, 8, 8, 7, 6, -1, -1, -1, -1}, + {10, 7, 6, 10, 1, 7, 1, 3, 7, -1, -1, -1, -1, -1, -1, -1}, + {10, 7, 6, 1, 7, 10, 1, 8, 7, 1, 0, 8, -1, -1, -1, -1}, + {0, 3, 7, 0, 7, 10, 0, 10, 9, 6, 10, 7, -1, -1, -1, -1}, + {7, 6, 10, 7, 10, 8, 8, 10, 9, -1, -1, -1, -1, -1, -1, -1}, + {6, 8, 4, 11, 8, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {3, 6, 11, 3, 0, 6, 0, 4, 6, -1, -1, -1, -1, -1, -1, -1}, + {8, 6, 11, 8, 4, 6, 9, 0, 1, -1, -1, -1, -1, -1, -1, -1}, + {9, 4, 6, 9, 6, 3, 9, 3, 1, 11, 3, 6, -1, -1, -1, -1}, + {6, 8, 4, 6, 11, 8, 2, 10, 1, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 10, 3, 0, 11, 0, 6, 11, 0, 4, 6, -1, -1, -1, -1}, + {4, 11, 8, 4, 6, 11, 0, 2, 9, 2, 10, 9, -1, -1, -1, -1}, + {10, 9, 3, 10, 3, 2, 9, 4, 3, 11, 3, 6, 4, 6, 3, -1}, + {8, 2, 3, 8, 4, 2, 4, 6, 2, -1, -1, -1, -1, -1, -1, -1}, + {0, 4, 2, 4, 6, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 9, 0, 2, 3, 4, 2, 4, 6, 4, 3, 8, -1, -1, -1, -1}, + {1, 9, 4, 1, 4, 2, 2, 4, 6, -1, -1, -1, -1, -1, -1, -1}, + + + {8, 1, 3, 8, 6, 1, 8, 4, 6, 6, 10, 1, -1, -1, -1, -1}, + {10, 1, 0, 10, 0, 6, 6, 0, 4, -1, -1, -1, -1, -1, -1, -1}, + {4, 6, 3, 4, 3, 8, 6, 10, 3, 0, 3, 9, 10, 9, 3, -1}, + {10, 9, 4, 6, 10, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 9, 5, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 3, 4, 9, 5, 11, 7, 6, -1, -1, -1, -1, -1, -1, -1}, + {5, 0, 1, 5, 4, 0, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1}, + {11, 7, 6, 8, 3, 4, 3, 5, 4, 3, 1, 5, -1, -1, -1, -1}, + {9, 5, 4, 10, 1, 2, 7, 6, 11, -1, -1, -1, -1, -1, -1, -1}, + {6, 11, 7, 1, 2, 10, 0, 8, 3, 4, 9, 5, -1, -1, -1, -1}, + {7, 6, 11, 5, 4, 10, 4, 2, 10, 4, 0, 2, -1, -1, -1, -1}, + {3, 4, 8, 3, 5, 4, 3, 2, 5, 10, 5, 2, 11, 7, 6, -1}, + {7, 2, 3, 7, 6, 2, 5, 4, 9, -1, -1, -1, -1, -1, -1, -1}, + {9, 5, 4, 0, 8, 6, 0, 6, 2, 6, 8, 7, -1, -1, -1, -1}, + {3, 6, 2, 3, 7, 6, 1, 5, 0, 5, 4, 0, -1, -1, -1, -1}, + {6, 2, 8, 6, 8, 7, 2, 1, 8, 4, 8, 5, 1, 5, 8, -1}, + {9, 5, 4, 10, 1, 6, 1, 7, 6, 1, 3, 7, -1, -1, -1, -1}, + {1, 6, 10, 1, 7, 6, 1, 0, 7, 8, 7, 0, 9, 5, 4, -1}, + {4, 0, 10, 4, 10, 5, 0, 3, 10, 6, 10, 7, 3, 7, 10, -1}, + {7, 6, 10, 7, 10, 8, 5, 4, 10, 4, 8, 10, -1, -1, -1, -1}, + {6, 9, 5, 6, 11, 9, 11, 8, 9, -1, -1, -1, -1, -1, -1, -1}, + {3, 6, 11, 0, 6, 3, 0, 5, 6, 0, 9, 5, -1, -1, -1, -1}, + {0, 11, 8, 0, 5, 11, 0, 1, 5, 5, 6, 11, -1, -1, -1, -1}, + {6, 11, 3, 6, 3, 5, 5, 3, 1, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 10, 9, 5, 11, 9, 11, 8, 11, 5, 6, -1, -1, -1, -1}, + {0, 11, 3, 0, 6, 11, 0, 9, 6, 5, 6, 9, 1, 2, 10, -1}, + {11, 8, 5, 11, 5, 6, 8, 0, 5, 10, 5, 2, 0, 2, 5, -1}, + {6, 11, 3, 6, 3, 5, 2, 10, 3, 10, 5, 3, -1, -1, -1, -1}, + {5, 8, 9, 5, 2, 8, 5, 6, 2, 3, 8, 2, -1, -1, -1, -1}, + {9, 5, 6, 9, 6, 0, 0, 6, 2, -1, -1, -1, -1, -1, -1, -1}, + {1, 5, 8, 1, 8, 0, 5, 6, 8, 3, 8, 2, 6, 2, 8, -1}, + {1, 5, 6, 2, 1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 3, 6, 1, 6, 10, 3, 8, 6, 5, 6, 9, 8, 9, 6, -1}, + {10, 1, 0, 10, 0, 6, 9, 5, 0, 5, 6, 0, -1, -1, -1, -1}, + {0, 3, 8, 5, 6, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {10, 5, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {11, 5, 10, 7, 5, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {11, 5, 10, 11, 7, 5, 8, 3, 0, -1, -1, -1, -1, -1, -1, -1}, + {5, 11, 7, 5, 10, 11, 1, 9, 0, -1, -1, -1, -1, -1, -1, -1}, + {10, 7, 5, 10, 11, 7, 9, 8, 1, 8, 3, 1, -1, -1, -1, -1}, + {11, 1, 2, 11, 7, 1, 7, 5, 1, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 3, 1, 2, 7, 1, 7, 5, 7, 2, 11, -1, -1, -1, -1}, + {9, 7, 5, 9, 2, 7, 9, 0, 2, 2, 11, 7, -1, -1, -1, -1}, + {7, 5, 2, 7, 2, 11, 5, 9, 2, 3, 2, 8, 9, 8, 2, -1}, + {2, 5, 10, 2, 3, 5, 3, 7, 5, -1, -1, -1, -1, -1, -1, -1}, + {8, 2, 0, 8, 5, 2, 8, 7, 5, 10, 2, 5, -1, -1, -1, -1}, + {9, 0, 1, 5, 10, 3, 5, 3, 7, 3, 10, 2, -1, -1, -1, -1}, + {9, 8, 2, 9, 2, 1, 8, 7, 2, 10, 2, 5, 7, 5, 2, -1}, + {1, 3, 5, 3, 7, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 7, 0, 7, 1, 1, 7, 5, -1, -1, -1, -1, -1, -1, -1}, + {9, 0, 3, 9, 3, 5, 5, 3, 7, -1, -1, -1, -1, -1, -1, -1}, + {9, 8, 7, 5, 9, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {5, 8, 4, 5, 10, 8, 10, 11, 8, -1, -1, -1, -1, -1, -1, -1}, + {5, 0, 4, 5, 11, 0, 5, 10, 11, 11, 3, 0, -1, -1, -1, -1}, + {0, 1, 9, 8, 4, 10, 8, 10, 11, 10, 4, 5, -1, -1, -1, -1}, + {10, 11, 4, 10, 4, 5, 11, 3, 4, 9, 4, 1, 3, 1, 4, -1}, + {2, 5, 1, 2, 8, 5, 2, 11, 8, 4, 5, 8, -1, -1, -1, -1}, + {0, 4, 11, 0, 11, 3, 4, 5, 11, 2, 11, 1, 5, 1, 11, -1}, + {0, 2, 5, 0, 5, 9, 2, 11, 5, 4, 5, 8, 11, 8, 5, -1}, + {9, 4, 5, 2, 11, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {2, 5, 10, 3, 5, 2, 3, 4, 5, 3, 8, 4, -1, -1, -1, -1}, + {5, 10, 2, 5, 2, 4, 4, 2, 0, -1, -1, -1, -1, -1, -1, -1}, + {3, 10, 2, 3, 5, 10, 3, 8, 5, 4, 5, 8, 0, 1, 9, -1}, + {5, 10, 2, 5, 2, 4, 1, 9, 2, 9, 4, 2, -1, -1, -1, -1}, + {8, 4, 5, 8, 5, 3, 3, 5, 1, -1, -1, -1, -1, -1, -1, -1}, + {0, 4, 5, 1, 0, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {8, 4, 5, 8, 5, 3, 9, 0, 5, 0, 3, 5, -1, -1, -1, -1}, + {9, 4, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 11, 7, 4, 9, 11, 9, 10, 11, -1, -1, -1, -1, -1, -1, -1}, + {0, 8, 3, 4, 9, 7, 9, 11, 7, 9, 10, 11, -1, -1, -1, -1}, + {1, 10, 11, 1, 11, 4, 1, 4, 0, 7, 4, 11, -1, -1, -1, -1}, + {3, 1, 4, 3, 4, 8, 1, 10, 4, 7, 4, 11, 10, 11, 4, -1}, + {4, 11, 7, 9, 11, 4, 9, 2, 11, 9, 1, 2, -1, -1, -1, -1}, + {9, 7, 4, 9, 11, 7, 9, 1, 11, 2, 11, 1, 0, 8, 3, -1}, + {11, 7, 4, 11, 4, 2, 2, 4, 0, -1, -1, -1, -1, -1, -1, -1}, + {11, 7, 4, 11, 4, 2, 8, 3, 4, 3, 2, 4, -1, -1, -1, -1}, + {2, 9, 10, 2, 7, 9, 2, 3, 7, 7, 4, 9, -1, -1, -1, -1}, + {9, 10, 7, 9, 7, 4, 10, 2, 7, 8, 7, 0, 2, 0, 7, -1}, + {3, 7, 10, 3, 10, 2, 7, 4, 10, 1, 10, 0, 4, 0, 10, -1}, + {1, 10, 2, 8, 7, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 9, 1, 4, 1, 7, 7, 1, 3, -1, -1, -1, -1, -1, -1, -1}, + {4, 9, 1, 4, 1, 7, 0, 8, 1, 8, 7, 1, -1, -1, -1, -1}, + {4, 0, 3, 7, 4, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 8, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {9, 10, 8, 10, 11, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {3, 0, 9, 3, 9, 11, 11, 9, 10, -1, -1, -1, -1, -1, -1, -1}, + {0, 1, 10, 0, 10, 8, 8, 10, 11, -1, -1, -1, -1, -1, -1, -1}, + {3, 1, 10, 11, 3, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 2, 11, 1, 11, 9, 9, 11, 8, -1, -1, -1, -1, -1, -1, -1}, + {3, 0, 9, 3, 9, 11, 1, 2, 9, 2, 11, 9, -1, -1, -1, -1}, + {0, 2, 11, 8, 0, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {3, 2, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {2, 3, 8, 2, 8, 10, 10, 8, 9, -1, -1, -1, -1, -1, -1, -1}, + {9, 10, 2, 0, 9, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {2, 3, 8, 2, 8, 10, 0, 1, 8, 1, 10, 8, -1, -1, -1, -1}, + {1, 10, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 3, 8, 9, 1, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 9, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 3, 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}}; + + + private int[] edgeTable = new int[] { + 0x0 , 0x109, 0x203, 0x30a, 0x406, 0x50f, 0x605, 0x70c, + 0x80c, 0x905, 0xa0f, 0xb06, 0xc0a, 0xd03, 0xe09, 0xf00, + 0x190, 0x99 , 0x393, 0x29a, 0x596, 0x49f, 0x795, 0x69c, + 0x99c, 0x895, 0xb9f, 0xa96, 0xd9a, 0xc93, 0xf99, 0xe90, + 0x230, 0x339, 0x33 , 0x13a, 0x636, 0x73f, 0x435, 0x53c, + 0xa3c, 0xb35, 0x83f, 0x936, 0xe3a, 0xf33, 0xc39, 0xd30, + 0x3a0, 0x2a9, 0x1a3, 0xaa , 0x7a6, 0x6af, 0x5a5, 0x4ac, + 0xbac, 0xaa5, 0x9af, 0x8a6, 0xfaa, 0xea3, 0xda9, 0xca0, + 0x460, 0x569, 0x663, 0x76a, 0x66 , 0x16f, 0x265, 0x36c, + 0xc6c, 0xd65, 0xe6f, 0xf66, 0x86a, 0x963, 0xa69, 0xb60, + 0x5f0, 0x4f9, 0x7f3, 0x6fa, 0x1f6, 0xff , 0x3f5, 0x2fc, + 0xdfc, 0xcf5, 0xfff, 0xef6, 0x9fa, 0x8f3, 0xbf9, 0xaf0, + 0x650, 0x759, 0x453, 0x55a, 0x256, 0x35f, 0x55 , 0x15c, + 0xe5c, 0xf55, 0xc5f, 0xd56, 0xa5a, 0xb53, 0x859, 0x950, + 0x7c0, 0x6c9, 0x5c3, 0x4ca, 0x3c6, 0x2cf, 0x1c5, 0xcc , + 0xfcc, 0xec5, 0xdcf, 0xcc6, 0xbca, 0xac3, 0x9c9, 0x8c0, + 0x8c0, 0x9c9, 0xac3, 0xbca, 0xcc6, 0xdcf, 0xec5, 0xfcc, + 0xcc , 0x1c5, 0x2cf, 0x3c6, 0x4ca, 0x5c3, 0x6c9, 0x7c0, + 0x950, 0x859, 0xb53, 0xa5a, 0xd56, 0xc5f, 0xf55, 0xe5c, + 0x15c, 0x55 , 0x35f, 0x256, 0x55a, 0x453, 0x759, 0x650, + 0xaf0, 0xbf9, 0x8f3, 0x9fa, 0xef6, 0xfff, 0xcf5, 0xdfc, + 0x2fc, 0x3f5, 0xff , 0x1f6, 0x6fa, 0x7f3, 0x4f9, 0x5f0, + 0xb60, 0xa69, 0x963, 0x86a, 0xf66, 0xe6f, 0xd65, 0xc6c, + 0x36c, 0x265, 0x16f, 0x66 , 0x76a, 0x663, 0x569, 0x460, + 0xca0, 0xda9, 0xea3, 0xfaa, 0x8a6, 0x9af, 0xaa5, 0xbac, + 0x4ac, 0x5a5, 0x6af, 0x7a6, 0xaa , 0x1a3, 0x2a9, 0x3a0, + 0xd30, 0xc39, 0xf33, 0xe3a, 0x936, 0x83f, 0xb35, 0xa3c, + 0x53c, 0x435, 0x73f, 0x636, 0x13a, 0x33 , 0x339, 0x230, + 0xe90, 0xf99, 0xc93, 0xd9a, 0xa96, 0xb9f, 0x895, 0x99c, + 0x69c, 0x795, 0x49f, 0x596, 0x29a, 0x393, 0x99 , 0x190, + 0xf00, 0xe09, 0xd03, 0xc0a, 0xb06, 0xa0f, 0x905, 0x80c, + 0x70c, 0x605, 0x50f, 0x406, 0x30a, 0x203, 0x109, 0x0 }; + } +} From deb18acaf17d60bbe52097829e42528a537009b8 Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 10 Mar 2020 15:58:27 +0200 Subject: [PATCH 036/120] Create HueContrastSaturation.shader --- .../3D/Standard/HueContrastSaturation.shader | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 Assets/Shaders/3D/Standard/HueContrastSaturation.shader diff --git a/Assets/Shaders/3D/Standard/HueContrastSaturation.shader b/Assets/Shaders/3D/Standard/HueContrastSaturation.shader new file mode 100644 index 0000000..ede2a56 --- /dev/null +++ b/Assets/Shaders/3D/Standard/HueContrastSaturation.shader @@ -0,0 +1,89 @@ +// source https://forum.unity.com/threads/adding-hue-saturation-and-contrast-to-standardshader.843697/#post-5572063 + +Shader "UnityLibrary/Standard/HueContrastSaturation" +{ + Properties + { + _Color ("Color", Color) = (1,1,1,1) + _MainTex ("Albedo Map", 2D) = "black" {} + _BumpMap ("Normal Map", 2D) = "bump" {} + _MetallicGlossMap ("Metallic (R) Smoothness (A) Map", 2D) = "black" {} + _Hue ("Hue", Float) = 1.0 + _Contrast ("Contrast", Float) = 1.0 + _Saturation ("Saturation", Float) = 1.0 + } + + Subshader + { + Tags { "RenderType" = "Opaque" } + CGPROGRAM + #pragma surface SurfaceShader Standard fullforwardshadows addshadow + + sampler2D _MainTex, _BumpMap, _MetallicGlossMap; + float4 _Color; + float _Hue, _Contrast, _Saturation; + + float4x4 contrastMatrix (float c) + { + float t = (1.0 - c) * 0.5; + return float4x4 (c, 0, 0, 0, 0, c, 0, 0, 0, 0, c, 0, t, t, t, 1); + } + + float3 RGBToHSV(float3 c) + { + float4 K = float4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0); + float4 p = lerp( float4( c.bg, K.wz ), float4( c.gb, K.xy ), step( c.b, c.g ) ); + float4 q = lerp( float4( p.xyw, c.r ), float4( c.r, p.yzx ), step( p.x, c.r ) ); + float d = q.x - min( q.w, q.y ); + float e = 1.0e-10; + return float3( abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x); + } + + float3 HSVToRGB( float3 c ) + { + float4 K = float4( 1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0 ); + float3 p = abs( frac( c.xxx + K.xyz ) * 6.0 - K.www ); + return c.z * lerp( K.xxx, saturate( p - K.xxx ), c.y ); + } + + float3 Hue( float3 p, float v ) + { + p = RGBToHSV(p); + p.x *= v; + return HSVToRGB(p); + } + + float3 Saturation( float3 p, float v ) + { + p = RGBToHSV(p); + p.y *= v; + return HSVToRGB(p); + } + + float3 Contrast( float3 p, float v ) + { + return mul(float4(p,1.0), contrastMatrix(v)).rgb; + } + + struct Input + { + float2 uv_MainTex; + float2 uv_BumpMap; + float2 uv_MetallicGlossMap; + }; + + void SurfaceShader (Input IN, inout SurfaceOutputStandard o) + { + float4 color = tex2D(_MainTex,IN.uv_MainTex) * _Color; + color.rgb = Hue(color.rgb, _Hue); + color.rgb = Saturation(color.rgb, _Saturation); + color.rgb = Contrast(color.rgb, _Contrast); + o.Albedo = color; + o.Normal = UnpackNormal (tex2D(_BumpMap, IN.uv_BumpMap)); + o.Metallic = tex2D(_MetallicGlossMap, IN.uv_MetallicGlossMap).r; + o.Smoothness = tex2D(_MetallicGlossMap, IN.uv_MetallicGlossMap).a; + } + + ENDCG + } +} From 7da698ce01053da161b2f7174cea2f73b0690fca Mon Sep 17 00:00:00 2001 From: mika Date: Wed, 11 Mar 2020 11:12:47 +0200 Subject: [PATCH 037/120] Create MeshCombineWizard.cs --- .../Scripts/Editor/Mesh/MeshCombineWizard.cs | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs diff --git a/Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs b/Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs new file mode 100644 index 0000000..5406c35 --- /dev/null +++ b/Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs @@ -0,0 +1,127 @@ +// from https://forum.unity.com/threads/mesh-combine-wizard-free-unity-tool-source-code.444483/#post-5575042 + +using UnityEngine; +using UnityEditor; +using System.Collections.Generic; +using System.Linq; + +namespace UnityLibrary +{ + public class MeshCombineWizard : ScriptableWizard + { + public GameObject parentOfObjectsToCombine; + + [MenuItem("E.S. Tools/Mesh Combine Wizard")] + static void CreateWizard() + { + ScriptableWizard.DisplayWizard("Mesh Combine Wizard"); + } + + void OnWizardCreate() + { + if (parentOfObjectsToCombine == null) return; + + Vector3 originalPosition = parentOfObjectsToCombine.transform.position; + parentOfObjectsToCombine.transform.position = Vector3.zero; + + MeshFilter[] meshFilters = parentOfObjectsToCombine.GetComponentsInChildren(); + Dictionary> materialToMeshFilterList = new Dictionary>(); + List combinedObjects = new List(); + + for (int i = 0; i < meshFilters.Length; i++) + { + var materials = meshFilters[i].GetComponent().sharedMaterials; + if (materials == null) continue; + if (materials.Length > 1) + { + parentOfObjectsToCombine.transform.position = originalPosition; + Debug.LogError("Objects with multiple materials on the same mesh are not supported. Create multiple meshes from this object's sub-meshes in an external 3D tool and assign separate materials to each."); + return; + } + var material = materials[0]; + if (materialToMeshFilterList.ContainsKey(material)) materialToMeshFilterList[material].Add(meshFilters[i]); + else materialToMeshFilterList.Add(material, new List() { meshFilters[i] }); + } + + + // NC 03/2020 changes the loop to create meshes smaller than 695536 vertices + foreach (var entry in materialToMeshFilterList) + { + // get list of each meshes order by number of vertices + List meshesWithSameMaterial = entry.Value.OrderByDescending(mf => mf.sharedMesh.vertexCount).ToList(); + // split into bins of 65536 vertices max + int nrMeshes = meshesWithSameMaterial.Count; + while (nrMeshes > 0) + { + string materialName = entry.Key.ToString().Split(' ')[0]; + List meshBin = new List(); + meshBin.Add(meshesWithSameMaterial[0]); + meshesWithSameMaterial.RemoveAt(0); + nrMeshes--; + // add meshes in bin until 65536 vertices is reached + for (int i = 0; i < meshesWithSameMaterial.Count; i++) + { + if (meshBin.Sum(mf => mf.sharedMesh.vertexCount) + meshesWithSameMaterial[i].sharedMesh.vertexCount < 65536) + { + meshBin.Add(meshesWithSameMaterial[i]); + meshesWithSameMaterial.RemoveAt(i); + i--; + nrMeshes--; + } + } + + // merge this bin + CombineInstance[] combine = new CombineInstance[meshBin.Count]; + for (int i = 0; i < meshBin.Count; i++) + { + combine[i].mesh = meshBin[i].sharedMesh; + combine[i].transform = meshBin[i].transform.localToWorldMatrix; + } + Mesh combinedMesh = new Mesh(); + combinedMesh.CombineMeshes(combine); + + // save the mesh + materialName += "_" + combinedMesh.GetInstanceID(); + if (meshBin.Count > 1) + { + AssetDatabase.CreateAsset(combinedMesh, "Assets/CombinedMeshes_" + materialName + ".asset"); ; + } + + // assign the mesh to a new go + string goName = (materialToMeshFilterList.Count > 1) ? "CombinedMeshes_" + materialName : "CombinedMeshes_" + parentOfObjectsToCombine.name; + GameObject combinedObject = new GameObject(goName); + var filter = combinedObject.AddComponent(); + if (meshBin.Count > 1) + { + filter.sharedMesh = combinedMesh; + } + else + { + filter.sharedMesh = meshBin[0].sharedMesh; // the original mesh + } + var renderer = combinedObject.AddComponent(); + renderer.sharedMaterial = entry.Key; + combinedObjects.Add(combinedObject); + } + } + + GameObject resultGO = null; + if (combinedObjects.Count > 1) + { + resultGO = new GameObject("CombinedMeshes_" + parentOfObjectsToCombine.name); + foreach (var combinedObject in combinedObjects) combinedObject.transform.parent = resultGO.transform; + } + else + { + resultGO = combinedObjects[0]; + } + + Object prefab = PrefabUtility.CreateEmptyPrefab("Assets/" + resultGO.name + ".prefab"); + PrefabUtility.ReplacePrefab(resultGO, prefab, ReplacePrefabOptions.ConnectToPrefab); + + parentOfObjectsToCombine.SetActive(false); + parentOfObjectsToCombine.transform.position = originalPosition; + resultGO.transform.position = originalPosition; + } + } +} From ef1910f145f72db3e64fb157ef1c66e8d8d21d67 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 13 Mar 2020 14:59:49 +0200 Subject: [PATCH 038/120] Create ScrollingFill.shader --- .../Shaders/2D/Patterns/ScrollingFill.shader | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 Assets/Shaders/2D/Patterns/ScrollingFill.shader diff --git a/Assets/Shaders/2D/Patterns/ScrollingFill.shader b/Assets/Shaders/2D/Patterns/ScrollingFill.shader new file mode 100644 index 0000000..f6e685e --- /dev/null +++ b/Assets/Shaders/2D/Patterns/ScrollingFill.shader @@ -0,0 +1,70 @@ +// animated scrolling texture with fill amount +// https://unitycoder.com/blog/2020/03/13/shader-scrolling-texture-with-fill-amount/ + +Shader "UnityLibrary/Patterns/ScrollingFill" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + _Fill("Fill", Range(0.0,1.0)) = 0.5 + _Speed("Speed", float) = 5 + } + + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + float _Fill; + float _Speed; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + // get scroll value + float2 scroll = float2(0, frac(_Time.x*_Speed)); + + // sample texture + fixed4 col = tex2D(_MainTex, i.uv -scroll); + + // discard if uv.y is below below cut value + clip(step(i.uv.y, _Fill * _MainTex_ST.y)-0.1); + + return col; + + // make un-animated part black + //return col*step(i.uv.y, _Cut * _MainTex_ST.y); + } + ENDCG + } + } +} From ac11c0ee0d42efd86d962e576eb64c979df6058a Mon Sep 17 00:00:00 2001 From: mika Date: Wed, 18 Mar 2020 17:47:12 +0200 Subject: [PATCH 039/120] Create ColorCycle.shader --- Assets/Shaders/2D/Effects/ColorCycle.shader | 64 +++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 Assets/Shaders/2D/Effects/ColorCycle.shader diff --git a/Assets/Shaders/2D/Effects/ColorCycle.shader b/Assets/Shaders/2D/Effects/ColorCycle.shader new file mode 100644 index 0000000..a41acc0 --- /dev/null +++ b/Assets/Shaders/2D/Effects/ColorCycle.shader @@ -0,0 +1,64 @@ +Shader "UnityLibrary/2D/Effects/ColorCycle" +{ + Properties + { + _MainTex ("Grayscale", 2D) = "white" {} + _GradientTex ("Gradient", 2D) = "white" {} + _Speed("Speed",float) = 1 + } + + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + sampler2D _GradientTex; + float4 _MainTex_ST; + float _Speed; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + // get (grayscale texture) pixel color + float gray = tex2D(_MainTex, i.uv).r; + + // get scrolling + float scroll = frac(_Time.x*_Speed); + + // get gradient color from texture + fixed4 col = tex2D(_GradientTex,float2(gray+scroll,0.5)); + + return col; + } + ENDCG + } + } +} From e1c6de5dc3e97ed1c81e5d652cecc185e05e1e0a Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 17 Apr 2020 15:44:47 +0300 Subject: [PATCH 040/120] fix top10 sorting, add gameobject ping button, show top20 --- .../Editor/Tools/GetSelectedMeshInfo.cs | 56 +++++++++++++------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs index 6124981..67164bd 100644 --- a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs +++ b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs @@ -1,6 +1,7 @@ // display selected gameobject mesh stats (should work on prefabs,models in project window also) using System.Collections.Generic; +using System.Linq; using UnityEditor; using UnityEngine; @@ -14,7 +15,9 @@ public class GetSelectedMeshInfo : EditorWindow int totalVertices = 0; int totalTris = 0; - List top10 = new List(); + Dictionary topList = new Dictionary(); + IOrderedEnumerable> sortedTopList; + MeshFilter[] meshes; [MenuItem("Tools/UnityLibrary/GetMeshInfo")] @@ -26,21 +29,32 @@ public static void ShowWindow() void OnGUI() { + // TODO process all selected gameobjects var selection = Selection.activeGameObject; - if (selection != null) + + // if have selection + if (selection == null) + { + EditorGUILayout.LabelField("Select gameobject from scene or hierarchy.."); + + } + else { EditorGUILayout.LabelField("Selected: " + selection.name); // update mesh info only if selection changed if (selectionChanged == true) { - top10.Clear(); + selectionChanged = false; + + // clear old top results + topList.Clear(); totalMeshes = 0; totalVertices = 0; totalTris = 0; - // get all meshes + // check all meshes meshes = selection.GetComponentsInChildren(); for (int i = 0, length = meshes.Length; i < length; i++) { @@ -48,12 +62,11 @@ void OnGUI() totalVertices += verts; totalTris += meshes[i].sharedMesh.triangles.Length / 3; totalMeshes++; - top10.Add(verts); + topList.Add(i, verts); } - selectionChanged = false; - // sort top10 - top10.Sort(); + // sort top list + sortedTopList = topList.OrderByDescending(x => x.Value); } // display stats @@ -61,23 +74,30 @@ void OnGUI() EditorGUILayout.LabelField("Vertices: " + totalVertices); EditorGUILayout.LabelField("Triangles: " + totalTris); EditorGUILayout.Space(); - EditorGUILayout.LabelField("TOP 10", EditorStyles.boldLabel); + EditorGUILayout.LabelField("TOP 20", EditorStyles.boldLabel); // top 10 - if (meshes != null) + if (meshes != null && sortedTopList != null) { - // start from last index - int from = meshes.Length; - // until 10 meshes or if less than 10 - int to = meshes.Length - Mathf.Min(10, from); - for (int i = from-1; i >= to; i--) + int i = 0; + foreach (var item in sortedTopList) { - int percent = (int)(top10[i] / (float)totalVertices * 100f); - EditorGUILayout.LabelField(meshes[i].name + " = " + top10[i] + " (" + percent + "%)"); + int percent = (int)(item.Value / (float)totalVertices * 100f); + EditorGUILayout.BeginHorizontal(); + // ping button + if (GUILayout.Button(" ", GUILayout.Width(16))) + { + EditorGUIUtility.PingObject(meshes[i].transform); + } + EditorGUILayout.LabelField(meshes[i].name + " = " + item.Value + " (" + percent + "%)"); + GUILayout.ExpandWidth(true); + EditorGUILayout.EndHorizontal(); + + // show only first 20 + if (++i > 20) break; } } } - } void OnSelectionChange() From 8bae538af93957b15f9233b68266d09081f37ce7 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 29 May 2020 11:39:52 +0300 Subject: [PATCH 041/120] Create SetBoxColliderToUI.cs --- .../Editor/ContextMenu/SetBoxColliderToUI.cs | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs diff --git a/Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs b/Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs new file mode 100644 index 0000000..6b58cf5 --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs @@ -0,0 +1,32 @@ +// Tries to move BoxCollider(3D)-component to match UI panel/image position, by adjusting collider pivot value + +using UnityEngine; +using UnityEditor; + +namespace UnityLibrary +{ + public class SetBoxColliderToUI : MonoBehaviour + { + [MenuItem("CONTEXT/BoxCollider/Match Position to UI")] + static void FixPosition(MenuCommand command) + { + BoxCollider b = (BoxCollider)command.context; + + // record undo + Undo.RecordObject(b.transform, "Set Box Collider To UI"); + + // fix pos from Pivot + var r = b.gameObject.GetComponent(); + if (r == null) return; + + //Debug.Log("pivot "+r.pivot); + + var center = b.center; + + center.x = 0.5f - r.pivot.x; + center.y = 0.5f - r.pivot.y; + + b.center = center; + } + } +} From fcdbc8c57e9c1094a25683b8e78169861b14c863 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 11 Jun 2020 13:10:10 +0300 Subject: [PATCH 042/120] Create BoxColliderFitChildren.cs --- .../ContextMenu/BoxColliderFitChildren.cs | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs diff --git a/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs b/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs new file mode 100644 index 0000000..4e5f0a5 --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs @@ -0,0 +1,45 @@ +// Adjust Box Collider to fit child meshes inside +// usage: You have empty parent transform, with child meshes inside, add box collider to parent then use this + +using UnityEngine; +using UnityEditor; + +namespace UnityLibrary +{ + public class BoxColliderFitChildren : MonoBehaviour + { + [MenuItem("CONTEXT/BoxCollider/Fit to Children")] + static void FixSize(MenuCommand command) + { + BoxCollider col = (BoxCollider)command.context; + + // record undo + Undo.RecordObject(col.transform, "Fit Box Collider To Children"); + + // get child mesh bounds + var b = GetRecursiveMeshBounds(col.gameObject); + + // set collider local center and size + col.center = col.transform.root.InverseTransformVector(b.center) - col.transform.position; + col.size = b.size; + } + + public static Bounds GetRecursiveMeshBounds(GameObject go) + { + var r = go.GetComponentsInChildren(); + if (r.Length > 0) + { + var b = r[0].bounds; + for (int i = 1; i < r.Length; i++) + { + b.Encapsulate(r[i].bounds); + } + return b; + } + else // TODO no renderers + { + return new Bounds(Vector3.one, Vector3.one); + } + } + } +} From b3270aedc8287d80690ef4b034784d5399fee002 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 11 Jun 2020 13:18:35 +0300 Subject: [PATCH 043/120] Update BoxColliderFitChildren.cs --- Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs b/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs index 4e5f0a5..58f7b0d 100644 --- a/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs +++ b/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs @@ -1,5 +1,6 @@ // Adjust Box Collider to fit child meshes inside -// usage: You have empty parent transform, with child meshes inside, add box collider to parent then use this +// Usage: You have empty parent transform, with child meshes inside, add box collider to parent then use this +// NOTE: Doesnt work if root transform is rotated using UnityEngine; using UnityEditor; From c4d5a3e508239b6442db8b18eda9730dd8eafd63 Mon Sep 17 00:00:00 2001 From: LashaBuxo Date: Sun, 14 Jun 2020 16:10:57 +0400 Subject: [PATCH 044/120] Fixed VideoPlayer error while opening in 2017 version --- .../Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs index 23c6600..b15992c 100644 --- a/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs +++ b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs @@ -19,7 +19,12 @@ static void DoubleMass(MenuCommand command) Debug.LogError("No videoclip assigned.."); return; } +#if UNITY_2017 + float aspectRatioY = v.texture.height / (float)v.texture.width; +#else float aspectRatioY = v.height / (float)v.width; +#endif + // record undo Undo.RecordObject(v.transform, "Set scale"); From 724808441c49602fc8a8efa6c3bc63a7ef6a3ff4 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 2 Jul 2020 11:12:44 +0300 Subject: [PATCH 045/120] Create CompileTime.cs --- Assets/Scripts/Editor/Tools/CompileTime.cs | 201 +++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 Assets/Scripts/Editor/Tools/CompileTime.cs diff --git a/Assets/Scripts/Editor/Tools/CompileTime.cs b/Assets/Scripts/Editor/Tools/CompileTime.cs new file mode 100644 index 0000000..89721bc --- /dev/null +++ b/Assets/Scripts/Editor/Tools/CompileTime.cs @@ -0,0 +1,201 @@ +// compile time tracking tool (and quickly enable disable settings, and scene autosave option) +// original source: https://gist.github.com/spajus/72a74146b1bbeddd44a66e1b8a3c829c +// created by https://github.com/spajus twitch https://www.twitch.tv/dev_spajus +// 02.07.2020 added unity_2018_4 check and set autosave off by default - unitycoder.com + +using System; +using System.Collections.Generic; +using UnityEditor; +using UnityEditor.Compilation; +using UnityEditor.SceneManagement; +using UnityEngine; + +namespace UnityLibrary +{ + class CompileTime : EditorWindow + { + bool allowProfiler = false; + bool isTrackingTime; + bool isLockReload; + bool isAutoSave = false; // autosave default off + bool isLocked; + bool restartAfterCompile; + bool memoryWarned; + string lastReloadTime = ""; + string lastCompileTime = ""; + string lastAssCompileTime = ""; + double startTime, finishTime, compileTime, reloadTime; + double assStartTime, assFinishTime, assCompileTime; + Dictionary startTimes = new Dictionary(); + List lastAssCompile; + + [MenuItem("Tools/UnityLibrary/Compile Time")] + public static void Init() + { + EditorWindow.GetWindow(typeof(CompileTime)); + } + + void Update() + { + if (isLockReload) { return; } + if (EditorApplication.isCompiling && !isTrackingTime) + { + if (EditorApplication.isPlaying) + { + restartAfterCompile = true; + EditorApplication.isPlaying = false; + } + startTime = EditorApplication.timeSinceStartup; + lastReloadTime = "Reloading now"; + lastCompileTime = "Compiling now"; + lastAssCompile = new List(); + Debug.Log("Started compiling scripts"); + isTrackingTime = true; + } + else if (!EditorApplication.isCompiling && isTrackingTime) + { + finishTime = EditorApplication.timeSinceStartup; + isTrackingTime = false; + EditorApplication.Beep(); + reloadTime = finishTime - startTime; + lastReloadTime = reloadTime.ToString("0.000") + "s"; + compileTime = reloadTime - assCompileTime; + lastCompileTime = compileTime.ToString("0.000") + "s"; + if (isAutoSave && !EditorApplication.isPlaying) + { + Debug.Log("Auto Saving Scene"); + EditorSceneManager.SaveOpenScenes(); + } + if (restartAfterCompile) + { + restartAfterCompile = false; + EditorApplication.isPlaying = true; + } + } + } + + void OnGUI() + { +#if UNITY_2018_4_OR_NEWER + // Toggle domain reload + var playModeOptsEnabled = EditorSettings.enterPlayModeOptionsEnabled; + playModeOptsEnabled = EditorGUILayout.Toggle("Disable Domain Reload", playModeOptsEnabled); + EditorSettings.enterPlayModeOptionsEnabled = playModeOptsEnabled; +#endif + + if (UnityEngine.Profiling.Profiler.enabled) + { + EditorGUILayout.LabelField("PROFILER ENABLED"); + } + allowProfiler = EditorGUILayout.Toggle("Allow profiler", allowProfiler); + if (!allowProfiler && UnityEngine.Profiling.Profiler.enabled) + { + UnityEngine.Profiling.Profiler.enabled = false; + } + EditorGUILayout.LabelField("Time", Time.realtimeSinceStartup.ToString()); + float m1 = (UnityEngine.Profiling.Profiler.GetTotalAllocatedMemoryLong() / 1024f / 1024f); + float m2 = (UnityEngine.Profiling.Profiler.GetAllocatedMemoryForGraphicsDriver() / 1024f / 1024f); + float m3 = (UnityEngine.Profiling.Profiler.GetTotalReservedMemoryLong() / 1024f / 1024f); + float m = m1 + m2 + m3; + if (m > 10000 && !memoryWarned) + { + memoryWarned = true; + EditorApplication.Beep(); + Debug.LogError("Memory over 10000MB!"); + allowProfiler = false; + UnityEngine.Profiling.Profiler.enabled = false; + } + if (m < 8000 && memoryWarned) + { + memoryWarned = false; + } + EditorGUILayout.LabelField("Memory used:", m.ToString("0.00") + " MB"); + + isLockReload = EditorGUILayout.Toggle("Lock assembly reload", isLockReload); + isAutoSave = EditorGUILayout.Toggle("Auto Save", isAutoSave); + EditorGUILayout.LabelField("Full reload", lastReloadTime); + EditorGUILayout.LabelField("Compile", lastCompileTime); + if (lastAssCompileTime != null) + { + EditorGUILayout.LabelField("Assembly reload", lastAssCompileTime); + } + // For mysterious reason, iterating over a dictionary doesn't work, it gets empty! + if (lastAssCompile != null) + { + foreach (string s in lastAssCompile) + { + var ss = s.Split(':'); + EditorGUILayout.LabelField(ss[0], ss[1]); + } + } + + if (isLockReload) + { + if (!isLocked) + { + Debug.Log("Locking reload of assemblies"); + EditorApplication.LockReloadAssemblies(); + isLocked = true; + } + } + else + { + if (isLocked) + { + Debug.Log("Unlocking reload of assemblies"); + EditorApplication.UnlockReloadAssemblies(); + isLocked = false; + } + } + } + + void OnBeforeAssemblyReload() + { + assStartTime = EditorApplication.timeSinceStartup; + this.ShowNotification(new GUIContent("Started assembly reload")); + } + + void OnAfterAssemblyReload() + { + assFinishTime = EditorApplication.timeSinceStartup; + assCompileTime = assFinishTime - assStartTime; + lastAssCompileTime = assCompileTime.ToString("0.000") + "s"; + } + + void CompilationPipelineOnAssemblyCompilationStarted(string assembly) + { + Debug.Log("Assembly compile started: " + assembly); + startTimes[assembly] = DateTime.UtcNow; + } + + void CompilationPipelineOnAssemblyCompilationFinished(string assembly, CompilerMessage[] arg2) + { + var time = startTimes[assembly]; + var timeSpan = DateTime.UtcNow - startTimes[assembly]; + var bt = string.Format("{0:0.00}s", timeSpan.TotalMilliseconds / 1000f); + var cleanAss = assembly.Replace("Library/ScriptAssemblies/", ""); + + if (lastAssCompile != null) + { + lastAssCompile.Add(cleanAss + ":" + bt); + } + Debug.Log("Assembly compile ended: " + assembly + " in " + bt); + } + + void OnEnable() + { + AssemblyReloadEvents.beforeAssemblyReload += OnBeforeAssemblyReload; + AssemblyReloadEvents.afterAssemblyReload += OnAfterAssemblyReload; + CompilationPipeline.assemblyCompilationStarted += CompilationPipelineOnAssemblyCompilationStarted; + CompilationPipeline.assemblyCompilationFinished += CompilationPipelineOnAssemblyCompilationFinished; + } + + void OnDisable() + { + AssemblyReloadEvents.beforeAssemblyReload -= OnBeforeAssemblyReload; + AssemblyReloadEvents.afterAssemblyReload -= OnAfterAssemblyReload; + CompilationPipeline.assemblyCompilationStarted -= CompilationPipelineOnAssemblyCompilationStarted; + CompilationPipeline.assemblyCompilationFinished -= CompilationPipelineOnAssemblyCompilationFinished; + } + } +} From 1a4b1937c9bfe07a307fa2519844d9ed174c0990 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 2 Jul 2020 13:35:54 +0300 Subject: [PATCH 046/120] fix mesh indexes, add tooltip to ping buttons thanks @memo-mgh --- Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs index 67164bd..d8ddcf3 100644 --- a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs +++ b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs @@ -36,7 +36,6 @@ void OnGUI() if (selection == null) { EditorGUILayout.LabelField("Select gameobject from scene or hierarchy.."); - } else { @@ -76,7 +75,7 @@ void OnGUI() EditorGUILayout.Space(); EditorGUILayout.LabelField("TOP 20", EditorStyles.boldLabel); - // top 10 + // top list if (meshes != null && sortedTopList != null) { int i = 0; @@ -85,11 +84,11 @@ void OnGUI() int percent = (int)(item.Value / (float)totalVertices * 100f); EditorGUILayout.BeginHorizontal(); // ping button - if (GUILayout.Button(" ", GUILayout.Width(16))) + if (GUILayout.Button(new GUIContent(" ", "Ping"), GUILayout.Width(16))) { - EditorGUIUtility.PingObject(meshes[i].transform); + EditorGUIUtility.PingObject(meshes[item.Key].transform); } - EditorGUILayout.LabelField(meshes[i].name + " = " + item.Value + " (" + percent + "%)"); + EditorGUILayout.LabelField(meshes[item.Key].name + " = " + item.Value + " (" + percent + "%)"); GUILayout.ExpandWidth(true); EditorGUILayout.EndHorizontal(); From 4e92323a9ba1add50e282439b635b4780788660f Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 7 Jul 2020 17:52:00 +0300 Subject: [PATCH 047/120] Create WhoDisabledOrEnabled.cs --- .../Helpers/Debug/WhoDisabledOrEnabled.cs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs diff --git a/Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs b/Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs new file mode 100644 index 0000000..5c43b88 --- /dev/null +++ b/Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs @@ -0,0 +1,20 @@ +// shows who disabled/enabled this gameobject from another script +// usage: attach to gameobject that you want to track (see console stack trace) + +using UnityEngine; + +namespace UnityLibrary +{ + public class WhoDisabledOrEnabled : MonoBehaviour + { + private void OnDisable() + { + Debug.LogError("OnDisable: " + gameObject.name, gameObject); + } + + private void OnEnable() + { + Debug.LogError("OnEnable: " + gameObject.name, gameObject); + } + } +} From c9ea94494867bdfc8af758ee8f573e367d6f1aee Mon Sep 17 00:00:00 2001 From: pkunjam Date: Fri, 17 Jul 2020 10:15:09 +0530 Subject: [PATCH 048/120] Smoothly move a gameobject --- .../ui animation Sample Scene.unity.meta | 8 + .../Scripts/AssetBundles/AssetBundleLoader.cs | 4 +- .../Camera/MarrtsSmoothedMouseLook.cs.meta | 12 + Assets/Scripts/Camera/PlayerMovement.cs | 40 +++ Assets/Scripts/Camera/PlayerMovement.cs.meta | 11 + .../{Editor.meta => Scripts/Docs/Mesh.meta} | 4 +- Assets/Scripts/Docs/Mesh/MeshExample.cs.meta | 12 + .../UnityEngine/CullingGroupExample.cs.meta | 12 + Assets/Scripts/Editor/ContextMenu.meta | 9 + .../BoxColliderFitChildren.cs.meta | 12 + .../CreateOutlineForPanelEditor.cs.meta | 12 + .../GetVideoAspectRatioEditor.cs.meta | 12 + .../ContextMenu/SetBoxColliderToUI.cs.meta | 12 + Assets/Scripts/Editor/GameObject.meta | 9 + .../Editor/GameObject/ResetTransform.cs.meta | 12 + .../Editor/Gizmos/RendererBoundsGizmo.cs.meta | 12 + Assets/Scripts/Editor/Hierarchy.meta | 9 + .../Editor/Hierarchy/UnparentMe.cs.meta | 12 + Assets/Scripts/Editor/Mesh.meta | 9 + .../Scripts/Editor/Mesh/CreatePlane.cs.meta | 12 + .../Editor/Mesh/MeshCombineWizard.cs.meta | 12 + .../Editor/Tools/ColorPickerWindow.cs.meta | 12 + .../Scripts/Editor/Tools/CompileTime.cs.meta | 12 + .../Editor/Tools/ReferenceImageViewer.cs.meta | 12 + .../Editor/Tools/SceneManagerWindow.cs.meta | 12 + .../Editor/Tools/SceneSwitcherWindow.cs.meta | 12 + .../Extensions/MonoBehaviourExtensions.meta | 9 + .../MonoBehaviourExtensions/Example.meta | 9 + .../MonoBehaviorExtensionsExample.cs.meta | 12 + .../MonoBehaviourExtensions.cs.meta | 12 + .../Debug/WhoDisabledOrEnabled.cs.meta | 12 + Assets/Scripts/Mesh.meta | 9 + Assets/Scripts/Mesh/Metaball.cs.meta | 12 + Assets/Scripts/Texture.meta | 9 + .../Texture/GradientTextureMaker.cs.meta | 12 + Assets/Scripts/Tools.meta | 9 + .../Scripts/Tools/TerrainTreeReplacer.cs.meta | 12 + Assets/Scripts/UI/Animation.meta | 9 + .../Scripts/UI/Animation/GrowEffect.cs.meta | 12 + .../UI/Animation/HelicopterGrowEffect.cs.meta | 12 + Assets/Scripts/UI/Animation/ImageFade.cs.meta | 12 + .../UI/Animation/LerpFromOffset.cs.meta | 12 + Assets/Scripts/UI/Animation/Shared.meta | 9 + .../UI/Animation/Shared/Interpolation.cs.meta | 12 + Assets/Shaders/2D/Debug.meta | 9 + .../Shaders/2D/Debug/HSVDebugger.shader.meta | 9 + .../Shaders/2D/Effects/ColorCycle.shader.meta | 9 + Assets/Shaders/2D/Patterns.meta | 9 + .../2D/Patterns/CirclesPattern.shader.meta | 9 + .../2D/Patterns/ScrollingFill.shader.meta | 9 + Assets/Shaders/2D/Special.meta | 9 + .../2D/Special/RayMarching.shader.meta | 9 + .../Shaders/2D/Sprites/FlipBook.shader.meta | 9 + Assets/Shaders/3D/Effects.meta | 9 + .../Standard-SeeThroughWalls.shader.meta | 9 + .../VerticalCameraDistanceFade.shader.meta | 9 + Assets/Shaders/3D/Standard.meta | 9 + .../HueContrastSaturation.shader.meta | 9 + .../3D/Unlit/Reverse-DisIntegrate-Shader.meta | 8 + Assets/Shaders/3D/Water.meta | 9 + Assets/Shaders/3D/Water/WaterBox.shader.meta | 9 + Logs/Packages-Update.log | 67 ++++ Packages/manifest.json | 49 +++ ProjectSettings/EditorSettings.asset | 25 +- ProjectSettings/PresetManager.asset | 7 + ProjectSettings/ProjectSettings.asset | 330 ++++++++++-------- ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/VFXManager.asset | 12 + ProjectSettings/XRSettings.asset | 10 + 69 files changed, 1010 insertions(+), 147 deletions(-) create mode 100644 Assets/Scenes/ui animation Sample Scene.unity.meta create mode 100644 Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs.meta create mode 100644 Assets/Scripts/Camera/PlayerMovement.cs create mode 100644 Assets/Scripts/Camera/PlayerMovement.cs.meta rename Assets/{Editor.meta => Scripts/Docs/Mesh.meta} (67%) create mode 100644 Assets/Scripts/Docs/Mesh/MeshExample.cs.meta create mode 100644 Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs.meta create mode 100644 Assets/Scripts/Editor/ContextMenu.meta create mode 100644 Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs.meta create mode 100644 Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs.meta create mode 100644 Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs.meta create mode 100644 Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs.meta create mode 100644 Assets/Scripts/Editor/GameObject.meta create mode 100644 Assets/Scripts/Editor/GameObject/ResetTransform.cs.meta create mode 100644 Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs.meta create mode 100644 Assets/Scripts/Editor/Hierarchy.meta create mode 100644 Assets/Scripts/Editor/Hierarchy/UnparentMe.cs.meta create mode 100644 Assets/Scripts/Editor/Mesh.meta create mode 100644 Assets/Scripts/Editor/Mesh/CreatePlane.cs.meta create mode 100644 Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs.meta create mode 100644 Assets/Scripts/Editor/Tools/ColorPickerWindow.cs.meta create mode 100644 Assets/Scripts/Editor/Tools/CompileTime.cs.meta create mode 100644 Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs.meta create mode 100644 Assets/Scripts/Editor/Tools/SceneManagerWindow.cs.meta create mode 100644 Assets/Scripts/Editor/Tools/SceneSwitcherWindow.cs.meta create mode 100644 Assets/Scripts/Extensions/MonoBehaviourExtensions.meta create mode 100644 Assets/Scripts/Extensions/MonoBehaviourExtensions/Example.meta create mode 100644 Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs.meta create mode 100644 Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs.meta create mode 100644 Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs.meta create mode 100644 Assets/Scripts/Mesh.meta create mode 100644 Assets/Scripts/Mesh/Metaball.cs.meta create mode 100644 Assets/Scripts/Texture.meta create mode 100644 Assets/Scripts/Texture/GradientTextureMaker.cs.meta create mode 100644 Assets/Scripts/Tools.meta create mode 100644 Assets/Scripts/Tools/TerrainTreeReplacer.cs.meta create mode 100644 Assets/Scripts/UI/Animation.meta create mode 100644 Assets/Scripts/UI/Animation/GrowEffect.cs.meta create mode 100644 Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs.meta create mode 100644 Assets/Scripts/UI/Animation/ImageFade.cs.meta create mode 100644 Assets/Scripts/UI/Animation/LerpFromOffset.cs.meta create mode 100644 Assets/Scripts/UI/Animation/Shared.meta create mode 100644 Assets/Scripts/UI/Animation/Shared/Interpolation.cs.meta create mode 100644 Assets/Shaders/2D/Debug.meta create mode 100644 Assets/Shaders/2D/Debug/HSVDebugger.shader.meta create mode 100644 Assets/Shaders/2D/Effects/ColorCycle.shader.meta create mode 100644 Assets/Shaders/2D/Patterns.meta create mode 100644 Assets/Shaders/2D/Patterns/CirclesPattern.shader.meta create mode 100644 Assets/Shaders/2D/Patterns/ScrollingFill.shader.meta create mode 100644 Assets/Shaders/2D/Special.meta create mode 100644 Assets/Shaders/2D/Special/RayMarching.shader.meta create mode 100644 Assets/Shaders/2D/Sprites/FlipBook.shader.meta create mode 100644 Assets/Shaders/3D/Effects.meta create mode 100644 Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader.meta create mode 100644 Assets/Shaders/3D/Effects/VerticalCameraDistanceFade.shader.meta create mode 100644 Assets/Shaders/3D/Standard.meta create mode 100644 Assets/Shaders/3D/Standard/HueContrastSaturation.shader.meta create mode 100644 Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader.meta create mode 100644 Assets/Shaders/3D/Water.meta create mode 100644 Assets/Shaders/3D/Water/WaterBox.shader.meta create mode 100644 Logs/Packages-Update.log create mode 100644 Packages/manifest.json create mode 100644 ProjectSettings/PresetManager.asset create mode 100644 ProjectSettings/VFXManager.asset create mode 100644 ProjectSettings/XRSettings.asset diff --git a/Assets/Scenes/ui animation Sample Scene.unity.meta b/Assets/Scenes/ui animation Sample Scene.unity.meta new file mode 100644 index 0000000..4048b51 --- /dev/null +++ b/Assets/Scenes/ui animation Sample Scene.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2145e601083d97c4ba64d70455d21a11 +timeCreated: 1594958189 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AssetBundles/AssetBundleLoader.cs b/Assets/Scripts/AssetBundles/AssetBundleLoader.cs index 215d6de..d31ae28 100644 --- a/Assets/Scripts/AssetBundles/AssetBundleLoader.cs +++ b/Assets/Scripts/AssetBundles/AssetBundleLoader.cs @@ -84,10 +84,10 @@ IEnumerator DownloadAndCache(string bundleURL, string assetName = "") } // now download the actual bundle, with hashString parameter it uses cached version if available - www = UnityWebRequest.GetAssetBundle(bundleURL + "?r=" + (Random.value * 9999999), hashString, 0); + www = UnityWebRequestAssetBundle.GetAssetBundle(bundleURL + "?r=" + (Random.value * 9999999), hashString, 0); // wait for load to finish - yield return www.Send(); + yield return www.SendWebRequest(); if (www.error != null) { diff --git a/Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs.meta b/Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs.meta new file mode 100644 index 0000000..3eccce9 --- /dev/null +++ b/Assets/Scripts/Camera/MarrtsSmoothedMouseLook.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 10e595b96bab7724a99b2b273e92011e +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Camera/PlayerMovement.cs b/Assets/Scripts/Camera/PlayerMovement.cs new file mode 100644 index 0000000..e9fb679 --- /dev/null +++ b/Assets/Scripts/Camera/PlayerMovement.cs @@ -0,0 +1,40 @@ +using UnityEngine; +using System.Collections.Generic; +using System.Collections; + +//Script for moving a gameObject smoothly + +namespace UnityLibary +{ + public class PlayerMovement : MonoBehaviour + { + //attach the gameobject that you want to move + public CharacterController controller; + + public float speed = 5f; + + void Update() + { + float x = Input.GetAxis("Horizontal"); + float z = Input.GetAxis("Vertical"); + + Vector3 move = transform.right * x + transform.forward * z; + + controller.Move(move * speed * Time.deltaTime); + + //Rotate clockwise + if (Input.GetKey(KeyCode.E)) + { + transform.RotateAround(transform.position, Vector3.up, 100 * Time.deltaTime); + } + + // Rotate anticlockwise + if (Input.GetKey(KeyCode.Q)) + { + transform.RotateAround(transform.position, -Vector3.up, 100 * Time.deltaTime); + } + + } + + } +} diff --git a/Assets/Scripts/Camera/PlayerMovement.cs.meta b/Assets/Scripts/Camera/PlayerMovement.cs.meta new file mode 100644 index 0000000..058aaca --- /dev/null +++ b/Assets/Scripts/Camera/PlayerMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c1dd692b70ceca4439544f5a72fa7f70 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor.meta b/Assets/Scripts/Docs/Mesh.meta similarity index 67% rename from Assets/Editor.meta rename to Assets/Scripts/Docs/Mesh.meta index 9c21977..836722b 100644 --- a/Assets/Editor.meta +++ b/Assets/Scripts/Docs/Mesh.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 710e084e33216854daedf076c029ff31 +guid: dfe48b7debc5f9c4a9ab9b77ddb37e1a folderAsset: yes -timeCreated: 1501225949 +timeCreated: 1594958191 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Scripts/Docs/Mesh/MeshExample.cs.meta b/Assets/Scripts/Docs/Mesh/MeshExample.cs.meta new file mode 100644 index 0000000..24cd5ab --- /dev/null +++ b/Assets/Scripts/Docs/Mesh/MeshExample.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3292a9e48eeb600418703ec125a8ef82 +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs.meta b/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs.meta new file mode 100644 index 0000000..3f8f80c --- /dev/null +++ b/Assets/Scripts/Docs/UnityEngine/CullingGroupExample.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a0f7bca99a1816244927583c60c3e022 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/ContextMenu.meta b/Assets/Scripts/Editor/ContextMenu.meta new file mode 100644 index 0000000..bbbf7ac --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 07f01cf58a1140349bfac4f393266db1 +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs.meta b/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs.meta new file mode 100644 index 0000000..08e2df8 --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/BoxColliderFitChildren.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 687fde9d16dc6b04e934c421806d4abb +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs.meta b/Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs.meta new file mode 100644 index 0000000..e5d8f63 --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/CreateOutlineForPanelEditor.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ea3d3337d55b5bc42a40dff5480adca0 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs.meta b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs.meta new file mode 100644 index 0000000..4aa5605 --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/GetVideoAspectRatioEditor.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: acde12b67d212ae42ab65f73b96ffd59 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs.meta b/Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs.meta new file mode 100644 index 0000000..bbc5ca4 --- /dev/null +++ b/Assets/Scripts/Editor/ContextMenu/SetBoxColliderToUI.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9581bb1267ccd9e48b11127704331d49 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/GameObject.meta b/Assets/Scripts/Editor/GameObject.meta new file mode 100644 index 0000000..ea83061 --- /dev/null +++ b/Assets/Scripts/Editor/GameObject.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: dda0f0ad5057e2244b9a17ccd5031e99 +folderAsset: yes +timeCreated: 1594958191 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/GameObject/ResetTransform.cs.meta b/Assets/Scripts/Editor/GameObject/ResetTransform.cs.meta new file mode 100644 index 0000000..0cc89a0 --- /dev/null +++ b/Assets/Scripts/Editor/GameObject/ResetTransform.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 51c038ebd5a3e0d4b92a12f03a73b6ea +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs.meta b/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs.meta new file mode 100644 index 0000000..d097268 --- /dev/null +++ b/Assets/Scripts/Editor/Gizmos/RendererBoundsGizmo.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f1bf2afb27df5364dab899f318af7f69 +timeCreated: 1594958195 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Hierarchy.meta b/Assets/Scripts/Editor/Hierarchy.meta new file mode 100644 index 0000000..d0052a8 --- /dev/null +++ b/Assets/Scripts/Editor/Hierarchy.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4ad868ac71006a0418c8df13616a4c3e +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Hierarchy/UnparentMe.cs.meta b/Assets/Scripts/Editor/Hierarchy/UnparentMe.cs.meta new file mode 100644 index 0000000..f0a2192 --- /dev/null +++ b/Assets/Scripts/Editor/Hierarchy/UnparentMe.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 859aeadcffa51fe4f9cc875774621ef9 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Mesh.meta b/Assets/Scripts/Editor/Mesh.meta new file mode 100644 index 0000000..bf539ea --- /dev/null +++ b/Assets/Scripts/Editor/Mesh.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f45eaf3f880e5c04785b1cdca6b98021 +folderAsset: yes +timeCreated: 1594958191 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Mesh/CreatePlane.cs.meta b/Assets/Scripts/Editor/Mesh/CreatePlane.cs.meta new file mode 100644 index 0000000..e2ec4a4 --- /dev/null +++ b/Assets/Scripts/Editor/Mesh/CreatePlane.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d1cea26cb1deacf48b0dd190be08a597 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs.meta b/Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs.meta new file mode 100644 index 0000000..69ac2e2 --- /dev/null +++ b/Assets/Scripts/Editor/Mesh/MeshCombineWizard.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 72fbe9dd2dbf0f845ab4d30da0d8b27c +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Tools/ColorPickerWindow.cs.meta b/Assets/Scripts/Editor/Tools/ColorPickerWindow.cs.meta new file mode 100644 index 0000000..d8f24d1 --- /dev/null +++ b/Assets/Scripts/Editor/Tools/ColorPickerWindow.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 333163797deb57f4a8d7373ac970d9bf +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Tools/CompileTime.cs.meta b/Assets/Scripts/Editor/Tools/CompileTime.cs.meta new file mode 100644 index 0000000..30a9f44 --- /dev/null +++ b/Assets/Scripts/Editor/Tools/CompileTime.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a15be7d1f359a614fb4f298da7a5fa9e +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs.meta b/Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs.meta new file mode 100644 index 0000000..9f770af --- /dev/null +++ b/Assets/Scripts/Editor/Tools/ReferenceImageViewer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 2db76a597f4fe1b4e83ee1084fd940a6 +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Tools/SceneManagerWindow.cs.meta b/Assets/Scripts/Editor/Tools/SceneManagerWindow.cs.meta new file mode 100644 index 0000000..1c85eff --- /dev/null +++ b/Assets/Scripts/Editor/Tools/SceneManagerWindow.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9b6b0e046c5bb254f919f740aeb8518b +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Tools/SceneSwitcherWindow.cs.meta b/Assets/Scripts/Editor/Tools/SceneSwitcherWindow.cs.meta new file mode 100644 index 0000000..ce3ea39 --- /dev/null +++ b/Assets/Scripts/Editor/Tools/SceneSwitcherWindow.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: fc44dc6a633635b4ba4ed8bfa75dc6bb +timeCreated: 1594958195 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Extensions/MonoBehaviourExtensions.meta b/Assets/Scripts/Extensions/MonoBehaviourExtensions.meta new file mode 100644 index 0000000..92e9b6a --- /dev/null +++ b/Assets/Scripts/Extensions/MonoBehaviourExtensions.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9064a058036a7004f829d31b1ec4fa7a +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example.meta b/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example.meta new file mode 100644 index 0000000..0279a23 --- /dev/null +++ b/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d05efc8881e8e844a8eccc6132e0ddf6 +folderAsset: yes +timeCreated: 1594958191 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs.meta b/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs.meta new file mode 100644 index 0000000..3cf25b0 --- /dev/null +++ b/Assets/Scripts/Extensions/MonoBehaviourExtensions/Example/MonoBehaviorExtensionsExample.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 7bbf1f0c60c74ac4683995b0a507d537 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs.meta b/Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs.meta new file mode 100644 index 0000000..0c46b6b --- /dev/null +++ b/Assets/Scripts/Extensions/MonoBehaviourExtensions/MonoBehaviourExtensions.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 607fadb72caa2c54f833370bcf9558dc +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs.meta b/Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs.meta new file mode 100644 index 0000000..664c889 --- /dev/null +++ b/Assets/Scripts/Helpers/Debug/WhoDisabledOrEnabled.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c69c0e5bff195b040b1c86515b454544 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Mesh.meta b/Assets/Scripts/Mesh.meta new file mode 100644 index 0000000..762cc6b --- /dev/null +++ b/Assets/Scripts/Mesh.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 14b294f417b66d44a87b73ca589bca2f +folderAsset: yes +timeCreated: 1594958189 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Mesh/Metaball.cs.meta b/Assets/Scripts/Mesh/Metaball.cs.meta new file mode 100644 index 0000000..90b6b2e --- /dev/null +++ b/Assets/Scripts/Mesh/Metaball.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f055b957fef29374d98e499595efe8c3 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Texture.meta b/Assets/Scripts/Texture.meta new file mode 100644 index 0000000..25ffb0f --- /dev/null +++ b/Assets/Scripts/Texture.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 21723003e773f1d44a6ff8203e46f395 +folderAsset: yes +timeCreated: 1594958189 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Texture/GradientTextureMaker.cs.meta b/Assets/Scripts/Texture/GradientTextureMaker.cs.meta new file mode 100644 index 0000000..eb407b4 --- /dev/null +++ b/Assets/Scripts/Texture/GradientTextureMaker.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8fd686556c4ac49449e619d0aa69b9da +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Tools.meta b/Assets/Scripts/Tools.meta new file mode 100644 index 0000000..406b9bb --- /dev/null +++ b/Assets/Scripts/Tools.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4887b891f87d1bc47a7ae210331d1ea7 +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Tools/TerrainTreeReplacer.cs.meta b/Assets/Scripts/Tools/TerrainTreeReplacer.cs.meta new file mode 100644 index 0000000..daa176e --- /dev/null +++ b/Assets/Scripts/Tools/TerrainTreeReplacer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 91b800e4892ad554dbc156f9543e2402 +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Animation.meta b/Assets/Scripts/UI/Animation.meta new file mode 100644 index 0000000..deaf7f5 --- /dev/null +++ b/Assets/Scripts/UI/Animation.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b234f75726460ce46b93b19b770c8385 +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Animation/GrowEffect.cs.meta b/Assets/Scripts/UI/Animation/GrowEffect.cs.meta new file mode 100644 index 0000000..f0976a4 --- /dev/null +++ b/Assets/Scripts/UI/Animation/GrowEffect.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 4cc1ed66c8e377c40a814dec093b6f2e +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs.meta b/Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs.meta new file mode 100644 index 0000000..100a5b6 --- /dev/null +++ b/Assets/Scripts/UI/Animation/HelicopterGrowEffect.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0e6ad0b8ea027294985b17ecc5ae35b0 +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Animation/ImageFade.cs.meta b/Assets/Scripts/UI/Animation/ImageFade.cs.meta new file mode 100644 index 0000000..379c833 --- /dev/null +++ b/Assets/Scripts/UI/Animation/ImageFade.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b538d7b1930f56747a8f9bb73ad5c33b +timeCreated: 1594958194 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Animation/LerpFromOffset.cs.meta b/Assets/Scripts/UI/Animation/LerpFromOffset.cs.meta new file mode 100644 index 0000000..d8ca5be --- /dev/null +++ b/Assets/Scripts/UI/Animation/LerpFromOffset.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f461de9f20f87e64ea1c52f11e14a559 +timeCreated: 1594958195 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Animation/Shared.meta b/Assets/Scripts/UI/Animation/Shared.meta new file mode 100644 index 0000000..86f437c --- /dev/null +++ b/Assets/Scripts/UI/Animation/Shared.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4318a6e62d3fa9b4e80b0a7ce121d0f3 +folderAsset: yes +timeCreated: 1594958191 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Animation/Shared/Interpolation.cs.meta b/Assets/Scripts/UI/Animation/Shared/Interpolation.cs.meta new file mode 100644 index 0000000..1479c95 --- /dev/null +++ b/Assets/Scripts/UI/Animation/Shared/Interpolation.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0bafe5c15fee7b64f84801f9b22ff905 +timeCreated: 1594958193 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Debug.meta b/Assets/Shaders/2D/Debug.meta new file mode 100644 index 0000000..5150edd --- /dev/null +++ b/Assets/Shaders/2D/Debug.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 31f63f34ba5d21c4d8ad3c2a63a85220 +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Debug/HSVDebugger.shader.meta b/Assets/Shaders/2D/Debug/HSVDebugger.shader.meta new file mode 100644 index 0000000..e9b9382 --- /dev/null +++ b/Assets/Shaders/2D/Debug/HSVDebugger.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 3454bedd801ec8049958fc2054f6265e +timeCreated: 1594958198 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Effects/ColorCycle.shader.meta b/Assets/Shaders/2D/Effects/ColorCycle.shader.meta new file mode 100644 index 0000000..133c82f --- /dev/null +++ b/Assets/Shaders/2D/Effects/ColorCycle.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 330b6be9f3a469e42a73504b34d499c6 +timeCreated: 1594958198 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Patterns.meta b/Assets/Shaders/2D/Patterns.meta new file mode 100644 index 0000000..cb80a0f --- /dev/null +++ b/Assets/Shaders/2D/Patterns.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 399c75202c145034baa2c9d01212a27c +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Patterns/CirclesPattern.shader.meta b/Assets/Shaders/2D/Patterns/CirclesPattern.shader.meta new file mode 100644 index 0000000..2c456fe --- /dev/null +++ b/Assets/Shaders/2D/Patterns/CirclesPattern.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6a51e5184b408be4b8a27b34dfca55d2 +timeCreated: 1594958200 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Patterns/ScrollingFill.shader.meta b/Assets/Shaders/2D/Patterns/ScrollingFill.shader.meta new file mode 100644 index 0000000..f42b404 --- /dev/null +++ b/Assets/Shaders/2D/Patterns/ScrollingFill.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 34a3246941ff91e4d9a6bf3a8c9bbf56 +timeCreated: 1594958198 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Special.meta b/Assets/Shaders/2D/Special.meta new file mode 100644 index 0000000..01540e4 --- /dev/null +++ b/Assets/Shaders/2D/Special.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 52b47187126304f448c235620a02b491 +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Special/RayMarching.shader.meta b/Assets/Shaders/2D/Special/RayMarching.shader.meta new file mode 100644 index 0000000..b0a2666 --- /dev/null +++ b/Assets/Shaders/2D/Special/RayMarching.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 80f5dea6657e52b43b3c354aae5371e3 +timeCreated: 1594958202 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/2D/Sprites/FlipBook.shader.meta b/Assets/Shaders/2D/Sprites/FlipBook.shader.meta new file mode 100644 index 0000000..044c4e0 --- /dev/null +++ b/Assets/Shaders/2D/Sprites/FlipBook.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4ebeb70d938436745afc3679d29342ee +timeCreated: 1594958199 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Effects.meta b/Assets/Shaders/3D/Effects.meta new file mode 100644 index 0000000..9729063 --- /dev/null +++ b/Assets/Shaders/3D/Effects.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 721c02c14478d394eb2cd50453c1dd46 +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader.meta b/Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader.meta new file mode 100644 index 0000000..be7cbb5 --- /dev/null +++ b/Assets/Shaders/3D/Effects/Standard-SeeThroughWalls.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 353df71fa3c6e5846a31afbe285baf57 +timeCreated: 1594958198 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Effects/VerticalCameraDistanceFade.shader.meta b/Assets/Shaders/3D/Effects/VerticalCameraDistanceFade.shader.meta new file mode 100644 index 0000000..d4a4687 --- /dev/null +++ b/Assets/Shaders/3D/Effects/VerticalCameraDistanceFade.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4b3fdf02746e56f4a87156674e1b493c +timeCreated: 1594958199 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Standard.meta b/Assets/Shaders/3D/Standard.meta new file mode 100644 index 0000000..61a16ba --- /dev/null +++ b/Assets/Shaders/3D/Standard.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2bc68b9180eac9c4584bd64f091ef2d3 +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Standard/HueContrastSaturation.shader.meta b/Assets/Shaders/3D/Standard/HueContrastSaturation.shader.meta new file mode 100644 index 0000000..cc6cc14 --- /dev/null +++ b/Assets/Shaders/3D/Standard/HueContrastSaturation.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6f585f7124fa4094fa1b503ac78e757b +timeCreated: 1594958201 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader.meta b/Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader.meta new file mode 100644 index 0000000..1ed747b --- /dev/null +++ b/Assets/Shaders/3D/Unlit/Reverse-DisIntegrate-Shader.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c8f6c7a074ca5e42add15300bee781a +timeCreated: 1594958191 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Water.meta b/Assets/Shaders/3D/Water.meta new file mode 100644 index 0000000..dc054a6 --- /dev/null +++ b/Assets/Shaders/3D/Water.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6f78ac9f8e56a074a9b3398b55a3798b +folderAsset: yes +timeCreated: 1594958190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/3D/Water/WaterBox.shader.meta b/Assets/Shaders/3D/Water/WaterBox.shader.meta new file mode 100644 index 0000000..ed4a685 --- /dev/null +++ b/Assets/Shaders/3D/Water/WaterBox.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d43f18bcc0c85024ba6a0410b601cbee +timeCreated: 1594958204 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 0000000..b2e8054 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,67 @@ + +=== Fri Jul 17 09:30:37 2020 + +Packages were changed. +Update Mode: resetToDefaultDependencies + +The following packages were added: + com.unity.analytics@3.2.2 + com.unity.purchasing@2.0.3 + com.unity.ads@2.0.8 + com.unity.textmeshpro@1.3.0 + com.unity.package-manager-ui@2.0.7 + com.unity.collab-proxy@1.2.15 + com.unity.modules.ai@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 + +=== Fri Jul 17 09:51:50 2020 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were added: + com.unity.2d.sprite@1.0.0 + com.unity.2d.tilemap@1.0.0 + com.unity.ide.rider@1.1.4 + com.unity.ide.vscode@1.1.4 + com.unity.modules.androidjni@1.0.0 + com.unity.multiplayer-hlapi@1.0.4 + com.unity.test-framework@1.1.11 + com.unity.timeline@1.2.12 + com.unity.ugui@1.0.0 + com.unity.xr.legacyinputhelpers@1.3.8 +The following packages were updated: + com.unity.analytics from version 3.2.2 to 3.3.5 + com.unity.collab-proxy from version 1.2.15 to 1.2.16 + com.unity.purchasing from version 2.0.3 to 2.0.6 + com.unity.textmeshpro from version 1.3.0 to 2.0.1 +The following packages were removed: + com.unity.package-manager-ui@2.0.7 diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..b387d24 --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,49 @@ +{ + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.3.5", + "com.unity.collab-proxy": "1.2.16", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.vscode": "1.1.4", + "com.unity.multiplayer-hlapi": "1.0.4", + "com.unity.purchasing": "2.0.6", + "com.unity.test-framework": "1.1.11", + "com.unity.textmeshpro": "2.0.1", + "com.unity.timeline": "1.2.12", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "1.3.8", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index f33b6fb..9ccec94 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,14 +3,33 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 4 + serializedVersion: 9 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 + m_LineEndingsForNewScripts: 1 m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_EtcTextureCompressorBehavior: 0 + m_EtcTextureFastCompressor: 2 + m_EtcTextureNormalCompressor: 2 + m_EtcTextureBestCompressor: 5 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..67a94da --- /dev/null +++ b/ProjectSettings/PresetManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c373cfb..5d778b8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,9 +3,11 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 20 productGUID: 36f97d821ecfac149ae5eae5c4496e56 AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 + AndroidEnableSustainedPerformanceMode: 0 defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 @@ -38,8 +40,6 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_SplashScreenBackgroundLandscape: {fileID: 0} - m_SplashScreenBackgroundPortrait: {fileID: 0} m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 @@ -49,13 +49,10 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 - m_MobileMTRendering: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - tizenShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -63,23 +60,30 @@ PlayerSettings: allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 use32BitDisplayBuffer: 1 + preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 - defaultIsFullScreen: 1 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 1 + androidUseSwappy: 0 + androidBlitType: 0 defaultIsNativeResolution: 1 + macRetinaSupport: 1 runInBackground: 0 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + deferSystemGesturesMode: 0 + hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -87,34 +91,28 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 - macFullscreenMode: 2 - d3d9FullscreenMode: 1 - d3d11FullscreenMode: 1 + fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 xboxEnablePIXSampling: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 - ignoreAlphaClear: 0 + metalFramebufferOnly: 0 xboxOneResolution: 0 + xboxOneSResolution: 0 + xboxOneXResolution: 3 xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 - videoMemoryForVertexBuffers: 0 - psp2PowerMode: 0 - psp2AcquireBGM: 1 - wiiUTVResolution: 0 - wiiUGamePadMSAA: 1 - wiiUSupportsNunchuk: 0 - wiiUSupportsClassicController: 0 - wiiUSupportsBalanceBoard: 0 - wiiUSupportsMotionPlus: 0 - wiiUSupportsProController: 0 - wiiUAllowScreenCapture: 1 - wiiUControllerCount: 0 + xboxOneEnableTypeOptimization: 0 + xboxOnePresentImmediateThreshold: 0 + switchQueueCommandMemory: 1048576 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + vulkanNumSwapchainBuffers: 3 + vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -124,6 +122,7 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 + wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 @@ -134,16 +133,39 @@ PlayerSettings: daydream: depthFormat: 0 useSustainedPerformanceMode: 0 + enableVideoLayer: 0 + useProtectedVideoMemory: 0 + minimumSupportedHeadTracking: 0 + maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - protectGraphicsMemory: 0 + depthBufferSharingEnabled: 1 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 + oculus: + sharedDepthBuffer: 1 + dashSupport: 1 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 1 + enable360StereoCapture: 0 + isWsaHolographicRemotingEnabled: 0 + enableFrameTimingStats: 0 useHDRDisplay: 0 - targetPixelDensity: 0 + D3DHDRBitDepth: 0 + m_ColorGamuts: 00000000 + targetPixelDensity: 30 resolutionScalingMode: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.1 applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -156,14 +178,12 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: - serializedVersion: 2 - m_Bits: 238 + VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -176,15 +196,26 @@ PlayerSettings: iPhone47inSplashScreen: {fileID: 0} iPhone55inPortraitSplashScreen: {fileID: 0} iPhone55inLandscapeSplashScreen: {fileID: 0} + iPhone58inPortraitSplashScreen: {fileID: 0} + iPhone58inLandscapeSplashScreen: {fileID: 0} iPadPortraitSplashScreen: {fileID: 0} iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iPhone65inPortraitSplashScreen: {fileID: 0} + iPhone65inLandscapeSplashScreen: {fileID: 0} + iPhone61inPortraitSplashScreen: {fileID: 0} + iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} + appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] + tvOSSmallIconLayers2x: [] tvOSLargeIconLayers: [] + tvOSLargeIconLayers2x: [] tvOSTopShelfImageLayers: [] + tvOSTopShelfImageLayers2x: [] tvOSTopShelfImageWideLayers: [] + tvOSTopShelfImageWideLayers2x: [] iOSLaunchScreenType: 0 iOSLaunchScreenPortrait: {fileID: 0} iOSLaunchScreenLandscape: {fileID: 0} @@ -202,6 +233,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: + iOSUseLaunchScreenStoryboard: 0 + iOSLaunchScreenCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -212,48 +245,88 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + iOSManualSigningProvisioningProfileType: 0 + tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 - AndroidTargetDevice: 0 + iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 + appleEnableProMotion: 0 + clonedFromGUID: 00000000000000000000000000000000 + templatePackageId: + templateDefaultScene: + AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: + AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: + AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 + AndroidEnableTango: 0 androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] + m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 - webPlayerTemplate: APPLICATION:Default + openGLRequireES32: 0 m_TemplateCustomTags: {} - wiiUTitleID: 0005000011000000 - wiiUGroupID: 00010000 - wiiUCommonSaveSize: 4096 - wiiUAccountSaveSize: 2048 - wiiUOlvAccessKey: 0 - wiiUTinCode: 0 - wiiUJoinGameId: 0 - wiiUJoinGameModeMask: 0000000000000000 - wiiUCommonBossSize: 0 - wiiUAccountBossSize: 0 - wiiUAddOnUniqueIDs: [] - wiiUMainThreadStackSize: 3072 - wiiULoaderThreadStackSize: 1024 - wiiUSystemHeapSize: 128 - wiiUTVStartupScreen: {fileID: 0} - wiiUGamePadStartupScreen: {fileID: 0} - wiiUDrcBufferDisabled: 0 - wiiUProfilerLibPath: + mobileMTRendering: + iPhone: 1 + tvOS: 1 + m_BuildTargetGroupLightmapEncodingQuality: + - m_BuildTarget: Standalone + m_EncodingQuality: 1 + - m_BuildTarget: XboxOne + m_EncodingQuality: 1 + - m_BuildTarget: PS4 + m_EncodingQuality: 1 + m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 1 + runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -281,6 +354,9 @@ PlayerSettings: switchTitleNames_9: switchTitleNames_10: switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -293,6 +369,9 @@ PlayerSettings: switchPublisherNames_9: switchPublisherNames_10: switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -305,6 +384,9 @@ PlayerSettings: switchIcons_9: {fileID: 0} switchIcons_10: {fileID: 0} switchIcons_11: {fileID: 0} + switchIcons_12: {fileID: 0} + switchIcons_13: {fileID: 0} + switchIcons_14: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -317,6 +399,9 @@ PlayerSettings: switchSmallIcons_9: {fileID: 0} switchSmallIcons_10: {fileID: 0} switchSmallIcons_11: {fileID: 0} + switchSmallIcons_12: {fileID: 0} + switchSmallIcons_13: {fileID: 0} + switchSmallIcons_14: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -348,6 +433,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: 0x01004b9000490000 switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -358,8 +444,15 @@ PlayerSettings: switchLocalCommunicationIds_7: switchParentalControl: 0 switchAllowsScreenshot: 1 + switchAllowsVideoCapturing: 1 + switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 + switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -368,6 +461,9 @@ PlayerSettings: switchUdpSendBufferSize: 9 switchUdpReceiveBufferSize: 42 switchSocketBufferEfficiency: 4 + switchSocketInitializeEnabled: 1 + switchNetworkInterfaceManagerInitializeEnabled: 1 + switchPlayerConnectionEnabled: 1 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -386,6 +482,8 @@ PlayerSettings: ps4PronunciationSIGPath: ps4BackgroundImagePath: ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: ps4SaveDataImagePath: ps4SdkOverride: ps4BGMPath: @@ -404,12 +502,15 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + enableApplicationExit: 0 + resetTempFolder: 1 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 @@ -432,57 +533,11 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: - psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: - psp2NPSupportGBMorGJP: 0 - psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: - psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui - psp2KeystoneFile: - psp2MemoryExpansionMode: 0 - psp2DRMType: 0 - psp2StorageType: 0 - psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: - psp2SaveDataQuota: 10240 - psp2ParentalLevel: 1 - psp2ShortTitle: Not Set - psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF - psp2Category: 0 - psp2MasterVersion: 01.00 - psp2AppVersion: 01.00 - psp2TVBootMode: 0 - psp2EnterButtonAssignment: 2 - psp2TVDisableEmu: 0 - psp2AllowTwitterDialog: 1 - psp2Upgradable: 0 - psp2HealthWarning: 0 - psp2UseLibLocation: 0 - psp2InfoBarOnStartup: 0 - psp2InfoBarColor: 0 - psp2ScriptOptimizationLevel: 0 - psmSplashimage: {fileID: 0} splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 @@ -494,15 +549,22 @@ PlayerSettings: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLUseWasm: 0 webGLCompressionFormat: 1 + webGLLinkerTarget: 1 + webGLThreadsSupport: 0 + webGLWasmStreaming: 0 scriptingDefineSymbols: 1: MYCOMPANY;MYCOMPANY_MYPACKAGE platformArchitecture: {} scriptingBackend: {} + il2cppCompilerConfiguration: {} + managedStrippingLevel: {} incrementalIl2cppBuild: {} + allowUnsafeCode: 0 additionalIl2CppArgs: - scriptingRuntimeVersion: 0 + scriptingRuntimeVersion: 1 + gcIncremental: 0 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 @@ -516,11 +578,12 @@ PlayerSettings: metroApplicationDescription: UnityLibrary wsaImages: {} metroTileShortName: - metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 metroWideTileShowName: 0 + metroSupportStreamingInstall: 0 + metroLastRequiredScene: 0 metroDefaultTileSize: 1 metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} @@ -528,35 +591,10 @@ PlayerSettings: a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} + metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: - tizenGPSPermissions: 0 - tizenMicrophonePermissions: 0 - tizenDeploymentTarget: - tizenDeploymentTargetType: -1 - tizenMinOSVersion: 1 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF - stvDeviceAddress: - stvProductDescription: - stvProductAuthor: - stvProductAuthorEmail: - stvProductLink: - stvProductCategory: 0 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -566,6 +604,7 @@ PlayerSettings: XboxOneGameOsOverridePath: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: @@ -579,17 +618,30 @@ PlayerSettings: XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 - xboxOneScriptCompiler: 0 + XboxOneXTitleMemory: 8 + XboxOneOverrideIdentityName: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: {} - facebookSdkVersion: 7.9.4 - apiCompatibilityLevel: 2 + luminIcon: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: + luminCert: + m_CertPath: + m_SignPackage: 1 + luminIsChannelApp: 0 + luminVersion: + m_VersionCode: 1 + m_VersionName: + apiCompatibilityLevel: 6 cloudProjectId: + framebufferDepthMemorylessMode: 0 projectName: organizationId: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 + legacyClampBlendShapeWeights: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ca1aa05..a8d6725 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2017.1.0f3 +m_EditorVersion: 2019.3.3f1 +m_EditorVersionWithRevision: 2019.3.3f1 (7ceaae5f7503) diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..3a95c98 --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file From 4fd96461567cdf584f38ff9d904d0bdf77c0849f Mon Sep 17 00:00:00 2001 From: pkunjam Date: Fri, 17 Jul 2020 20:06:35 +0530 Subject: [PATCH 049/120] comment correction --- Assets/Scripts/Camera/PlayerMovement.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Camera/PlayerMovement.cs b/Assets/Scripts/Camera/PlayerMovement.cs index e9fb679..901af41 100644 --- a/Assets/Scripts/Camera/PlayerMovement.cs +++ b/Assets/Scripts/Camera/PlayerMovement.cs @@ -3,12 +3,13 @@ using System.Collections; //Script for moving a gameObject smoothly +//Usage: Attach the character controller component to the gameobject that you want to move namespace UnityLibary { public class PlayerMovement : MonoBehaviour { - //attach the gameobject that you want to move + // place the gameobject that you want to move to the controller placeholder public CharacterController controller; public float speed = 5f; From c579bf50ea0dea8f015d6522ac8e46667f51a254 Mon Sep 17 00:00:00 2001 From: pkunjam Date: Sat, 18 Jul 2020 12:31:12 +0530 Subject: [PATCH 050/120] script to display webcam texture into a gameobject --- Assets/Scripts/Texture/WebCamDisplay.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Assets/Scripts/Texture/WebCamDisplay.cs diff --git a/Assets/Scripts/Texture/WebCamDisplay.cs b/Assets/Scripts/Texture/WebCamDisplay.cs new file mode 100644 index 0000000..12bf6c8 --- /dev/null +++ b/Assets/Scripts/Texture/WebCamDisplay.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// usage: attach this script to any gameobject in which you want to render the webcam display +// create a material, use Unlit/Texture as a shader and place it to the gameobject's material placeholder in the mesh renderer component + +namespace UnityLibrary +{ + public class WebCamDisplay : MonoBehaviour + { + void Start() + { + WebCamTexture webCam = new WebCamTexture(); + webCam.deviceName = WebCamTexture.devices[0].name; + this.GetComponent().material.mainTexture = webCam; + webCam.Play(); + } + } +} + From 7836593170978484e0e203067a5bcd26c514980a Mon Sep 17 00:00:00 2001 From: pkunjam Date: Sat, 18 Jul 2020 18:22:50 +0530 Subject: [PATCH 051/120] Removed packages and project settings --- Assets/Scripts/Texture/WebCamDisplay.cs.meta | 11 + Packages/manifest.json | 49 -- ProjectSettings/AudioManager.asset | 17 - ProjectSettings/ClusterInputManager.asset | 6 - ProjectSettings/DynamicsManager.asset | 19 - ProjectSettings/EditorBuildSettings.asset | 7 - ProjectSettings/EditorSettings.asset | 35 - ProjectSettings/GraphicsSettings.asset | 61 -- ProjectSettings/InputManager.asset | 295 --------- ProjectSettings/NavMeshAreas.asset | 89 --- ProjectSettings/NetworkManager.asset | 8 - ProjectSettings/Physics2DSettings.asset | 36 -- ProjectSettings/PresetManager.asset | 7 - ProjectSettings/ProjectSettings.asset | 647 ------------------- ProjectSettings/ProjectVersion.txt | 2 - ProjectSettings/QualitySettings.asset | 193 ------ ProjectSettings/TagManager.asset | 43 -- ProjectSettings/TimeManager.asset | 9 - ProjectSettings/UnityConnectSettings.asset | 34 - ProjectSettings/VFXManager.asset | 12 - ProjectSettings/XRSettings.asset | 10 - 21 files changed, 11 insertions(+), 1579 deletions(-) create mode 100644 Assets/Scripts/Texture/WebCamDisplay.cs.meta delete mode 100644 Packages/manifest.json delete mode 100644 ProjectSettings/AudioManager.asset delete mode 100644 ProjectSettings/ClusterInputManager.asset delete mode 100644 ProjectSettings/DynamicsManager.asset delete mode 100644 ProjectSettings/EditorBuildSettings.asset delete mode 100644 ProjectSettings/EditorSettings.asset delete mode 100644 ProjectSettings/GraphicsSettings.asset delete mode 100644 ProjectSettings/InputManager.asset delete mode 100644 ProjectSettings/NavMeshAreas.asset delete mode 100644 ProjectSettings/NetworkManager.asset delete mode 100644 ProjectSettings/Physics2DSettings.asset delete mode 100644 ProjectSettings/PresetManager.asset delete mode 100644 ProjectSettings/ProjectSettings.asset delete mode 100644 ProjectSettings/ProjectVersion.txt delete mode 100644 ProjectSettings/QualitySettings.asset delete mode 100644 ProjectSettings/TagManager.asset delete mode 100644 ProjectSettings/TimeManager.asset delete mode 100644 ProjectSettings/UnityConnectSettings.asset delete mode 100644 ProjectSettings/VFXManager.asset delete mode 100644 ProjectSettings/XRSettings.asset diff --git a/Assets/Scripts/Texture/WebCamDisplay.cs.meta b/Assets/Scripts/Texture/WebCamDisplay.cs.meta new file mode 100644 index 0000000..9976b84 --- /dev/null +++ b/Assets/Scripts/Texture/WebCamDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c15440579c94fd245b85260bce402884 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json deleted file mode 100644 index b387d24..0000000 --- a/Packages/manifest.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.3.5", - "com.unity.collab-proxy": "1.2.16", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.1.4", - "com.unity.multiplayer-hlapi": "1.0.4", - "com.unity.purchasing": "2.0.6", - "com.unity.test-framework": "1.1.11", - "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.2.12", - "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "1.3.8", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - } -} diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset deleted file mode 100644 index da61125..0000000 --- a/ProjectSettings/AudioManager.asset +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!11 &1 -AudioManager: - m_ObjectHideFlags: 0 - m_Volume: 1 - Rolloff Scale: 1 - Doppler Factor: 1 - Default Speaker Mode: 2 - m_SampleRate: 0 - m_DSPBufferSize: 0 - m_VirtualVoiceCount: 512 - m_RealVoiceCount: 32 - m_SpatializerPlugin: - m_AmbisonicDecoderPlugin: - m_DisableAudio: 0 - m_VirtualizeEffects: 1 diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset deleted file mode 100644 index e7886b2..0000000 --- a/ProjectSettings/ClusterInputManager.asset +++ /dev/null @@ -1,6 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!236 &1 -ClusterInputManager: - m_ObjectHideFlags: 0 - m_Inputs: [] diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset deleted file mode 100644 index 1931946..0000000 --- a/ProjectSettings/DynamicsManager.asset +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!55 &1 -PhysicsManager: - m_ObjectHideFlags: 0 - serializedVersion: 3 - m_Gravity: {x: 0, y: -9.81, z: 0} - m_DefaultMaterial: {fileID: 0} - m_BounceThreshold: 2 - m_SleepThreshold: 0.005 - m_DefaultContactOffset: 0.01 - m_DefaultSolverIterations: 6 - m_DefaultSolverVelocityIterations: 1 - m_QueriesHitBackfaces: 0 - m_QueriesHitTriggers: 1 - m_EnableAdaptiveForce: 0 - m_EnablePCM: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - m_AutoSimulation: 1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset deleted file mode 100644 index 6dc24f7..0000000 --- a/ProjectSettings/EditorBuildSettings.asset +++ /dev/null @@ -1,7 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1045 &1 -EditorBuildSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Scenes: [] diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset deleted file mode 100644 index 9ccec94..0000000 --- a/ProjectSettings/EditorSettings.asset +++ /dev/null @@ -1,35 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!159 &1 -EditorSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_ExternalVersionControlSupport: Visible Meta Files - m_SerializationMode: 2 - m_LineEndingsForNewScripts: 1 - m_DefaultBehaviorMode: 0 - m_PrefabRegularEnvironment: {fileID: 0} - m_PrefabUIEnvironment: {fileID: 0} - m_SpritePackerMode: 0 - m_SpritePackerPaddingPower: 1 - m_EtcTextureCompressorBehavior: 0 - m_EtcTextureFastCompressor: 2 - m_EtcTextureNormalCompressor: 2 - m_EtcTextureBestCompressor: 5 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref - m_ProjectGenerationRootNamespace: - m_CollabEditorSettings: - inProgressEnabled: 1 - m_EnableTextureStreamingInEditMode: 1 - m_EnableTextureStreamingInPlayMode: 1 - m_AsyncShaderCompilation: 1 - m_EnterPlayModeOptionsEnabled: 0 - m_EnterPlayModeOptions: 3 - m_ShowLightmapResolutionOverlay: 1 - m_UseLegacyProbeSampleCount: 1 - m_AssetPipelineMode: 1 - m_CacheServerMode: 0 - m_CacheServerEndpoint: - m_CacheServerNamespacePrefix: default - m_CacheServerEnableDownload: 1 - m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset deleted file mode 100644 index 74d7b53..0000000 --- a/ProjectSettings/GraphicsSettings.asset +++ /dev/null @@ -1,61 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!30 &1 -GraphicsSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_Deferred: - m_Mode: 1 - m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} - m_ScreenSpaceShadows: - m_Mode: 1 - m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} - m_DepthNormals: - m_Mode: 1 - m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} - m_MotionVectors: - m_Mode: 1 - m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} - m_LightHalo: - m_Mode: 1 - m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} - m_LensFlare: - m_Mode: 1 - m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 0} - m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} - m_DefaultRenderingPath: 1 - m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] - m_LightmapStripping: 0 - m_FogStripping: 0 - m_InstancingStripping: 0 - m_LightmapKeepPlain: 1 - m_LightmapKeepDirCombined: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepShadowMask: 1 - m_LightmapKeepSubtractive: 1 - m_FogKeepLinear: 1 - m_FogKeepExp: 1 - m_FogKeepExp2: 1 - m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset deleted file mode 100644 index 17c8f53..0000000 --- a/ProjectSettings/InputManager.asset +++ /dev/null @@ -1,295 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!13 &1 -InputManager: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Axes: - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: a - altPositiveButton: d - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: s - altPositiveButton: w - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse X - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 2 - joyNum: 0 - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 1 - type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset deleted file mode 100644 index 6dd520f..0000000 --- a/ProjectSettings/NavMeshAreas.asset +++ /dev/null @@ -1,89 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!126 &1 -NavMeshProjectSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - areas: - - name: Walkable - cost: 1 - - name: Not Walkable - cost: 1 - - name: Jump - cost: 2 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - m_LastAgentTypeID: -887442657 - m_Settings: - - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.75 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - m_SettingNames: - - Humanoid diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset deleted file mode 100644 index 5dc6a83..0000000 --- a/ProjectSettings/NetworkManager.asset +++ /dev/null @@ -1,8 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!149 &1 -NetworkManager: - m_ObjectHideFlags: 0 - m_DebugLevel: 0 - m_Sendrate: 15 - m_AssetToPrefab: {} diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset deleted file mode 100644 index e3b2d0b..0000000 --- a/ProjectSettings/Physics2DSettings.asset +++ /dev/null @@ -1,36 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!19 &1 -Physics2DSettings: - m_ObjectHideFlags: 0 - serializedVersion: 3 - m_Gravity: {x: 0, y: -9.81} - m_DefaultMaterial: {fileID: 0} - m_VelocityIterations: 8 - m_PositionIterations: 3 - m_VelocityThreshold: 1 - m_MaxLinearCorrection: 0.2 - m_MaxAngularCorrection: 8 - m_MaxTranslationSpeed: 100 - m_MaxRotationSpeed: 360 - m_BaumgarteScale: 0.2 - m_BaumgarteTimeOfImpactScale: 0.75 - m_TimeToSleep: 0.5 - m_LinearSleepTolerance: 0.01 - m_AngularSleepTolerance: 2 - m_DefaultContactOffset: 0.01 - m_AutoSimulation: 1 - m_QueriesHitTriggers: 1 - m_QueriesStartInColliders: 1 - m_ChangeStopsCallbacks: 0 - m_CallbacksOnDisable: 1 - m_AlwaysShowColliders: 0 - m_ShowColliderSleep: 1 - m_ShowColliderContacts: 0 - m_ShowColliderAABB: 0 - m_ContactArrowScale: 0.2 - m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} - m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} - m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} - m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset deleted file mode 100644 index 67a94da..0000000 --- a/ProjectSettings/PresetManager.asset +++ /dev/null @@ -1,7 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1386491679 &1 -PresetManager: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_DefaultPresets: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset deleted file mode 100644 index 5d778b8..0000000 --- a/ProjectSettings/ProjectSettings.asset +++ /dev/null @@ -1,647 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!129 &1 -PlayerSettings: - m_ObjectHideFlags: 0 - serializedVersion: 20 - productGUID: 36f97d821ecfac149ae5eae5c4496e56 - AndroidProfiler: 0 - AndroidFilterTouchesWhenObscured: 0 - AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 - targetDevice: 2 - useOnDemandResources: 0 - accelerometerFrequency: 60 - companyName: DefaultCompany - productName: UnityLibrary - defaultCursor: {fileID: 0} - cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 - m_SplashScreenOverlayOpacity: 1 - m_SplashScreenAnimation: 1 - m_SplashScreenLogoStyle: 1 - m_SplashScreenDrawMode: 0 - m_SplashScreenBackgroundAnimationZoom: 1 - m_SplashScreenLogoAnimationZoom: 1 - m_SplashScreenBackgroundLandscapeAspect: 1 - m_SplashScreenBackgroundPortraitAspect: 1 - m_SplashScreenBackgroundLandscapeUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenBackgroundPortraitUvs: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 0} - m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 - m_StereoRenderingPath: 0 - m_ActiveColorSpace: 0 - m_MTRendering: 1 - m_StackTraceTypes: 010000000100000001000000010000000100000001000000 - iosShowActivityIndicatorOnLoading: -1 - androidShowActivityIndicatorOnLoading: -1 - iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 - allowedAutorotateToPortrait: 1 - allowedAutorotateToPortraitUpsideDown: 1 - allowedAutorotateToLandscapeRight: 1 - allowedAutorotateToLandscapeLeft: 1 - useOSAutorotation: 1 - use32BitDisplayBuffer: 1 - preserveFramebufferAlpha: 0 - disableDepthAndStencilBuffers: 0 - androidStartInFullscreen: 1 - androidRenderOutsideSafeArea: 1 - androidUseSwappy: 0 - androidBlitType: 0 - defaultIsNativeResolution: 1 - macRetinaSupport: 1 - runInBackground: 0 - captureSingleScreen: 0 - muteOtherAudioSources: 0 - Prepare IOS For Recording: 0 - Force IOS Speakers When Recording: 0 - deferSystemGesturesMode: 0 - hideHomeButton: 0 - submitAnalytics: 1 - usePlayerLog: 1 - bakeCollisionMeshes: 0 - forceSingleInstance: 0 - useFlipModelSwapchain: 1 - resizableWindow: 0 - useMacAppStoreValidation: 0 - macAppStoreCategory: public.app-category.games - gpuSkinning: 0 - xboxPIXTextureCapture: 0 - xboxEnableAvatar: 0 - xboxEnableKinect: 0 - xboxEnableKinectAutoTracking: 0 - xboxEnableFitness: 0 - visibleInBackground: 1 - allowFullscreenSwitch: 1 - fullscreenMode: 1 - xboxSpeechDB: 0 - xboxEnableHeadOrientation: 0 - xboxEnableGuest: 0 - xboxEnablePIXSampling: 0 - metalFramebufferOnly: 0 - xboxOneResolution: 0 - xboxOneSResolution: 0 - xboxOneXResolution: 3 - xboxOneMonoLoggingLevel: 0 - xboxOneLoggingLevel: 1 - xboxOneDisableEsram: 0 - xboxOneEnableTypeOptimization: 0 - xboxOnePresentImmediateThreshold: 0 - switchQueueCommandMemory: 1048576 - switchQueueControlMemory: 16384 - switchQueueComputeMemory: 262144 - switchNVNShaderPoolsGranularity: 33554432 - switchNVNDefaultPoolsGranularity: 16777216 - switchNVNOtherPoolsGranularity: 16777216 - vulkanNumSwapchainBuffers: 3 - vulkanEnableSetSRGBWrite: 0 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 1.0 - preloadedAssets: [] - metroInputSource: 0 - wsaTransparentSwapchain: 0 - m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 - vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 - enable360StereoCapture: 0 - isWsaHolographicRemotingEnabled: 0 - enableFrameTimingStats: 0 - useHDRDisplay: 0 - D3DHDRBitDepth: 0 - m_ColorGamuts: 00000000 - targetPixelDensity: 30 - resolutionScalingMode: 0 - androidSupportedAspectRatio: 1 - androidMaxAspectRatio: 2.1 - applicationIdentifier: {} - buildNumber: {} - AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 - AndroidTargetSdkVersion: 0 - AndroidPreferredInstallLocation: 1 - aotOptions: - stripEngineCode: 1 - iPhoneStrippingLevel: 0 - iPhoneScriptCallOptimization: 0 - ForceInternetPermission: 0 - ForceSDCardPermission: 0 - CreateWallpaper: 0 - APKExpansionFiles: 0 - keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: 214 - iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 - tvOSSdkVersion: 0 - tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 - uIPrerenderedIcon: 0 - uIRequiresPersistentWiFi: 0 - uIRequiresFullScreen: 1 - uIStatusBarHidden: 1 - uIExitOnSuspend: 0 - uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} - appleTVSplashScreen: {fileID: 0} - appleTVSplashScreen2x: {fileID: 0} - tvOSSmallIconLayers: [] - tvOSSmallIconLayers2x: [] - tvOSLargeIconLayers: [] - tvOSLargeIconLayers2x: [] - tvOSTopShelfImageLayers: [] - tvOSTopShelfImageLayers2x: [] - tvOSTopShelfImageWideLayers: [] - tvOSTopShelfImageWideLayers2x: [] - iOSLaunchScreenType: 0 - iOSLaunchScreenPortrait: {fileID: 0} - iOSLaunchScreenLandscape: {fileID: 0} - iOSLaunchScreenBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreenFillPct: 100 - iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: - iOSLaunchScreeniPadType: 0 - iOSLaunchScreeniPadImage: {fileID: 0} - iOSLaunchScreeniPadBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreeniPadFillPct: 100 - iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 - iOSLaunchScreenCustomStoryboardPath: - iOSDeviceRequirements: [] - iOSURLSchemes: [] - iOSBackgroundModes: 0 - iOSMetalForceHardShadows: 0 - metalEditorSupport: 1 - metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: - iOSManualSigningProvisioningProfileType: 0 - tvOSManualSigningProvisioningProfileType: 0 - appleEnableAutomaticSigning: 0 - iOSRequireARKit: 0 - iOSAutomaticallyDetectAndAddCapabilities: 1 - appleEnableProMotion: 0 - clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: - AndroidTargetArchitectures: 1 - AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: ' - AndroidKeyaliasName: - AndroidBuildApkPerCpuArchitecture: 0 - AndroidTVCompatibility: 1 - AndroidIsGame: 1 - AndroidEnableTango: 0 - androidEnableBanner: 1 - androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 0 - m_AndroidBanners: - - width: 320 - height: 180 - banner: {fileID: 0} - androidGamepadSupportLevel: 0 - AndroidValidateAppBundleSize: 1 - AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: [] - m_BuildTargetGraphicsJobs: - - m_BuildTarget: MacStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: Switch - m_GraphicsJobs: 0 - - m_BuildTarget: MetroSupport - m_GraphicsJobs: 0 - - m_BuildTarget: AppleTVSupport - m_GraphicsJobs: 0 - - m_BuildTarget: BJMSupport - m_GraphicsJobs: 0 - - m_BuildTarget: LinuxStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: PS4Player - m_GraphicsJobs: 0 - - m_BuildTarget: iOSSupport - m_GraphicsJobs: 0 - - m_BuildTarget: WindowsStandaloneSupport - m_GraphicsJobs: 0 - - m_BuildTarget: XboxOnePlayer - m_GraphicsJobs: 0 - - m_BuildTarget: LuminSupport - m_GraphicsJobs: 0 - - m_BuildTarget: AndroidPlayer - m_GraphicsJobs: 0 - - m_BuildTarget: WebGLSupport - m_GraphicsJobs: 0 - m_BuildTargetGraphicsJobMode: - - m_BuildTarget: PS4Player - m_GraphicsJobMode: 0 - - m_BuildTarget: XboxOnePlayer - m_GraphicsJobMode: 0 - m_BuildTargetGraphicsAPIs: [] - m_BuildTargetVRSettings: [] - openGLRequireES31: 0 - openGLRequireES31AEP: 0 - openGLRequireES32: 0 - m_TemplateCustomTags: {} - mobileMTRendering: - iPhone: 1 - tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 1 - - m_BuildTarget: XboxOne - m_EncodingQuality: 1 - - m_BuildTarget: PS4 - m_EncodingQuality: 1 - m_BuildTargetGroupLightmapSettings: [] - playModeTestRunnerEnabled: 1 - runPlayModeTestAsEditModeTest: 0 - actionOnDotNetUnhandledException: 1 - enableInternalProfiler: 0 - logObjCUncaughtExceptions: 1 - enableCrashReportAPI: 0 - cameraUsageDescription: - locationUsageDescription: - microphoneUsageDescription: - switchNetLibKey: - switchSocketMemoryPoolSize: 6144 - switchSocketAllocatorPoolSize: 128 - switchSocketConcurrencyLimit: 14 - switchScreenResolutionBehavior: 2 - switchUseCPUProfiler: 0 - switchApplicationID: 0x01004b9000490000 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: - switchIcons_0: {fileID: 0} - switchIcons_1: {fileID: 0} - switchIcons_2: {fileID: 0} - switchIcons_3: {fileID: 0} - switchIcons_4: {fileID: 0} - switchIcons_5: {fileID: 0} - switchIcons_6: {fileID: 0} - switchIcons_7: {fileID: 0} - switchIcons_8: {fileID: 0} - switchIcons_9: {fileID: 0} - switchIcons_10: {fileID: 0} - switchIcons_11: {fileID: 0} - switchIcons_12: {fileID: 0} - switchIcons_13: {fileID: 0} - switchIcons_14: {fileID: 0} - switchSmallIcons_0: {fileID: 0} - switchSmallIcons_1: {fileID: 0} - switchSmallIcons_2: {fileID: 0} - switchSmallIcons_3: {fileID: 0} - switchSmallIcons_4: {fileID: 0} - switchSmallIcons_5: {fileID: 0} - switchSmallIcons_6: {fileID: 0} - switchSmallIcons_7: {fileID: 0} - switchSmallIcons_8: {fileID: 0} - switchSmallIcons_9: {fileID: 0} - switchSmallIcons_10: {fileID: 0} - switchSmallIcons_11: {fileID: 0} - switchSmallIcons_12: {fileID: 0} - switchSmallIcons_13: {fileID: 0} - switchSmallIcons_14: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: - switchMainThreadStackSize: 1048576 - switchPresenceGroupId: 0x01004b9000490000 - switchLogoHandling: 0 - switchReleaseVersion: 0 - switchDisplayVersion: 1.0.0 - switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 - switchSupportedLanguagesMask: 0 - switchLogoType: 0 - switchApplicationErrorCodeCategory: - switchUserAccountSaveDataSize: 0 - switchUserAccountSaveDataJournalSize: 0 - switchApplicationAttribute: 0 - switchCardSpecSize: 4 - switchCardSpecClock: 25 - switchRatingsMask: 0 - switchRatingsInt_0: 0 - switchRatingsInt_1: 0 - switchRatingsInt_2: 0 - switchRatingsInt_3: 0 - switchRatingsInt_4: 0 - switchRatingsInt_5: 0 - switchRatingsInt_6: 0 - switchRatingsInt_7: 0 - switchRatingsInt_8: 0 - switchRatingsInt_9: 0 - switchRatingsInt_10: 0 - switchRatingsInt_11: 0 - switchRatingsInt_12: 0 - switchLocalCommunicationIds_0: 0x01004b9000490000 - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: - switchParentalControl: 0 - switchAllowsScreenshot: 1 - switchAllowsVideoCapturing: 1 - switchAllowsRuntimeAddOnContentInstall: 0 - switchDataLossConfirmation: 0 - switchUserAccountLockEnabled: 0 - switchSystemResourceMemory: 16777216 - switchSupportedNpadStyles: 3 - switchNativeFsCacheSize: 32 - switchIsHoldTypeHorizontal: 0 - switchSupportedNpadCount: 8 - switchSocketConfigEnabled: 0 - switchTcpInitialSendBufferSize: 32 - switchTcpInitialReceiveBufferSize: 64 - switchTcpAutoSendBufferSizeMax: 256 - switchTcpAutoReceiveBufferSizeMax: 256 - switchUdpSendBufferSize: 9 - switchUdpReceiveBufferSize: 42 - switchSocketBufferEfficiency: 4 - switchSocketInitializeEnabled: 1 - switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 - ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: - ps4ParentalLevel: 11 - ps4ContentID: ED1633-NPXX51362_00-0000000000000000 - ps4Category: 0 - ps4MasterVersion: 01.00 - ps4AppVersion: 01.00 - ps4AppType: 0 - ps4ParamSfxPath: - ps4VideoOutPixelFormat: 0 - ps4VideoOutInitialWidth: 1920 - ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 120 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4NPtitleDatPath: - ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: - ps4PlayTogetherPlayerCount: 0 - ps4EnterButtonAssignment: 1 - ps4ApplicationParam1: 0 - ps4ApplicationParam2: 0 - ps4ApplicationParam3: 0 - ps4ApplicationParam4: 0 - ps4DownloadDataSize: 0 - ps4GarlicHeapSize: 2048 - ps4ProGarlicHeapSize: 2560 - playerPrefsMaxSize: 32768 - ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ - ps4pnSessions: 1 - ps4pnPresence: 1 - ps4pnFriends: 1 - ps4pnGameCustomData: 1 - playerPrefsSupport: 0 - enableApplicationExit: 0 - resetTempFolder: 1 - restrictedAudioUsageRights: 0 - ps4UseResolutionFallback: 0 - ps4ReprojectionSupport: 0 - ps4UseAudio3dBackend: 0 - ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 0 - ps4Audio3dVirtualSpeakerCount: 14 - ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: - ps4PatchDayOne: 0 - ps4attribUserManagement: 0 - ps4attribMoveSupport: 0 - ps4attrib3DSupport: 0 - ps4attribShareSupport: 0 - ps4attribExclusiveVR: 0 - ps4disableAutoHideSplash: 0 - ps4videoRecordingFeaturesUsed: 0 - ps4contentSearchFeaturesUsed: 0 - ps4attribEyeToEyeDistanceSettingVR: 0 - ps4IncludedModules: [] - ps4attribVROutputEnabled: 0 - monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 0} - splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 - spritePackerPolicy: - webGLMemorySize: 256 - webGLExceptionSupport: 1 - webGLNameFilesAsHashes: 0 - webGLDataCaching: 0 - webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: - webGLTemplate: APPLICATION:Default - webGLAnalyzeBuildSize: 0 - webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 1 - webGLLinkerTarget: 1 - webGLThreadsSupport: 0 - webGLWasmStreaming: 0 - scriptingDefineSymbols: - 1: MYCOMPANY;MYCOMPANY_MYPACKAGE - platformArchitecture: {} - scriptingBackend: {} - il2cppCompilerConfiguration: {} - managedStrippingLevel: {} - incrementalIl2cppBuild: {} - allowUnsafeCode: 0 - additionalIl2CppArgs: - scriptingRuntimeVersion: 1 - gcIncremental: 0 - gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: {} - m_RenderingPath: 1 - m_MobileRenderingPath: 1 - metroPackageName: UnityLibrary - metroPackageVersion: - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: - metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: UnityLibrary - wsaImages: {} - metroTileShortName: - metroTileShowName: 0 - metroMediumTileShowName: 0 - metroLargeTileShowName: 0 - metroWideTileShowName: 0 - metroSupportStreamingInstall: 0 - metroLastRequiredScene: 0 - metroDefaultTileSize: 1 - metroTileForegroundText: 2 - metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, - a: 1} - metroSplashScreenUseBackgroundColor: 0 - platformCapabilities: {} - metroTargetDeviceFamilies: {} - metroFTAName: - metroFTAFileTypes: [] - metroProtocolName: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: - XboxOneVersion: 1.0.0.0 - XboxOnePackageEncryption: 0 - XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: - XboxOneLanguage: - - enus - XboxOneCapability: [] - XboxOneGameRating: {} - XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 0 - XboxOneSockets: {} - XboxOneSplashScreen: {fileID: 0} - XboxOneAllowedProductIds: [] - XboxOnePersistentLocalStorageSize: 0 - XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} - cloudServicesEnabled: {} - luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: - luminCert: - m_CertPath: - m_SignPackage: 1 - luminIsChannelApp: 0 - luminVersion: - m_VersionCode: 1 - m_VersionName: - apiCompatibilityLevel: 6 - cloudProjectId: - framebufferDepthMemorylessMode: 0 - projectName: - organizationId: - cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 - legacyClampBlendShapeWeights: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt deleted file mode 100644 index a8d6725..0000000 --- a/ProjectSettings/ProjectVersion.txt +++ /dev/null @@ -1,2 +0,0 @@ -m_EditorVersion: 2019.3.3f1 -m_EditorVersionWithRevision: 2019.3.3f1 (7ceaae5f7503) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset deleted file mode 100644 index 86c047f..0000000 --- a/ProjectSettings/QualitySettings.asset +++ /dev/null @@ -1,193 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!47 &1 -QualitySettings: - m_ObjectHideFlags: 0 - serializedVersion: 5 - m_CurrentQuality: 5 - m_QualitySettings: - - serializedVersion: 2 - name: Very Low - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 15 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 1 - textureQuality: 1 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.3 - maximumLODLevel: 0 - particleRaycastBudget: 4 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Low - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - particleRaycastBudget: 16 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Medium - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 0.7 - maximumLODLevel: 0 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: High - pixelLightCount: 2 - shadows: 2 - shadowResolution: 1 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 40 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 1 - maximumLODLevel: 0 - particleRaycastBudget: 256 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Very High - pixelLightCount: 3 - shadows: 2 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 70 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 2 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 1.5 - maximumLODLevel: 0 - particleRaycastBudget: 1024 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Ultra - pixelLightCount: 4 - shadows: 2 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 150 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 2 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 2 - maximumLODLevel: 0 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 2 - Nintendo 3DS: 5 - Nintendo Switch: 5 - PS4: 5 - PSM: 5 - PSP2: 2 - Samsung TV: 2 - Standalone: 5 - Tizen: 2 - Web: 5 - WebGL: 3 - WiiU: 5 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset deleted file mode 100644 index 1c92a78..0000000 --- a/ProjectSettings/TagManager.asset +++ /dev/null @@ -1,43 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!78 &1 -TagManager: - serializedVersion: 2 - tags: [] - layers: - - Default - - TransparentFX - - Ignore Raycast - - - - Water - - UI - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - m_SortingLayers: - - name: Default - uniqueID: 0 - locked: 0 diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset deleted file mode 100644 index 558a017..0000000 --- a/ProjectSettings/TimeManager.asset +++ /dev/null @@ -1,9 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!5 &1 -TimeManager: - m_ObjectHideFlags: 0 - Fixed Timestep: 0.02 - Maximum Allowed Timestep: 0.33333334 - m_TimeScale: 1 - Maximum Particle Timestep: 0.03 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset deleted file mode 100644 index 1cc5485..0000000 --- a/ProjectSettings/UnityConnectSettings.asset +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!310 &1 -UnityConnectSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: - m_TestInitMode: 0 - CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_Enabled: 0 - m_CaptureEditorExceptions: 1 - UnityPurchasingSettings: - m_Enabled: 0 - m_TestMode: 0 - UnityAnalyticsSettings: - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: - UnityAdsSettings: - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_EnabledPlatforms: 4294967295 - m_IosGameId: - m_AndroidGameId: - m_GameIds: {} - m_GameId: - PerformanceReportingSettings: - m_Enabled: 0 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset deleted file mode 100644 index 3a95c98..0000000 --- a/ProjectSettings/VFXManager.asset +++ /dev/null @@ -1,12 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!937362698 &1 -VFXManager: - m_ObjectHideFlags: 0 - m_IndirectShader: {fileID: 0} - m_CopyBufferShader: {fileID: 0} - m_SortShader: {fileID: 0} - m_StripUpdateShader: {fileID: 0} - m_RenderPipeSettingsPath: - m_FixedTimeStep: 0.016666668 - m_MaxDeltaTime: 0.05 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset deleted file mode 100644 index 482590c..0000000 --- a/ProjectSettings/XRSettings.asset +++ /dev/null @@ -1,10 +0,0 @@ -{ - "m_SettingKeys": [ - "VR Device Disabled", - "VR Device User Alert" - ], - "m_SettingValues": [ - "False", - "False" - ] -} \ No newline at end of file From a1c9b17f7deda3a0e948dc45fc44f3cc5ee28b5e Mon Sep 17 00:00:00 2001 From: NafeeJ Date: Tue, 4 Aug 2020 01:12:50 -0400 Subject: [PATCH 052/120] Made ScreenEdgeColliders more efficient. AddCollider() is more efficient than StandaloneAddCollider() by using cached variables set upon Awake() but StandaloneAddCollider() is still theoretically a little bit better. When used in Update() on an i5 3570k, AddCollider() averages 0.02 Time ms and 0.03 Time ms for StandaloneAddCollider() according to Unity Profiler --- .../2D/Colliders/ScreenEdgeColliders.cs | 78 ++++++++++++++----- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs b/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs index bf94311..ac771b7 100644 --- a/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs +++ b/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs @@ -1,35 +1,73 @@ // adds EdgeCollider2D colliders to screen edges // only works with orthographic camera +//Includes two different ways of implementation into your project +//One is a method that uses cached fields on Awake() that requires this entire class but is more slightly more efficient (should use this if you plan to use the method in Update()) +//The other is a standalone method that doesn't need the rest of the class and can be copy-pasted directly into any project but is slightly less efficient + using UnityEngine; -using System.Collections; namespace UnityLibrary { - public class ScreenEdgeColliders : MonoBehaviour - { - void Awake () + public class ScreenEdgeColliders : MonoBehaviour { - AddCollider(); - } + Camera cam; + EdgeCollider2D edge; + Vector2[] edgePoints; - void AddCollider () - { - if (Camera.main==null) {Debug.LogError("Camera.main not found, failed to create edge colliders"); return;} + void Awake() + { + if (Camera.main == null) Debug.LogError("Camera.main not found, failed to create edge colliders"); + else cam = Camera.main; + + if (!cam.orthographic) Debug.LogError("Camera.main is not Orthographic, failed to create edge colliders"); + + // add or use existing EdgeCollider2D + edge = GetComponent() == null ? gameObject.AddComponent() : GetComponent(); + + edgePoints = new Vector2[5]; + + AddCollider(); + } + + //Use this if you're okay with using the global fields and code in Awake() (more efficient) + void AddCollider() + { + //Vector2's for the corners of the screen + Vector2 bottomLeft = cam.ScreenToWorldPoint(new Vector3(0, 0, cam.nearClipPlane)); + Vector2 topRight = cam.ScreenToWorldPoint(new Vector3(cam.pixelWidth, cam.pixelHeight, cam.nearClipPlane)); + Vector2 topLeft = new Vector2(bottomLeft.x, topRight.y); + Vector2 bottomRight = new Vector2(topRight.x, bottomLeft.y); + + //Update Vector2 array for edge collider + edgePoints[0] = bottomLeft; + edgePoints[1] = topLeft; + edgePoints[2] = topRight; + edgePoints[3] = bottomRight; + edgePoints[4] = bottomLeft; + + edge.points = edgePoints; + } + + //Use this if you want a single function to handle everything (less efficient) + //You can just ignore/delete the rest of this class if thats the case + void StandaloneAddCollider() + { + if (Camera.main == null) { Debug.LogError("Camera.main not found, failed to create edge colliders"); return; } - var cam = Camera.main; - if (!cam.orthographic) {Debug.LogError("Camera.main is not Orthographic, failed to create edge colliders"); return;} + var cam = Camera.main; + if (!cam.orthographic) { Debug.LogError("Camera.main is not Orthographic, failed to create edge colliders"); return; } - var bottomLeft = (Vector2)cam.ScreenToWorldPoint(new Vector3(0, 0, cam.nearClipPlane)); - var topLeft = (Vector2)cam.ScreenToWorldPoint(new Vector3(0, cam.pixelHeight, cam.nearClipPlane)); - var topRight = (Vector2)cam.ScreenToWorldPoint(new Vector3(cam.pixelWidth, cam.pixelHeight, cam.nearClipPlane)); - var bottomRight = (Vector2)cam.ScreenToWorldPoint(new Vector3(cam.pixelWidth, 0, cam.nearClipPlane)); + Vector2 bottomLeft = cam.ScreenToWorldPoint(new Vector3(0, 0, cam.nearClipPlane)); + Vector2 topRight = cam.ScreenToWorldPoint(new Vector3(cam.pixelWidth, cam.pixelHeight, cam.nearClipPlane)); + Vector2 topLeft = new Vector2(bottomLeft.x, topRight.y); + Vector2 bottomRight = new Vector2(topRight.x, bottomLeft.y); - // add or use existing EdgeCollider2D - var edge = GetComponent()==null?gameObject.AddComponent():GetComponent(); + // add or use existing EdgeCollider2D + var edge = GetComponent() == null ? gameObject.AddComponent() : GetComponent(); - var edgePoints = new [] {bottomLeft,topLeft,topRight,bottomRight, bottomLeft}; - edge.points = edgePoints; + var edgePoints = new[] { bottomLeft, topLeft, topRight, bottomRight, bottomLeft }; + edge.points = edgePoints; + } } - } } From c262d680bd77dc98588ce2e4e189984f6ff86b28 Mon Sep 17 00:00:00 2001 From: NafeeJ Date: Wed, 5 Aug 2020 04:23:07 -0400 Subject: [PATCH 053/120] Should have made class variables private. A little bit more documentation. --- Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs b/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs index ac771b7..a3ae1c5 100644 --- a/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs +++ b/Assets/Scripts/2D/Colliders/ScreenEdgeColliders.cs @@ -11,9 +11,9 @@ namespace UnityLibrary { public class ScreenEdgeColliders : MonoBehaviour { - Camera cam; - EdgeCollider2D edge; - Vector2[] edgePoints; + private Camera cam; + private EdgeCollider2D edge; + private Vector2[] edgePoints; void Awake() { @@ -31,6 +31,7 @@ void Awake() } //Use this if you're okay with using the global fields and code in Awake() (more efficient) + //You can just ignore/delete StandaloneAddCollider() if thats the case void AddCollider() { //Vector2's for the corners of the screen From 68e74b17266b2473be6f109ebc08a4cace9948de Mon Sep 17 00:00:00 2001 From: LesserKnownThings Date: Fri, 11 Sep 2020 13:29:49 -0400 Subject: [PATCH 054/120] Adding Object Pooling --- Assets/Scripts/ObjectPooling/IPoolActions.cs | 10 +++ .../ObjectPooling/IPoolActions.cs.meta | 11 +++ Assets/Scripts/ObjectPooling/Pool.cs | 84 +++++++++++++++++++ Assets/Scripts/ObjectPooling/Pool.cs.meta | 11 +++ Assets/Scripts/ObjectPooling/PoolObject.cs | 22 +++++ .../Scripts/ObjectPooling/PoolObject.cs.meta | 11 +++ 6 files changed, 149 insertions(+) create mode 100644 Assets/Scripts/ObjectPooling/IPoolActions.cs create mode 100644 Assets/Scripts/ObjectPooling/IPoolActions.cs.meta create mode 100644 Assets/Scripts/ObjectPooling/Pool.cs create mode 100644 Assets/Scripts/ObjectPooling/Pool.cs.meta create mode 100644 Assets/Scripts/ObjectPooling/PoolObject.cs create mode 100644 Assets/Scripts/ObjectPooling/PoolObject.cs.meta diff --git a/Assets/Scripts/ObjectPooling/IPoolActions.cs b/Assets/Scripts/ObjectPooling/IPoolActions.cs new file mode 100644 index 0000000..846d211 --- /dev/null +++ b/Assets/Scripts/ObjectPooling/IPoolActions.cs @@ -0,0 +1,10 @@ +namespace UnityHelper.Pooling +{ + /// + /// Interface to remind you to add the return to pool function + /// + public interface IPoolActions + { + void ReturnObjectToPool(); + } +} diff --git a/Assets/Scripts/ObjectPooling/IPoolActions.cs.meta b/Assets/Scripts/ObjectPooling/IPoolActions.cs.meta new file mode 100644 index 0000000..50206f2 --- /dev/null +++ b/Assets/Scripts/ObjectPooling/IPoolActions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e21db0c60302f24b927bcadd6fc6112 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ObjectPooling/Pool.cs b/Assets/Scripts/ObjectPooling/Pool.cs new file mode 100644 index 0000000..817ca60 --- /dev/null +++ b/Assets/Scripts/ObjectPooling/Pool.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace UnityHelper.Pooling +{ + [Serializable] + public class Pool + { + /// + /// The objects that you want to add to the pool + /// + public List objects_to_pool = new List(); + + /// + /// All the objects that were added to the pool + /// + private List pool_objects = new List(); + + /// + /// Initializes the pool in your scene + /// + public void Start_Pool() + { + var pool = new GameObject("Pool"); + + foreach (var item in objects_to_pool) + { + var sub_parent = new GameObject(item.obj_to_pool.name); + + for (int i = 0; i < item.amount_to_pool; i++) + { + var _obj = UnityEngine.Object.Instantiate(item.obj_to_pool); + _obj.transform.SetParent(sub_parent.transform, false); + _obj.SetActive(false); + pool_objects.Add(_obj); + } + + sub_parent.transform.SetParent(pool.transform, false); + } + } + + /// + /// Gets the item from the pool and spawns it at the required position + /// + /// The type of script in the pool that you need to spawn + /// The position where you want the item to spawn + /// A component of the needed type + public Component Spawn_Item(Type type, Vector3 position, Quaternion direction) + { + foreach (GameObject item in pool_objects) + { + Component comp = null; + item.TryGetComponent(type, out comp); + + if (comp == null) + continue; + + if (item.activeSelf) + continue; + + item.transform.position = position; + item.transform.rotation = direction; + item.SetActive(true); + return comp; + + } + + return null; + } + + /// + /// Brings the item back to the pool + /// + /// The item to bring back to the pool + public void Return_Item(GameObject item) + { + item.SetActive(false); + item.transform.position = Vector3.zero; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/ObjectPooling/Pool.cs.meta b/Assets/Scripts/ObjectPooling/Pool.cs.meta new file mode 100644 index 0000000..ac6cbc2 --- /dev/null +++ b/Assets/Scripts/ObjectPooling/Pool.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa158cddf415eb0449d203dbd26ec022 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ObjectPooling/PoolObject.cs b/Assets/Scripts/ObjectPooling/PoolObject.cs new file mode 100644 index 0000000..fa2cdf6 --- /dev/null +++ b/Assets/Scripts/ObjectPooling/PoolObject.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; + +namespace UnityHelper.Pooling +{ + [Serializable] + public class PoolObject + { + /// + /// The gameobject that you want to spawn + /// + public GameObject obj_to_pool; + /// + /// The amount of objects that you want to spawn + /// + public int amount_to_pool; + } +} \ No newline at end of file diff --git a/Assets/Scripts/ObjectPooling/PoolObject.cs.meta b/Assets/Scripts/ObjectPooling/PoolObject.cs.meta new file mode 100644 index 0000000..a654e61 --- /dev/null +++ b/Assets/Scripts/ObjectPooling/PoolObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b201e930468ede54195a559247b03027 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 13215a516fd00dc70b72c8d6e2cac41270eda80f Mon Sep 17 00:00:00 2001 From: LesserKnownThings Date: Fri, 11 Sep 2020 13:32:22 -0400 Subject: [PATCH 055/120] Adding Additional Files --- .../ObjectPooling/Images/Initialization.PNG | Bin 0 -> 5171 bytes .../ObjectPooling/Images/PoolObjectLook.PNG | Bin 0 -> 7692 bytes .../Scripts/ObjectPooling/Images/SpawnObject.PNG | Bin 0 -> 5356 bytes Assets/Scripts/ObjectPooling/README.md | 4 ++++ Assets/Scripts/ObjectPooling/README.md.meta | 7 +++++++ 5 files changed, 11 insertions(+) create mode 100644 Assets/Scripts/ObjectPooling/Images/Initialization.PNG create mode 100644 Assets/Scripts/ObjectPooling/Images/PoolObjectLook.PNG create mode 100644 Assets/Scripts/ObjectPooling/Images/SpawnObject.PNG create mode 100644 Assets/Scripts/ObjectPooling/README.md create mode 100644 Assets/Scripts/ObjectPooling/README.md.meta diff --git a/Assets/Scripts/ObjectPooling/Images/Initialization.PNG b/Assets/Scripts/ObjectPooling/Images/Initialization.PNG new file mode 100644 index 0000000000000000000000000000000000000000..62f31dc57010e447e9546bac0e7f39191299d94b GIT binary patch literal 5171 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 H>yZBelI;`d literal 0 HcmV?d00001 diff --git a/Assets/Scripts/ObjectPooling/Images/SpawnObject.PNG b/Assets/Scripts/ObjectPooling/Images/SpawnObject.PNG new file mode 100644 index 0000000000000000000000000000000000000000..8641e8d9351cd4c0f077327729068257b922c5ec GIT binary patch literal 5356 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 Object pooling helper class +
+ These scripts help you set up an object pooling system in your game. It's pretty simple to use, let me show you how +![alt text]("Images/Initialization.png); \ No newline at end of file diff --git a/Assets/Scripts/ObjectPooling/README.md.meta b/Assets/Scripts/ObjectPooling/README.md.meta new file mode 100644 index 0000000..a7a1a90 --- /dev/null +++ b/Assets/Scripts/ObjectPooling/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 39978d1555c9ede47adb909257a1bb01 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 0000f663c7ae09e746824f8d74c6d0c8a600bd94 Mon Sep 17 00:00:00 2001 From: LesserKnownThings Date: Fri, 11 Sep 2020 14:11:33 -0400 Subject: [PATCH 056/120] Created readme --- .../ObjectPooling/Images/PoolObject.PNG | Bin 0 -> 12614 bytes Assets/Scripts/ObjectPooling/README.md | 39 ++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 Assets/Scripts/ObjectPooling/Images/PoolObject.PNG diff --git a/Assets/Scripts/ObjectPooling/Images/PoolObject.PNG b/Assets/Scripts/ObjectPooling/Images/PoolObject.PNG new file mode 100644 index 0000000000000000000000000000000000000000..f5302875f031ffdee6ab16668b0287b3548c3081 GIT binary patch literal 12614 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 aF3*eLxwZX63EPDPUAuhiQklMe`2PW_gL?!3 literal 0 HcmV?d00001 diff --git a/Assets/Scripts/ObjectPooling/README.md b/Assets/Scripts/ObjectPooling/README.md index 9b848b0..fb3ca95 100644 --- a/Assets/Scripts/ObjectPooling/README.md +++ b/Assets/Scripts/ObjectPooling/README.md @@ -1,4 +1,37 @@ -

Object pooling helper class

+

Object pooling helper class


- These scripts help you set up an object pooling system in your game. It's pretty simple to use, let me show you how -![alt text]("Images/Initialization.png); \ No newline at end of file +

These scripts help you set up an object pooling system in your game. It's pretty simple to use, let me show you how:

+ +
+ + +

1. Initializing the pool

+ As you can see in the image bellow, you can initialize the pool by creating a new pool and then calling it in the start. + +![Init Image](https://github.com/LesserKnownThings/UnityLibrary/blob/object_pooling/Assets/Scripts/ObjectPooling/Images/Initialization.PNG) + + You'll also have to add the namespace that the pool class is in **using UnityHelper.Pooling;** + +

2. Before you start the game

+ You will have to add the objects that you want the pool to instantiate when it starts. As you can see in the image bellow, the pool object looks like this in the editor: + + ![Look Image](https://github.com/LesserKnownThings/UnityLibrary/blob/object_pooling/Assets/Scripts/ObjectPooling/Images/PoolObjectLook.PNG) + + The pool contains a List of objects that you want to instantiate in the scene. The objects are of type **PoolObject** which you can see here: + + ![List Image](https://github.com/LesserKnownThings/UnityLibrary/blob/object_pooling/Assets/Scripts/ObjectPooling/Images/PoolObject.PNG) + + The **obj_to_pool** is the gameobject that you want to instantiate and the **amount_to_pool** is the amount of objects that you want to instantiate. + +

3. Spawning the objects in the scene

+ Spawning an object is very easy, the **Pool** class comes with a function called **Spawn_Item(Type type, Vector3 position, Quaternion direction)** it returns a **Component** so you can get direct reference to the object. Here's how you do it: + + ![Spawn Image](https://github.com/LesserKnownThings/UnityLibrary/blob/object_pooling/Assets/Scripts/ObjectPooling/Images/SpawnObject.PNG) + + In my example I have a custom Object created by me called **CubeObj** it doesn't do much, but it helps with the example. So when you spawn an item in the scene you have to give the function the following parameters: + + >**Type** the typeof object that the list needs to look for and spawn it in the scene + >**Position** the position where the item should spawn + >**Rotation** the rotation of the item + + One more thing to remember. Pool has a functio to bring back the objects to the pool, but it requires the object as a parameter. That's why I made an interface called **IPoolActions** that comes with **ReturnObjectToPool** void and will help you return the items to the pool. It's pretty easy, to return an item you simply have to **gameobject.SetActive(false)** and also reset its position **transform.position = Vector3.zero**. \ No newline at end of file From 566ae0cf702e755241274fe092e244e6501c7d5b Mon Sep 17 00:00:00 2001 From: LesserKnownThings Date: Fri, 11 Sep 2020 14:13:25 -0400 Subject: [PATCH 057/120] Update README.md --- Assets/Scripts/ObjectPooling/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/ObjectPooling/README.md b/Assets/Scripts/ObjectPooling/README.md index fb3ca95..695b61d 100644 --- a/Assets/Scripts/ObjectPooling/README.md +++ b/Assets/Scripts/ObjectPooling/README.md @@ -31,7 +31,9 @@ In my example I have a custom Object created by me called **CubeObj** it doesn't do much, but it helps with the example. So when you spawn an item in the scene you have to give the function the following parameters: >**Type** the typeof object that the list needs to look for and spawn it in the scene + >**Position** the position where the item should spawn + >**Rotation** the rotation of the item - One more thing to remember. Pool has a functio to bring back the objects to the pool, but it requires the object as a parameter. That's why I made an interface called **IPoolActions** that comes with **ReturnObjectToPool** void and will help you return the items to the pool. It's pretty easy, to return an item you simply have to **gameobject.SetActive(false)** and also reset its position **transform.position = Vector3.zero**. \ No newline at end of file + One more thing to remember. Pool has a function to bring back the objects to the pool, but it requires the object as a parameter. That's why I made an interface called **IPoolActions** that comes with **ReturnObjectToPool** void and will help you return the items to the pool. It's pretty easy, to return an item you simply have to **gameobject.SetActive(false)** and also reset its position **transform.position = Vector3.zero**. From 315c0417285dfd1e3dff0e5b0de9ec696eaee6af Mon Sep 17 00:00:00 2001 From: pkunjam Date: Thu, 1 Oct 2020 01:58:32 +0530 Subject: [PATCH 058/120] Get sprite color in realtime --- Assets/Scripts/ImageEffects/SpriteColor.cs | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 Assets/Scripts/ImageEffects/SpriteColor.cs diff --git a/Assets/Scripts/ImageEffects/SpriteColor.cs b/Assets/Scripts/ImageEffects/SpriteColor.cs new file mode 100644 index 0000000..bf7cad6 --- /dev/null +++ b/Assets/Scripts/ImageEffects/SpriteColor.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// This script gets the color of a sprite in realtime +// Usage: Attach this script to any gameobject having a sprite renderer component + +public class SpriteColor : MonoBehaviour +{ + public static Color GetColor { get; set; } + + public SpriteRenderer targetSprite; + + Color finalColor; + + void Update() + { + GetSpritePixelColorUnderMousePointer(targetSprite, out finalColor); + } + + public bool GetSpritePixelColorUnderMousePointer(SpriteRenderer spriteRenderer, out Color color) + { + color = new Color(); + Camera cam = Camera.main; + Vector2 mousePos = Input.mousePosition; + Vector2 viewportPos = cam.ScreenToViewportPoint(mousePos); + if (viewportPos.x < 0.0f || viewportPos.x > 1.0f || viewportPos.y < 0.0f || viewportPos.y > 1.0f) return false; // out of viewport bounds + + // Cast a ray from viewport point into world + Ray ray = cam.ViewportPointToRay(viewportPos); + + // Check for intersection with sprite and get the color + return IntersectsSprite(spriteRenderer, ray, out color); + } + + private bool IntersectsSprite(SpriteRenderer spriteRenderer, Ray ray, out Color color) + { + color = new Color(); + if (spriteRenderer == null) return false; + + Sprite sprite = spriteRenderer.sprite; + if (sprite == null) return false; + + Texture2D texture = sprite.texture; + if (texture == null) return false; + + + // Craete a plane so it has the same orientation as the sprite transform + Plane plane = new Plane(transform.forward, transform.position); + + // Intersect the ray and the plane + float rayIntersectDist; // the distance from the ray origin to the intersection point + if (!plane.Raycast(ray, out rayIntersectDist)) return false; + + // Convert world position to sprite position + // worldToLocalMatrix.MultiplyPoint3x4 returns a value from based on the texture dimensions (+/- half texDimension / pixelsPerUnit) ) + // 0, 0 corresponds to the center of the TEXTURE ITSELF, not the center of the trimmed sprite textureRect + + Vector3 spritePos = spriteRenderer.worldToLocalMatrix.MultiplyPoint3x4(ray.origin + (ray.direction * rayIntersectDist)); + Rect textureRect = sprite.textureRect; + float pixelsPerUnit = sprite.pixelsPerUnit; + float halfRealTexWidth = texture.width * 0.5f; // use the real texture width here because center is based on this -- probably won't work right for atlases + float halfRealTexHeight = texture.height * 0.5f; + // Convert to pixel position, offsetting so 0,0 is in lower left instead of center + int texPosX = (int)(spritePos.x * pixelsPerUnit + halfRealTexWidth); + int texPosY = (int)(spritePos.y * pixelsPerUnit + halfRealTexHeight); + // Check if pixel is within texture + if (texPosX < 0 || texPosX < textureRect.x || texPosX >= Mathf.FloorToInt(textureRect.xMax)) return false; // out of bounds + if (texPosY < 0 || texPosY < textureRect.y || texPosY >= Mathf.FloorToInt(textureRect.yMax)) return false; // out of bounds + // Get pixel color + color = texture.GetPixel(texPosX, texPosY); + GetColor = color; + + return true; + } + +} From 615275b0bf71dcee1a5c82cdbeb3ed181f1000e5 Mon Sep 17 00:00:00 2001 From: atknssl Date: Thu, 1 Oct 2020 21:43:02 +0300 Subject: [PATCH 059/120] Deleted Javascript Templates --- ...avascript Editor Window-NewEditorScript.js.txt | 14 -------------- ...ipt Custom Editor-NewCustomEditorScript.js.txt | 15 --------------- ...Property Drawer-NewPropertyDrawerScript.js.txt | 10 ---------- 3 files changed, 39 deletions(-) delete mode 100644 ScriptTemplates/82a-Javascript Editor Window-NewEditorScript.js.txt delete mode 100644 ScriptTemplates/82b-Javascript Custom Editor-NewCustomEditorScript.js.txt delete mode 100644 ScriptTemplates/82c-Javascript Property Drawer-NewPropertyDrawerScript.js.txt diff --git a/ScriptTemplates/82a-Javascript Editor Window-NewEditorScript.js.txt b/ScriptTemplates/82a-Javascript Editor Window-NewEditorScript.js.txt deleted file mode 100644 index a0fa1bf..0000000 --- a/ScriptTemplates/82a-Javascript Editor Window-NewEditorScript.js.txt +++ /dev/null @@ -1,14 +0,0 @@ -#pragma strict - -class #SCRIPTNAME# extends EditorWindow { - - @MenuItem ("Window/#SCRIPTNAME#") - static function Initialize () { - EditorWindow.GetWindow (#SCRIPTNAME#); - } - - function OnGUI () { - - } - -} diff --git a/ScriptTemplates/82b-Javascript Custom Editor-NewCustomEditorScript.js.txt b/ScriptTemplates/82b-Javascript Custom Editor-NewCustomEditorScript.js.txt deleted file mode 100644 index e7ec9bb..0000000 --- a/ScriptTemplates/82b-Javascript Custom Editor-NewCustomEditorScript.js.txt +++ /dev/null @@ -1,15 +0,0 @@ -#pragma strict - -@CustomEditor (#SCRIPTNAME#) -@CanEditMultipleObjects -class #SCRIPTNAME# extends Editor { - - function OnEnable () { - - } - - function OnInspectorGUI () { - - } - -} diff --git a/ScriptTemplates/82c-Javascript Property Drawer-NewPropertyDrawerScript.js.txt b/ScriptTemplates/82c-Javascript Property Drawer-NewPropertyDrawerScript.js.txt deleted file mode 100644 index 1a79b09..0000000 --- a/ScriptTemplates/82c-Javascript Property Drawer-NewPropertyDrawerScript.js.txt +++ /dev/null @@ -1,10 +0,0 @@ -#pragma strict - -@CustomPropertyDrawer (#SCRIPTNAME#) -class #SCRIPTNAME# extends PropertyDrawer { - - function OnGUI () { - - } - -} From 3c2c49dbef7349e5847171f63197fe4796e42002 Mon Sep 17 00:00:00 2001 From: HuangWei Date: Tue, 12 Jan 2021 17:45:55 +0800 Subject: [PATCH 060/120] Add thousand separators in GetSelectedMeshInfo --- Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs index d8ddcf3..f9479f9 100644 --- a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs +++ b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs @@ -1,5 +1,6 @@ // display selected gameobject mesh stats (should work on prefabs,models in project window also) +using System; using System.Collections.Generic; using System.Linq; using UnityEditor; @@ -69,9 +70,10 @@ void OnGUI() } // display stats - EditorGUILayout.LabelField("Meshes: " + totalMeshes); - EditorGUILayout.LabelField("Vertices: " + totalVertices); - EditorGUILayout.LabelField("Triangles: " + totalTris); + // String.Format("{0:n0}", 9876); // No digits after the decimal point. Output: 9,876 + EditorGUILayout.LabelField("Meshes: " + $"{totalMeshes:n0}"); + EditorGUILayout.LabelField("Vertices: " + $"{totalVertices:n0}"); + EditorGUILayout.LabelField("Triangles: " + $"{totalTris:n0}"); EditorGUILayout.Space(); EditorGUILayout.LabelField("TOP 20", EditorStyles.boldLabel); @@ -88,7 +90,7 @@ void OnGUI() { EditorGUIUtility.PingObject(meshes[item.Key].transform); } - EditorGUILayout.LabelField(meshes[item.Key].name + " = " + item.Value + " (" + percent + "%)"); + EditorGUILayout.LabelField(meshes[item.Key].name + " = " + $"{item.Value:n0}" + " (" + percent + "%)"); GUILayout.ExpandWidth(true); EditorGUILayout.EndHorizontal(); From a6b46fcb6a8bc4daaa24c2c3f207ce4c0977953d Mon Sep 17 00:00:00 2001 From: HuangWei Date: Tue, 12 Jan 2021 17:48:24 +0800 Subject: [PATCH 061/120] Remove unused import --- Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs index f9479f9..e12f971 100644 --- a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs +++ b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs @@ -1,6 +1,5 @@ // display selected gameobject mesh stats (should work on prefabs,models in project window also) -using System; using System.Collections.Generic; using System.Linq; using UnityEditor; From 2f8b6abad9830359677de506d400d42c45d0aee4 Mon Sep 17 00:00:00 2001 From: Hasan Bayat Date: Thu, 11 Mar 2021 19:20:56 +0330 Subject: [PATCH 062/120] Create GlobalVariables.cs https://gist.github.com/hasanbayatme/f3ddf56cf261a6b40efc14ecb9881a98 --- Assets/Scripts/Utilities/GlobalVariables.cs | 65 +++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 Assets/Scripts/Utilities/GlobalVariables.cs diff --git a/Assets/Scripts/Utilities/GlobalVariables.cs b/Assets/Scripts/Utilities/GlobalVariables.cs new file mode 100644 index 0000000..6c40aa9 --- /dev/null +++ b/Assets/Scripts/Utilities/GlobalVariables.cs @@ -0,0 +1,65 @@ +using System.Collections.Generic; + +/// +/// A simple static class to get and set globally accessible variables through a key-value approach. +/// +/// +/// Uses a key-value approach (dictionary) for storing and modifying variables. +/// It also uses a lock to ensure consistency between the threads. +/// +public static class GlobalVariables +{ + + private static readonly object lockObject = new object(); + private static Dictionary variablesDictionary = new Dictionary(); + + /// + /// The underlying key-value storage (dictionary). + /// + /// Gets the underlying variables dictionary + public static Dictionary VariablesDictionary => variablesDictionary; + + /// + /// Retrieves all global variables. + /// + /// The global variables dictionary object. + public static Dictionary GetAll() + { + return variablesDictionary; + } + + /// + /// Gets a variable and casts it to the provided type argument. + /// + /// The type of the variable + /// The variable key + /// The casted variable value + public static T Get(string key) + { + if (variablesDictionary == null || !variablesDictionary.ContainsKey(key)) + { + return default(T); + } + + return (T)variablesDictionary[key]; + } + + /// + /// Sets the variable, the existing value gets overridden. + /// + /// It uses a lock under the hood to ensure consistensy between threads + /// The variable name/key + /// The variable value + public static void Set(string key, string value) + { + lock (lockObject) + { + if (variablesDictionary == null) + { + variablesDictionary = new Dictionary(); + } + variablesDictionary[key] = value; + } + } + +} From 541004d0950b4f48fb4a88b0f33e7e3cd79ca555 Mon Sep 17 00:00:00 2001 From: Hasan Bayat Date: Thu, 11 Mar 2021 19:33:38 +0330 Subject: [PATCH 063/120] Update GlobalVariables.cs Fixed GlobalVariables.cs Set method 2nd parameter type https://gist.github.com/hasanbayatme/f3ddf56cf261a6b40efc14ecb9881a98 --- Assets/Scripts/Utilities/GlobalVariables.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Utilities/GlobalVariables.cs b/Assets/Scripts/Utilities/GlobalVariables.cs index 6c40aa9..b1ab699 100644 --- a/Assets/Scripts/Utilities/GlobalVariables.cs +++ b/Assets/Scripts/Utilities/GlobalVariables.cs @@ -50,7 +50,7 @@ public static T Get(string key) /// It uses a lock under the hood to ensure consistensy between threads /// The variable name/key /// The variable value - public static void Set(string key, string value) + public static void Set(string key, object value) { lock (lockObject) { From ac3ae833ee4b1636c521ca01b7e2d0c452fe37e7 Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 11 May 2021 08:07:06 +0300 Subject: [PATCH 064/120] add MobileCamera.cs --- Assets/Scripts/Camera/MobileCamera.cs | 135 ++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 Assets/Scripts/Camera/MobileCamera.cs diff --git a/Assets/Scripts/Camera/MobileCamera.cs b/Assets/Scripts/Camera/MobileCamera.cs new file mode 100644 index 0000000..99fd6f5 --- /dev/null +++ b/Assets/Scripts/Camera/MobileCamera.cs @@ -0,0 +1,135 @@ +// https://forum.unity.com/threads/mobile-touch-to-orbit-pan-and-zoom-camera-without-fix-target-in-one-script.522607/#post-3531342 + +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MobileCamera : MonoBehaviour +{ + public Transform target; + public Vector3 targetOffset; + public float distance = 5.0f; + public float maxDistance = 20; + public float minDistance = .6f; + public float xSpeed = 5.0f; + public float ySpeed = 5.0f; + public int yMinLimit = -80; + public int yMaxLimit = 80; + public float zoomRate = 10.0f; + public float panSpeed = 0.3f; + public float zoomDampening = 5.0f; + + private float xDeg = 0.0f; + private float yDeg = 0.0f; + private float currentDistance; + private float desiredDistance; + private Quaternion currentRotation; + private Quaternion desiredRotation; + private Quaternion rotation; + private Vector3 position; + + private Vector3 FirstPosition; + private Vector3 SecondPosition; + private Vector3 delta; + private Vector3 lastOffset; + private Vector3 lastOffsettemp; + //private Vector3 CameraPosition; + //private Vector3 Targetposition; + //private Vector3 MoveDistance; + + public float offsetSpeed = 0.03f; + + void Start() { Init(); } + void OnEnable() { Init(); } + + public void Init() + { + //If there is no target, create a temporary target at 'distance' from the cameras current viewpoint + if (!target) + { + GameObject go = new GameObject("Cam Target"); + go.transform.position = transform.position + (transform.forward * distance); + target = go.transform; + } + + distance = Vector3.Distance(transform.position, target.position); + currentDistance = distance; + desiredDistance = distance; + + //be sure to grab the current rotations as starting points. + position = transform.position; + rotation = transform.rotation; + currentRotation = transform.rotation; + desiredRotation = transform.rotation; + + //xDeg = Vector3.Angle(Vector3.right, transform.right); + //yDeg = Vector3.Angle(Vector3.up, transform.up); + + xDeg = transform.eulerAngles.y + Vector3.Angle(Vector3.right, transform.right); + yDeg = transform.eulerAngles.x + Vector3.Angle(Vector3.up, transform.up); + + } + + void LateUpdate() + { + // If Control and Alt and Middle button? ZOOM! + if (Input.touchCount == 2) + { + Touch touchZero = Input.GetTouch(0); + Touch touchOne = Input.GetTouch(1); + Vector2 touchZeroPreviousPosition = touchZero.position - touchZero.deltaPosition; + Vector2 touchOnePreviousPosition = touchOne.position - touchOne.deltaPosition; + float prevTouchDeltaMag = (touchZeroPreviousPosition - touchOnePreviousPosition).magnitude; + float TouchDeltaMag = (touchZero.position - touchOne.position).magnitude; + float deltaMagDiff = prevTouchDeltaMag - TouchDeltaMag; + desiredDistance += deltaMagDiff * Time.deltaTime * zoomRate * 0.0025f * Mathf.Abs(desiredDistance); + } + + // If middle mouse and left alt are selected? ORBIT + if (Input.touchCount == 1 && Input.GetTouch(0).phase == TouchPhase.Moved) + { + Vector2 touchposition = Input.GetTouch(0).deltaPosition; + xDeg += touchposition.x * xSpeed * 0.002f; + yDeg -= touchposition.y * ySpeed * 0.002f; + yDeg = ClampAngle(yDeg, yMinLimit, yMaxLimit); + + } + + desiredRotation = Quaternion.Euler(yDeg, xDeg, 0); + currentRotation = transform.rotation; + rotation = Quaternion.Lerp(currentRotation, desiredRotation, Time.deltaTime * zoomDampening); + transform.rotation = rotation; + + if (Input.GetMouseButtonDown(1)) + { + FirstPosition = Input.mousePosition; + lastOffset = targetOffset; + } + + if (Input.GetMouseButton(1)) + { + SecondPosition = Input.mousePosition; + delta = SecondPosition - FirstPosition; + targetOffset = lastOffset + transform.right * delta.x * offsetSpeed + transform.up * delta.y * offsetSpeed; + + } + + ////////Orbit Position + // affect the desired Zoom distance if we roll the scrollwheel + desiredDistance = Mathf.Clamp(desiredDistance, minDistance, maxDistance); + currentDistance = Mathf.Lerp(currentDistance, desiredDistance, Time.deltaTime * zoomDampening); + position = target.position - (rotation * Vector3.forward * currentDistance); + position = position - targetOffset; + transform.position = position; + } + + private static float ClampAngle(float angle, float min, float max) + { + if (angle < -360) + angle += 360; + if (angle > 360) + angle -= 360; + return Mathf.Clamp(angle, min, max); + } +} + From c068ce60b0953a20998328d4f8efb8426a5ed0ed Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 5 Oct 2021 09:53:16 +0300 Subject: [PATCH 065/120] add EditorCardboardCamera script --- .../Scripts/Camera/EditorCardboardCamera.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Assets/Scripts/Camera/EditorCardboardCamera.cs diff --git a/Assets/Scripts/Camera/EditorCardboardCamera.cs b/Assets/Scripts/Camera/EditorCardboardCamera.cs new file mode 100644 index 0000000..c73bd45 --- /dev/null +++ b/Assets/Scripts/Camera/EditorCardboardCamera.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +// editor only Google Carboard VR cam simulation with left alt + mouse + +public class EditorCardboardCamera : MonoBehaviour +{ +#if UNITY_EDITOR + Vector2 rotation = Vector2.zero; + public float speed = 3; + + void Update() + { + if (Input.GetKey(KeyCode.LeftAlt)) + { + rotation.y += Input.GetAxis("Mouse X"); + rotation.x += -Input.GetAxis("Mouse Y"); + transform.eulerAngles = (Vector2)rotation * speed; + } + } +#endif +} From 2507ed97251fb7734b504a295953abe4e99e0a7c Mon Sep 17 00:00:00 2001 From: tanghuipang <34344955+tanghuipang@users.noreply.github.com> Date: Tue, 26 Oct 2021 16:07:54 +0800 Subject: [PATCH 066/120] drawline: fix issue fix z position --- Assets/Scripts/Drawing/DrawLine.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Drawing/DrawLine.cs b/Assets/Scripts/Drawing/DrawLine.cs index 44d6c53..6ffbfbd 100644 --- a/Assets/Scripts/Drawing/DrawLine.cs +++ b/Assets/Scripts/Drawing/DrawLine.cs @@ -53,8 +53,9 @@ protected virtual void Update() } if (Input.GetMouseButton(0)) { - Vector3 mousePosition = m_Camera.ScreenToWorldPoint(Input.mousePosition); - mousePosition.z = m_LineRenderer.transform.position.z; + var pos = new Vector3(Input.mousePosition.x, Input.mousePosition.y, lineRenderer.transform.position.z - m_Camera.transform.position.z); + Vector3 mousePosition = m_Camera.ScreenToWorldPoint(pos); + mousePosition.z = 0; if (!m_Points.Contains(mousePosition)) { m_Points.Add(mousePosition); From 0ffc6ebea55c69514cce93d13edfddaad9a361e0 Mon Sep 17 00:00:00 2001 From: mika Date: Mon, 29 Nov 2021 19:52:42 +0200 Subject: [PATCH 067/120] Add initial SimpleSmoothMouseLook camera controller for new input system --- .../Camera/SimpleSmoothMouseLookNewInput.cs | 260 ++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs diff --git a/Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs b/Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs new file mode 100644 index 0000000..5e8d776 --- /dev/null +++ b/Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs @@ -0,0 +1,260 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace UnityLibrary +{ + public class SimpleSmoothMouseLookNewInput : MonoBehaviour + { + [Header("Mouse Look")] + [Tooltip("Hold right mouse button down to rotate")] + public bool rotateWithRightMouse = true; + public Vector2 clampInDegrees = new Vector2(360, 180); + public bool lockCursor = false; + public Vector2 sensitivity = new Vector2(2, 2); + public Vector2 smoothing = new Vector2(3, 3); + Vector2 targetDirection; + Vector2 _mouseAbsolute; + Vector2 _smoothMouse; + + [Header("Camera Pan")] + public bool enablePanning = true; + public float panSpeed = 40; + + [Header("Camera Orbit")] + public bool enableOrbit = false; + public KeyCode orbitKey = KeyCode.LeftAlt; + [Tooltip("Set this to -1, if you dont require any mousebutton pressed for orbit")] + public int orbitMouseKey = 2; + public float orbitXSpeed = 400; + public float orbitYSpeed = 400; + Vector3 targetposition; + float orbitDistance = 10.0f; + private float xDeg = 0.0f; + private float yDeg = 0.0f; + + [Header("Camera Zoom")] + public bool scrollZoom = false; + public int zoomRate = 40; + public float zoomDampening = 5.0f; + public KeyCode zoomExtends = KeyCode.F; // whole cloud + + [Header("Camera Fly")] + public float flySpeed = 20; // default speed + public float accelerationRatio = 5; // when shift is pressed + public float slowDownRatio = 0.5f; // when ctrl is pressed + public KeyCode increaseSpeedKey = KeyCode.LeftShift; + public KeyCode decreaseSpeedKey = KeyCode.LeftControl; + public KeyCode upKey = KeyCode.E; + public KeyCode downKey = KeyCode.Q; + public string horizontalAxisKey = "Horizontal"; + public string verticalAxisKey = "Vertical"; + + public bool moveRoot = false; + Transform moveTransform; + + Camera cam; + + void Awake() + { + cam = Camera.main; + + moveTransform = moveRoot ? transform.root : transform; + } + + private void Start() + { + if (ReferenceManager.instance != null) ReferenceManager.instance.mouseControls = this; + } + + private void OnEnable() + { + // Set target direction to the camera's initial orientation, NOTE need to do this if you move camera manually elsewhere + targetDirection = transform.localRotation.eulerAngles; + } + + void Update() + { + Framing(); + if (MouseOrbit() == true) return; + MouseLook(); + CameraFly(); + } + + void Framing() + { + + } + + public void GetOrbitTarget() + { + targetposition = transform.forward * orbitDistance; + //orbitDistance = Vector3.Distance(transform.position, targetposition); + } + + + bool MouseOrbit() + { + // early exit, if not enabled, or no key is pressed, or if mousekey is set, but not pressed + if (enableOrbit == false || Input.GetKey(orbitKey) == false || (orbitMouseKey > -1 == true && Input.GetMouseButton(orbitMouseKey) == false)) + { + return false; + } + + orbitDistance += Input.GetAxis("Mouse ScrollWheel") * zoomRate * Time.deltaTime; + + xDeg = (Input.GetAxis("Mouse X") * orbitXSpeed); + yDeg = -(Input.GetAxis("Mouse Y") * orbitYSpeed); + transform.RotateAround(targetposition, Vector3.up, xDeg * Time.deltaTime); + transform.RotateAround(targetposition, transform.right, yDeg * Time.deltaTime); + + targetDirection = transform.rotation.eulerAngles; + + return true; + } + + static float ClampAngle(float angle, float min, float max) + { + if (angle < -360) + angle += 360; + if (angle > 360) + angle -= 360; + return Mathf.Clamp(angle, min, max); + } + + void MouseLook() + { + // Get raw mouse input for a cleaner reading on more sensitive mice. + //var mouseDelta = new Vector2(Input.GetAxisRaw("Mouse X"), Input.GetAxisRaw("Mouse Y")); + var mouseDelta = Mouse.current.delta.ReadValue() * Time.deltaTime*3; + + // panning with middle moouse button + if (enablePanning == true) + { + //if (Input.GetMouseButton(2)) + if (Mouse.current.middleButton.isPressed) + { + transform.Translate(-mouseDelta * panSpeed * Time.deltaTime, Space.Self); + GetOrbitTarget(); // update orbit target + } + } + + // Ensure the cursor is always locked when set + if (lockCursor == true) Cursor.lockState = CursorLockMode.Locked; + + //if (rotateWithRightMouse == true && !Input.GetMouseButton(1)) return; + if (rotateWithRightMouse == true && !Mouse.current.rightButton.isPressed) return; + + // Allow the script to clamp based on a desired target value. + Quaternion targetOrientation = Quaternion.Euler(targetDirection); + + // Scale input against the sensitivity setting and multiply that against the smoothing value. + mouseDelta = Vector2.Scale(mouseDelta, new Vector2(sensitivity.x * smoothing.x, sensitivity.y * smoothing.y)); + // Interpolate mouse movement over time to apply smoothing delta. + _smoothMouse.x = Mathf.Lerp(_smoothMouse.x, mouseDelta.x, 1f / smoothing.x); + _smoothMouse.y = Mathf.Lerp(_smoothMouse.y, mouseDelta.y, 1f / smoothing.y); + // Find the absolute mouse movement value from point zero. + _mouseAbsolute += _smoothMouse; + + // Clamp and apply the local x value first, so as not to be affected by world transforms. + if (clampInDegrees.x < 360) _mouseAbsolute.x = Mathf.Clamp(_mouseAbsolute.x, -clampInDegrees.x * 0.5f, clampInDegrees.x * 0.5f); + + var xRotation = Quaternion.AngleAxis(-_mouseAbsolute.y, targetOrientation * Vector3.right); + transform.localRotation = xRotation; + + // Then clamp and apply the global y value. + if (clampInDegrees.y < 360) _mouseAbsolute.y = Mathf.Clamp(_mouseAbsolute.y, -clampInDegrees.y * 0.5f, clampInDegrees.y * 0.5f); + + var yRotation = Quaternion.AngleAxis(_mouseAbsolute.x, transform.InverseTransformDirection(Vector3.up)); + transform.localRotation *= yRotation; + transform.rotation *= targetOrientation; + } + + void CameraFly() + { + bool moved = false; + // shift was pressed down + //if (Input.GetKeyDown(increaseSpeedKey)) + if (Keyboard.current.leftShiftKey.wasPressedThisFrame) + { + flySpeed *= accelerationRatio; // increase flyspeed + } + + //if (Input.GetKeyUp(increaseSpeedKey)) + if (Keyboard.current.leftShiftKey.wasReleasedThisFrame) + { + flySpeed /= accelerationRatio; // flyspeed back to normal + } + + //if (Input.GetKeyDown(decreaseSpeedKey)) + if (Keyboard.current.leftCtrlKey.wasPressedThisFrame) + { + flySpeed *= slowDownRatio; // decrease flyspeed + } + //if (Input.GetKeyUp(decreaseSpeedKey)) + if (Keyboard.current.leftCtrlKey.wasReleasedThisFrame) + { + flySpeed /= slowDownRatio; // flyspeed back to normal + } + + var vert = -Keyboard.current.sKey.ReadValue() + Keyboard.current.wKey.ReadValue(); + if (vert != 0) + { + moveTransform.Translate(transform.forward * flySpeed * EloManager.instance.camSpeedMultiplier * vert * Time.deltaTime, Space.World); + moved = true; + } + + var horz = -Keyboard.current.aKey.ReadValue() + Keyboard.current.dKey.ReadValue(); + if (horz != 0) + { + moveTransform.Translate(transform.right * flySpeed * EloManager.instance.camSpeedMultiplier * horz * Time.deltaTime, Space.World); + moved = true; + } + + // annoying in editor as it works from any window +#if !UNITY_EDITOR + if (scrollZoom == true) + { + //if (Input.GetAxis("Mouse ScrollWheel") != 0) + var scrollY = Mouse.current.scroll.ReadValue().y; + if (scrollY != 0) + { + transform.Translate(transform.forward * zoomRate * scrollY * Time.deltaTime, Space.World); + moved = true; + } + } +#endif + + //if (Input.GetKey(upKey)) + if (Keyboard.current.qKey.isPressed) + { + moveTransform.Translate(moveTransform.up * flySpeed * 0.5f * Time.deltaTime, Space.World); + moved = true; + } + //else if (Input.GetKey(downKey)) + else if (Keyboard.current.eKey.isPressed) + { + moveTransform.Translate(-moveTransform.up * flySpeed * 0.5f * Time.deltaTime, Space.World); + moved = true; + } + if (moved == true) GetOrbitTarget(); + } // CameraFly() + + // https://stackoverflow.com/questions/25368259/making-an-object-fit-exactly-inside-the-camera-frustum-in-three-js + public void FocusCameraOnGameObject(Bounds b) + { + var height = b.max.y; + var width = b.max.x - b.min.x; + var vertical_FOV = cam.fieldOfView * (Mathf.PI / 180f); + var aspectRatio = Screen.width / Screen.height; + var horizontal_FOV = 2 * Mathf.Atan(Mathf.Tan(vertical_FOV / 2) * aspectRatio); + var distance_vertical = height / (2 * Mathf.Tan(vertical_FOV / 2)); + var distance_horizontal = width / (2 * Mathf.Tan(horizontal_FOV / 2)); + var z_distance = distance_vertical >= distance_horizontal ? distance_vertical : distance_horizontal; + // current viewdir + var viewDir = transform.forward; + // move camera so that object is in front + cam.transform.position = b.center - viewDir * z_distance * 2; + } + + } // class +} // namespace From 0cd5d2f2c00a3b66c96a67f5306069426b224e06 Mon Sep 17 00:00:00 2001 From: mika Date: Mon, 29 Nov 2021 19:54:56 +0200 Subject: [PATCH 068/120] Update SimpleSmoothMouseLookNewInput.cs --- Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs b/Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs index 5e8d776..2864d24 100644 --- a/Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs +++ b/Assets/Scripts/Camera/SimpleSmoothMouseLookNewInput.cs @@ -63,7 +63,7 @@ void Awake() private void Start() { - if (ReferenceManager.instance != null) ReferenceManager.instance.mouseControls = this; + } private void OnEnable() @@ -199,14 +199,14 @@ void CameraFly() var vert = -Keyboard.current.sKey.ReadValue() + Keyboard.current.wKey.ReadValue(); if (vert != 0) { - moveTransform.Translate(transform.forward * flySpeed * EloManager.instance.camSpeedMultiplier * vert * Time.deltaTime, Space.World); + moveTransform.Translate(transform.forward * flySpeed * vert * Time.deltaTime, Space.World); moved = true; } var horz = -Keyboard.current.aKey.ReadValue() + Keyboard.current.dKey.ReadValue(); if (horz != 0) { - moveTransform.Translate(transform.right * flySpeed * EloManager.instance.camSpeedMultiplier * horz * Time.deltaTime, Space.World); + moveTransform.Translate(transform.right * flySpeed * horz * Time.deltaTime, Space.World); moved = true; } From d92e853dcaee5c585645b7f0acf8a07c11c194c5 Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 28 Dec 2021 15:38:40 +0200 Subject: [PATCH 069/120] Create WindowAlwaysOnTop.cs --- .../Helpers/Windows/WindowAlwaysOnTop.cs | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs diff --git a/Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs b/Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs new file mode 100644 index 0000000..6d2a7ed --- /dev/null +++ b/Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs @@ -0,0 +1,39 @@ +// keep executable window always on top, good for multiplayer testing + +using System; +using System.Runtime.InteropServices; +using UnityEngine; + +namespace UnityLibrary +{ + public class WindowAlwaysOnTop : MonoBehaviour + { + // https://stackoverflow.com/a/34703664/5452781 + private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1); + private const UInt32 SWP_NOSIZE = 0x0001; + private const UInt32 SWP_NOMOVE = 0x0002; + private const UInt32 TOPMOST_FLAGS = SWP_NOMOVE | SWP_NOSIZE; + + [DllImport("user32.dll")] + [return: MarshalAs(UnmanagedType.Bool)] + public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags); + + // https://forum.unity.com/threads/unity-window-handle.115364/#post-1650240 + [DllImport("user32.dll")] + private static extern IntPtr GetActiveWindow(); + + public static IntPtr GetWindowHandle() + { + return GetActiveWindow(); + } + + void Awake() + { + // TODO save current window pos to player prefs on exit, then can open into same position next time +#if !UNITY_EDITOR + Debug.Log("Make window stay on top"); + SetWindowPos(GetActiveWindow(), HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS); +#endif + } + } +} From 8296e3dfb9d3f3f7a968bb3e056e1e3354e38d53 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 31 Dec 2021 11:29:20 +0200 Subject: [PATCH 070/120] Update WindowAlwaysOnTop.cs --- Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs b/Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs index 6d2a7ed..1946cc3 100644 --- a/Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs +++ b/Assets/Scripts/Helpers/Windows/WindowAlwaysOnTop.cs @@ -8,6 +8,8 @@ namespace UnityLibrary { public class WindowAlwaysOnTop : MonoBehaviour { +#if !UNITY_STANDALONE_LINUX + // https://stackoverflow.com/a/34703664/5452781 private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1); private const UInt32 SWP_NOSIZE = 0x0001; @@ -26,11 +28,12 @@ public static IntPtr GetWindowHandle() { return GetActiveWindow(); } +#endif void Awake() { // TODO save current window pos to player prefs on exit, then can open into same position next time -#if !UNITY_EDITOR +#if !UNITY_EDITOR && !UNITY_STANDALONE_LINUX Debug.Log("Make window stay on top"); SetWindowPos(GetActiveWindow(), HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS); #endif From eae9ec892e7a4755fdae81401b2a0fb2abe0a869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Nie=C5=9Bciur?= <63786641+factuall@users.noreply.github.com> Date: Sun, 30 Jan 2022 07:40:20 +0100 Subject: [PATCH 071/120] Create MoveAround.cs --- Assets/Scripts/Editor/Hierarchy/MoveAround.cs | 77 +++++++++++++++++++ .../Editor/Hierarchy/MoveAround.cs.meta | 11 +++ 2 files changed, 88 insertions(+) create mode 100644 Assets/Scripts/Editor/Hierarchy/MoveAround.cs create mode 100644 Assets/Scripts/Editor/Hierarchy/MoveAround.cs.meta diff --git a/Assets/Scripts/Editor/Hierarchy/MoveAround.cs b/Assets/Scripts/Editor/Hierarchy/MoveAround.cs new file mode 100644 index 0000000..1ac886c --- /dev/null +++ b/Assets/Scripts/Editor/Hierarchy/MoveAround.cs @@ -0,0 +1,77 @@ +// Simple shortcuts for moving selected GameObject around in hierarchy by Factuall +// SHIFT + CTRL + ALT + +// W - Move it up in hierarchy +// S - Move it down in hierarchy +// A - Unparent it down +// D - Parent it to next object in hierarchy + +using UnityEditor; + +namespace UnityLibrary +{ + public class UnparentMe + { + [MenuItem("GameObject/Unparent %#&a")] + static void Detach() + { + + if (Selection.activeGameObject != null && Selection.activeGameObject.transform.parent != null) + { + int newIndex = Selection.activeGameObject.transform.parent.GetSiblingIndex(); + Undo.SetTransformParent(Selection.activeGameObject.transform, Selection.activeGameObject.transform.parent.parent, "unparent selection"); + Selection.activeGameObject.transform.SetSiblingIndex(newIndex + 1); + } + } + [MenuItem("GameObject/ParentDown %#&d")] + static void ParentDown() + { + if (Selection.activeGameObject != null) + { + int parentChildCount = Selection.activeGameObject.transform.parent == null ? + Selection.activeGameObject.scene.rootCount : Selection.activeGameObject.transform.parent.childCount; + if (Selection.activeGameObject.transform.GetSiblingIndex() == parentChildCount - 1) return; + if (Selection.activeGameObject.transform.parent != null) + { + if (Selection.activeGameObject.transform.parent.childCount + 1 > Selection.activeGameObject.transform.GetSiblingIndex()) + Undo.SetTransformParent(Selection.activeGameObject.transform, Selection.activeGameObject.transform.parent.GetChild(Selection.activeGameObject.transform.GetSiblingIndex() + 1), "parent selection down in hierarchy"); + + } + else + { + if (Selection.activeGameObject.scene.rootCount + 1 > Selection.activeGameObject.transform.GetSiblingIndex()) + Undo.SetTransformParent(Selection.activeGameObject.transform, Selection.activeGameObject.scene.GetRootGameObjects()[Selection.activeGameObject.transform.GetSiblingIndex() + 1].transform, "parent selection down in hierarchy"); + } + } + + } + [MenuItem("GameObject/Moveup %#&w")] + static void MoveUp() + { + if (Selection.activeGameObject != null) + { + + if (Selection.activeGameObject.transform.GetSiblingIndex() != 0) + { + Undo.RegisterCompleteObjectUndo(Selection.activeGameObject.transform, "move selction up in hierarchy"); + Selection.activeGameObject.transform.SetSiblingIndex(Selection.activeGameObject.transform.GetSiblingIndex() - 1); + } + + } + } + [MenuItem("GameObject/Movedown %#&s")] + static void MoveDown() + { + if (Selection.activeGameObject != null) + { + int parentChildCount = Selection.activeGameObject.transform.parent == null ? + Selection.activeGameObject.scene.rootCount : Selection.activeGameObject.transform.parent.childCount; + if (Selection.activeGameObject.transform.GetSiblingIndex() != parentChildCount - 1) + { + Undo.RegisterCompleteObjectUndo(Selection.activeGameObject.transform, "move selction down in hierarchy"); + Selection.activeGameObject.transform.SetSiblingIndex(Selection.activeGameObject.transform.GetSiblingIndex() + 1); + } + + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Editor/Hierarchy/MoveAround.cs.meta b/Assets/Scripts/Editor/Hierarchy/MoveAround.cs.meta new file mode 100644 index 0000000..41e518a --- /dev/null +++ b/Assets/Scripts/Editor/Hierarchy/MoveAround.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 18fe530f4fbd8b74096f07f377a4b9ff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From d7d1beaa3e30259be2c4ac79f69152ee646771fb Mon Sep 17 00:00:00 2001 From: Kaustubh Mayekar <67229974+Kaustubh01@users.noreply.github.com> Date: Mon, 28 Feb 2022 22:39:26 +0530 Subject: [PATCH 072/120] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d5b8e6a..aca75b1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Useful scripts, snippets and shaders here it is gathered for free. -We have collected most scripts from external sources like Unity Communities (Forums, Answers) and we made it ourselves a little. +We have collected most of the scripts from external sources like Unity Communities (Forums, Answers) and some of them are made by us. ## Getting Started @@ -16,7 +16,7 @@ You can [browse this repository](#content) and find your desired utility or you git clone https://github.com/UnityCommunity/UnityLibrary.git ``` -and then open the folder in unity or you can find useful stuff by [browsing awesome resources in the below](#resources). +then open the folder in unity or you can find useful stuff by [browsing awesome resources in the below](#resources). [:sparkles: Contribution is Welcome](#contribution) From 35f52fc67f4ce37807bcc2edd9225a63ac294744 Mon Sep 17 00:00:00 2001 From: wbm1113 <46951987+wbm1113@users.noreply.github.com> Date: Mon, 7 Mar 2022 16:36:14 -0500 Subject: [PATCH 073/120] Triangle2D --- Assets/Scripts/2D/Geometry/Triangle2D.cs | 58 +++++++++++++++++++ Assets/Scripts/2D/Geometry/Triangle2D.cs.meta | 11 ++++ 2 files changed, 69 insertions(+) create mode 100644 Assets/Scripts/2D/Geometry/Triangle2D.cs create mode 100644 Assets/Scripts/2D/Geometry/Triangle2D.cs.meta diff --git a/Assets/Scripts/2D/Geometry/Triangle2D.cs b/Assets/Scripts/2D/Geometry/Triangle2D.cs new file mode 100644 index 0000000..9268d3a --- /dev/null +++ b/Assets/Scripts/2D/Geometry/Triangle2D.cs @@ -0,0 +1,58 @@ +using UnityEngine; +using UCL; + +// if you need to run collision checks within a triangular area, the easiest +// way to do that in Unity is to use a polygon collider. this is not very +// performant. this class allows you to run those collision checks without +// the performance overhead. + +public class Triangle2D +{ + Vector2[] vertices = new Vector2[3]; + + public Triangle2D(Vector2 v1, Vector2 v2, Vector2 v3) { + Update(v1, v2, v3); + } + + // update triangle by defining all its vertices + public void Update(Vector2 v1, Vector2 v2, Vector2 v3) { + vertices[0] = v1; + vertices[1] = v2; + vertices[2] = v3; + } + + // update triangle by redefining its origin (remaining points update relative to that) + public void Update(Vector2 v1) { + Vector2 delta = v1 - vertices[0]; + vertices[0] = v1; + vertices[1] += delta; + vertices[2] += delta; + } + + // update triangle with rotation and pivot point + public void Update(Vector2 v1, Vector2 v2, Vector2 v3, float rotation, Vector2 pivot) { + vertices[0] = v1.Rotate(rotation, pivot); + vertices[1] = v2.Rotate(rotation, pivot); + vertices[2] = v3.Rotate(rotation, pivot); + } + + float Sign(Vector2 p1, Vector2 p2, Vector2 p3) { + return (p1.x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1.y - p3.y); + } + + public bool Contains(Vector2 pt, bool debug = false) { + float d1, d2, d3; + bool has_neg, has_pos; + + d1 = Sign(pt, vertices[0], vertices[1]); + d2 = Sign(pt, vertices[1], vertices[2]); + d3 = Sign(pt, vertices[2], vertices[0]); + + has_neg = (d1 < 0) || (d2 < 0) || (d3 < 0); + has_pos = (d1 > 0) || (d2 > 0) || (d3 > 0); + + bool contains = ! (has_neg && has_pos); + + return contains; + } +} \ No newline at end of file diff --git a/Assets/Scripts/2D/Geometry/Triangle2D.cs.meta b/Assets/Scripts/2D/Geometry/Triangle2D.cs.meta new file mode 100644 index 0000000..db09c09 --- /dev/null +++ b/Assets/Scripts/2D/Geometry/Triangle2D.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5b3d23802c4b0df4db68d12d425fb251 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 0bfa89e430b39e5ff219d6e2ee4101039d063319 Mon Sep 17 00:00:00 2001 From: wbm1113 <46951987+wbm1113@users.noreply.github.com> Date: Mon, 7 Mar 2022 16:43:22 -0500 Subject: [PATCH 074/120] Vector2Extensions --- Assets/Scripts/2D/Geometry/Triangle2D.cs | 97 ++++++++++--------- .../Scripts/Extensions/Vector2Extensions.cs | 15 +++ .../Extensions/Vector2Extensions.cs.meta | 11 +++ 3 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 Assets/Scripts/Extensions/Vector2Extensions.cs create mode 100644 Assets/Scripts/Extensions/Vector2Extensions.cs.meta diff --git a/Assets/Scripts/2D/Geometry/Triangle2D.cs b/Assets/Scripts/2D/Geometry/Triangle2D.cs index 9268d3a..6d16785 100644 --- a/Assets/Scripts/2D/Geometry/Triangle2D.cs +++ b/Assets/Scripts/2D/Geometry/Triangle2D.cs @@ -1,58 +1,67 @@ using UnityEngine; -using UCL; -// if you need to run collision checks within a triangular area, the easiest -// way to do that in Unity is to use a polygon collider. this is not very -// performant. this class allows you to run those collision checks without -// the performance overhead. - -public class Triangle2D +namespace UnityLibrary { - Vector2[] vertices = new Vector2[3]; + // if you need to run collision checks within a triangular area, the easiest + // way to do that in Unity is to use a polygon collider. this is not very + // performant. this class allows you to run those collision checks without + // the performance overhead. - public Triangle2D(Vector2 v1, Vector2 v2, Vector2 v3) { - Update(v1, v2, v3); - } + public class Triangle2D + { + Vector2[] vertices = new Vector2[3]; - // update triangle by defining all its vertices - public void Update(Vector2 v1, Vector2 v2, Vector2 v3) { - vertices[0] = v1; - vertices[1] = v2; - vertices[2] = v3; - } + public Triangle2D(Vector2 v1, Vector2 v2, Vector2 v3) + { + Update(v1, v2, v3); + } - // update triangle by redefining its origin (remaining points update relative to that) - public void Update(Vector2 v1) { - Vector2 delta = v1 - vertices[0]; - vertices[0] = v1; - vertices[1] += delta; - vertices[2] += delta; - } + // update triangle by defining all its vertices + public void Update(Vector2 v1, Vector2 v2, Vector2 v3) + { + vertices[0] = v1; + vertices[1] = v2; + vertices[2] = v3; + } - // update triangle with rotation and pivot point - public void Update(Vector2 v1, Vector2 v2, Vector2 v3, float rotation, Vector2 pivot) { - vertices[0] = v1.Rotate(rotation, pivot); - vertices[1] = v2.Rotate(rotation, pivot); - vertices[2] = v3.Rotate(rotation, pivot); - } + // update triangle by redefining its origin (remaining points update relative to that) + public void Update(Vector2 v1) + { + Vector2 delta = v1 - vertices[0]; + vertices[0] = v1; + vertices[1] += delta; + vertices[2] += delta; + } - float Sign(Vector2 p1, Vector2 p2, Vector2 p3) { - return (p1.x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1.y - p3.y); - } + // update triangle with rotation and pivot point + public void Update(Vector2 v1, Vector2 v2, Vector2 v3, float rotation, Vector2 pivot) + { + vertices[0] = v1.Rotate(rotation, pivot); + vertices[1] = v2.Rotate(rotation, pivot); + vertices[2] = v3.Rotate(rotation, pivot); + } - public bool Contains(Vector2 pt, bool debug = false) { - float d1, d2, d3; - bool has_neg, has_pos; + float Sign(Vector2 p1, Vector2 p2, Vector2 p3) + { + return (p1.x - p3.x) * (p2.y - p3.y) - (p2.x - p3.x) * (p1.y - p3.y); + } - d1 = Sign(pt, vertices[0], vertices[1]); - d2 = Sign(pt, vertices[1], vertices[2]); - d3 = Sign(pt, vertices[2], vertices[0]); + public bool Contains(Vector2 pt, bool debug = false) + { + float d1, d2, d3; + bool has_neg, has_pos; - has_neg = (d1 < 0) || (d2 < 0) || (d3 < 0); - has_pos = (d1 > 0) || (d2 > 0) || (d3 > 0); + d1 = Sign(pt, vertices[0], vertices[1]); + d2 = Sign(pt, vertices[1], vertices[2]); + d3 = Sign(pt, vertices[2], vertices[0]); - bool contains = ! (has_neg && has_pos); + has_neg = (d1 < 0) || (d2 < 0) || (d3 < 0); + has_pos = (d1 > 0) || (d2 > 0) || (d3 > 0); - return contains; + bool contains = ! (has_neg && has_pos); + + return contains; + } } -} \ No newline at end of file +} + diff --git a/Assets/Scripts/Extensions/Vector2Extensions.cs b/Assets/Scripts/Extensions/Vector2Extensions.cs new file mode 100644 index 0000000..e85b0dd --- /dev/null +++ b/Assets/Scripts/Extensions/Vector2Extensions.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace UnityLibrary +{ + static class Vector2Extensions + { + public static Vector2 Round(this Vector2 vector, int to = 0) => new Vector2(vector.x.Round(to), vector.y.Round(to)); + + public static Vector2 Rotate(this Vector2 vector, float angle, Vector2 pivot = default(Vector2)) + { + Vector2 rotated = Quaternion.Euler(new Vector3(0f, 0f, angle)) * (vector - pivot); + return rotated + pivot; + } + } +} diff --git a/Assets/Scripts/Extensions/Vector2Extensions.cs.meta b/Assets/Scripts/Extensions/Vector2Extensions.cs.meta new file mode 100644 index 0000000..0fef0ef --- /dev/null +++ b/Assets/Scripts/Extensions/Vector2Extensions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 058da80b535be1d469c9998e5629a60e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 4d4b3ee01093ec5bb62815c83b92d2530807d82e Mon Sep 17 00:00:00 2001 From: wbm1113 <46951987+wbm1113@users.noreply.github.com> Date: Wed, 9 Mar 2022 21:00:16 -0500 Subject: [PATCH 075/120] Create StringExtensions.cs --- Assets/Scripts/Extensions/StringExtensions.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Assets/Scripts/Extensions/StringExtensions.cs diff --git a/Assets/Scripts/Extensions/StringExtensions.cs b/Assets/Scripts/Extensions/StringExtensions.cs new file mode 100644 index 0000000..ca32336 --- /dev/null +++ b/Assets/Scripts/Extensions/StringExtensions.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using System.Globalization; + +namespace UnityLibrary +{ + public static class StringExtensions + { + public static Color ToColor(this string hex) { + hex = hex.Replace("0x", ""); + hex = hex.Replace("#", ""); + + byte a = 255; + byte r = byte.Parse(hex.Substring(0,2), NumberStyles.HexNumber); + byte g = byte.Parse(hex.Substring(2,2), NumberStyles.HexNumber); + byte b = byte.Parse(hex.Substring(4,2), NumberStyles.HexNumber); + + if (hex.Length == 8) + a = byte.Parse(hex.Substring(6,2), NumberStyles.HexNumber); + + return new Color32(r,g,b,a); + } + } +} \ No newline at end of file From a856fdcd55f34d20cf4e36dd527af4de2d3c4f2a Mon Sep 17 00:00:00 2001 From: wbm1113 <46951987+wbm1113@users.noreply.github.com> Date: Wed, 9 Mar 2022 21:06:50 -0500 Subject: [PATCH 076/120] Update StringExtensions.cs --- Assets/Scripts/Extensions/StringExtensions.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Extensions/StringExtensions.cs b/Assets/Scripts/Extensions/StringExtensions.cs index ca32336..e5ecb6a 100644 --- a/Assets/Scripts/Extensions/StringExtensions.cs +++ b/Assets/Scripts/Extensions/StringExtensions.cs @@ -1,6 +1,8 @@ using UnityEngine; using System.Globalization; +// e.g. "#FFFFFF".ToColor() + namespace UnityLibrary { public static class StringExtensions @@ -20,4 +22,4 @@ public static Color ToColor(this string hex) { return new Color32(r,g,b,a); } } -} \ No newline at end of file +} From 73823b09b9254771a583a95854f5e92b51d866a5 Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 19 Apr 2022 10:49:40 +0300 Subject: [PATCH 077/120] Create PostBuildCopyEmptyFolders.cs --- .../BuildProcess/PostBuildCopyEmptyFolders.cs | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs diff --git a/Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs b/Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs new file mode 100644 index 0000000..da29025 --- /dev/null +++ b/Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs @@ -0,0 +1,51 @@ +using System.IO; +using UnityEditor; +using UnityEditor.Callbacks; +using UnityEngine; + +// copies empty StreamingAssets/ folders into build, as they are not automatically included + +namespace UnityLibrary +{ + public class PostBuildCopyEmptyFolders : MonoBehaviour + { + [PostProcessBuildAttribute(1)] + public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject) + { + Debug.Log("### POSTBUILD : COPY EMPTY STREAMINGASSETS-FOLDERS ###"); + Debug.Log("Build done: " + pathToBuiltProject); + + // get output root + var root = Path.GetDirectoryName(pathToBuiltProject); + var appName = Path.GetFileNameWithoutExtension(pathToBuiltProject); + + // copy empty streaming asset folders to build + var sourcePath = Application.streamingAssetsPath; + var targetPath = Path.Combine(root, appName + "_Data", "StreamingAssets"); + //Debug.Log("sourcePath= "+ sourcePath); + //Debug.Log("targetPath= " + targetPath); + CopyFolderStructure(sourcePath, targetPath); + } + + // recursive folder copier + static public void CopyFolderStructure(string sourceFolder, string destFolder) + { + if (Directory.Exists(destFolder)) + { + + } + else + { + Directory.CreateDirectory(destFolder); + } + + string[] folders = Directory.GetDirectories(sourceFolder); + foreach (string folder in folders) + { + string name = Path.GetFileName(folder); + string dest = Path.Combine(destFolder, name); + CopyFolderStructure(folder, dest); + } + } + } +} From 2b455662d8a6cdd6a47955491b75e5a323d5ffa9 Mon Sep 17 00:00:00 2001 From: mika Date: Wed, 27 Apr 2022 12:20:01 +0300 Subject: [PATCH 078/120] OnPostprocessBuild copy for windows only (otherwise android build fails) --- .../Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs b/Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs index da29025..186265b 100644 --- a/Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs +++ b/Assets/Scripts/Editor/BuildProcess/PostBuildCopyEmptyFolders.cs @@ -12,6 +12,9 @@ public class PostBuildCopyEmptyFolders : MonoBehaviour [PostProcessBuildAttribute(1)] public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject) { + // only for windows + if (target != BuildTarget.StandaloneWindows) return; + Debug.Log("### POSTBUILD : COPY EMPTY STREAMINGASSETS-FOLDERS ###"); Debug.Log("Build done: " + pathToBuiltProject); From 6fc5b5cfd89c8e531d6c1b7b3846692d2a391165 Mon Sep 17 00:00:00 2001 From: Bart Huylebroeck Date: Sun, 15 May 2022 09:37:27 +0200 Subject: [PATCH 079/120] fractional part should be calculated AFTER gray value has been added for continuous cycling effect --- Assets/Shaders/2D/Effects/ColorCycle.shader | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Shaders/2D/Effects/ColorCycle.shader b/Assets/Shaders/2D/Effects/ColorCycle.shader index a41acc0..3d0c754 100644 --- a/Assets/Shaders/2D/Effects/ColorCycle.shader +++ b/Assets/Shaders/2D/Effects/ColorCycle.shader @@ -51,10 +51,10 @@ Shader "UnityLibrary/2D/Effects/ColorCycle" float gray = tex2D(_MainTex, i.uv).r; // get scrolling - float scroll = frac(_Time.x*_Speed); + float scroll = frac(gray + _Time.x*_Speed); // get gradient color from texture - fixed4 col = tex2D(_GradientTex,float2(gray+scroll,0.5)); + fixed4 col = tex2D(_GradientTex,float2(scroll,0.5)); return col; } From f1a9afac9d24b93bd8455b1e47ff409999b1eda8 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 2 Jun 2022 10:21:49 +0300 Subject: [PATCH 080/120] fix triangles error from point/line-topology meshes --- Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs index e12f971..066da8d 100644 --- a/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs +++ b/Assets/Scripts/Editor/Tools/GetSelectedMeshInfo.cs @@ -59,7 +59,8 @@ void OnGUI() { int verts = meshes[i].sharedMesh.vertexCount; totalVertices += verts; - totalTris += meshes[i].sharedMesh.triangles.Length / 3; + // not for point/line meshes + if (meshes[i].sharedMesh.GetTopology(0) == MeshTopology.Triangles) totalTris += meshes[i].sharedMesh.triangles.Length / 3; totalMeshes++; topList.Add(i, verts); } From 8aaf2274a42d48c1023a8ea0572f094ddeaef633 Mon Sep 17 00:00:00 2001 From: mousedoc Date: Thu, 23 Jun 2022 12:28:46 +0900 Subject: [PATCH 081/120] Add legacy animation creator --- Assets/Scripts/Editor/Animation.meta | 8 ++++++ .../Animation/LegacyAnimationCreator.meta | 8 ++++++ .../LegacyAnimationCreator.cs | 28 +++++++++++++++++++ .../LegacyAnimationCreator.cs.meta | 11 ++++++++ 4 files changed, 55 insertions(+) create mode 100644 Assets/Scripts/Editor/Animation.meta create mode 100644 Assets/Scripts/Editor/Animation/LegacyAnimationCreator.meta create mode 100644 Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs create mode 100644 Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs.meta diff --git a/Assets/Scripts/Editor/Animation.meta b/Assets/Scripts/Editor/Animation.meta new file mode 100644 index 0000000..a9393f4 --- /dev/null +++ b/Assets/Scripts/Editor/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 344c9e72d34584041b61214522912d71 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Animation/LegacyAnimationCreator.meta b/Assets/Scripts/Editor/Animation/LegacyAnimationCreator.meta new file mode 100644 index 0000000..9fc6b69 --- /dev/null +++ b/Assets/Scripts/Editor/Animation/LegacyAnimationCreator.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e78d070eb9ba01749a33425b62b0fe5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs b/Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs new file mode 100644 index 0000000..35f7ff2 --- /dev/null +++ b/Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs @@ -0,0 +1,28 @@ +using System.IO; +using UnityEditor; +using UnityEngine; + +public class LegacyAnimationCreator +{ + [MenuItem("Assets/Create/Legacy Animation", priority = 402)] + public static void CompressSelectedAnimationClips() + { + var clip = new AnimationClip(); + clip.legacy = true; + clip.name = "New Legacy Animation"; + + string path; + var selection = Selection.activeObject; + if (selection == null) + path = "Assets"; + else + path = AssetDatabase.GetAssetPath(selection.GetInstanceID()); + + path = Path.GetDirectoryName(path); + path += $"/{clip.name}.anim"; + + ProjectWindowUtil.CreateAsset(clip, path); + Selection.activeObject = clip; + EditorUtility.SetDirty(clip); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs.meta b/Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs.meta new file mode 100644 index 0000000..5bd716f --- /dev/null +++ b/Assets/Scripts/Editor/Animation/LegacyAnimationCreator/LegacyAnimationCreator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d536889e20faa9d47b7def4f46203b81 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 70073f18dd40bc1b94da3ef53627c21ddb722d33 Mon Sep 17 00:00:00 2001 From: emir Date: Mon, 5 Sep 2022 01:09:28 +0300 Subject: [PATCH 082/120] =?UTF-8?q?Added=20SaveUtility=20static=20class=20?= =?UTF-8?q?with=20generic=20methods.=20->=20#=20For:=C2=A0Sav&Load=20any?= =?UTF-8?q?=20serialized=20class=20#?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Utilities/SaveUtility.cs | 70 ++++++++++++++++++++ Assets/Scripts/Utilities/SaveUtility.cs.meta | 11 +++ 2 files changed, 81 insertions(+) create mode 100644 Assets/Scripts/Utilities/SaveUtility.cs create mode 100644 Assets/Scripts/Utilities/SaveUtility.cs.meta diff --git a/Assets/Scripts/Utilities/SaveUtility.cs b/Assets/Scripts/Utilities/SaveUtility.cs new file mode 100644 index 0000000..96bb9b0 --- /dev/null +++ b/Assets/Scripts/Utilities/SaveUtility.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Utilities +{ + public static class SaveUtility + { + /* --- Usage ---- + + -- Lets say we have a serialized class called Save -- + + [System.Serializable] + public class Save + { + public int testInt; + public List TestStrings = new List(); + } + + -- For saving this class we would do the following -->> -- + + Save save = new Save(); + save.testInt = 5; + save.TestStrings.Add("Hello"); + + SaveUtility.Save(save, "testPath"); + + -- For loading this class we would do the following --> -- + + Save save = SaveUtility.Load("testPath"); + + Important : Since save operation uses PlayerPrefs and does not contain any encrypting. Dont save&load any confidential data using this class. + + --- End of Usage ---- */ + + + /// + /// Saves any serialized class on the specified savepath. + /// + public static void Save(this T save, string savePath) + where T : class + { + var data = JsonUtility.ToJson(save); + PlayerPrefs.SetString(savePath, data); + } + + /// + /// Loads and returns the saved class on the specified savepath. + /// If no save is found, it will return a new instance of the class. + /// + /// Loaded serialized save class + public static T Load(TSt path) + where T : class, new() + where TSt : IComparable, ICloneable, IConvertible, IComparable, IEnumerable, IEnumerable, IEquatable + { + var data = new T(); + + if (PlayerPrefs.HasKey(path as string) == false) + { + data.Save(path as string); + } + + { + data = JsonUtility.FromJson(PlayerPrefs.GetString(path as string)); + } + return data; + } + } +} diff --git a/Assets/Scripts/Utilities/SaveUtility.cs.meta b/Assets/Scripts/Utilities/SaveUtility.cs.meta new file mode 100644 index 0000000..390ab63 --- /dev/null +++ b/Assets/Scripts/Utilities/SaveUtility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d8aad24cf3d7485c9507bf763b79d42 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From e12d3618ed22105e1a38038120a756e9d3345d53 Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 3 Dec 2022 13:43:18 +0200 Subject: [PATCH 083/120] add LineRenderer_ClipStartEnd.shader --- .../LineRenderer_ClipStartEnd.shader | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 Assets/Shaders/2D/LineRenderer/LineRenderer_ClipStartEnd.shader diff --git a/Assets/Shaders/2D/LineRenderer/LineRenderer_ClipStartEnd.shader b/Assets/Shaders/2D/LineRenderer/LineRenderer_ClipStartEnd.shader new file mode 100644 index 0000000..7971f3c --- /dev/null +++ b/Assets/Shaders/2D/LineRenderer/LineRenderer_ClipStartEnd.shader @@ -0,0 +1,62 @@ +Shader "UnityLibrary/LineRenderer/ClipStartEnd" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + _Start ("Start", Range (0.0,1.0)) = 0.25 + _End ("End", Range (0.0,1.0)) = 0.75 + } + + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + float4 color : COLOR; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + float4 color : COLOR; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + float _Start; + float _End; + + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + o.color = v.color; + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + fixed4 col = tex2D(_MainTex, i.uv)*i.color; + clip(-(i.uv.x <_Start || i.uv.x > _End)); + // return fixed4(i.uv.x,0,0,0); // view UV x + return col; + } + ENDCG + } + } +} \ No newline at end of file From 1a555e190570b4c86b8e35090bd4acada9cd904d Mon Sep 17 00:00:00 2001 From: mika Date: Sat, 3 Dec 2022 21:50:06 +0200 Subject: [PATCH 084/120] add NavMeshAgentExample.cs --- .../Docs/UnityEngine/NavMeshAgentExample.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Assets/Scripts/Docs/UnityEngine/NavMeshAgentExample.cs diff --git a/Assets/Scripts/Docs/UnityEngine/NavMeshAgentExample.cs b/Assets/Scripts/Docs/UnityEngine/NavMeshAgentExample.cs new file mode 100644 index 0000000..bae418b --- /dev/null +++ b/Assets/Scripts/Docs/UnityEngine/NavMeshAgentExample.cs @@ -0,0 +1,23 @@ +// made with chatGPT + +using UnityEngine; +using UnityEngine.AI; + +namespace UnityLibrary +{ + public class NavMeshAgentExample : MonoBehaviour + { + public Transform target; + + private NavMeshAgent agent; + + void Start() + { + // Get the NavMeshAgent component on this game object + agent = GetComponent(); + + // Set the destination of the NavMeshAgent to the target Transform + agent.destination = target.position; + } + } +} From a60e3cf7f40a816f3d06ed392e30080b6afb9c3c Mon Sep 17 00:00:00 2001 From: ForlornU <101473036+ForlornU@users.noreply.github.com> Date: Sat, 15 Apr 2023 06:42:02 +0200 Subject: [PATCH 085/120] Rewrite of cameraShake Lots of changes and improvements, the original purpose remains but in a better format Class that calls for the camera to shake passes along the values for intensity and duration to the camera which has "influence modifers" for how sensetive it is to shaking Based on a timed duration instead of a dickle decay value magical numbers, bools and such are gone --- Assets/Scripts/Camera/CameraShake.cs | 78 +++++++++++++++------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/Assets/Scripts/Camera/CameraShake.cs b/Assets/Scripts/Camera/CameraShake.cs index d8814bb..48a88e6 100644 --- a/Assets/Scripts/Camera/CameraShake.cs +++ b/Assets/Scripts/Camera/CameraShake.cs @@ -1,58 +1,66 @@ using UnityEngine; using System.Collections; -// usage: attach this script into camera, call Shake() method to start -// source: http://answers.unity3d.com/answers/992509/view.html +/* + * Usage: attach this script to a camera or any other object, call Shake() method to start shaking it +* To turn off, change influence to zero +* Attach the camera to an empty game object to keep its local position and rotation +*/ namespace UnityLibrary { public class CameraShake : MonoBehaviour { - public bool shakePosition; - public bool shakeRotation; - - public float shakeIntensityMin = 0.1f; - public float shakeIntensityMax = 0.5f; - public float shakeDecay = 0.02f; + [Range(0f, 1f)] + public float shakeInfluence = 0.5f; + [Range(0f, 10f)] + public float rotationInfluence = 0f; private Vector3 OriginalPos; private Quaternion OriginalRot; - private bool isShakeRunning = false; - // call this function to start shaking - public void Shake() +/// +/// Will shake the camera with a random value between minIntensity and maxIntensity for duration +/// +/// +/// +/// + public void Shake(float minIntensity, float maxIntensity, float duration) { + if (isShakeRunning) + return; + OriginalPos = transform.position; OriginalRot = transform.rotation; - StartCoroutine("ProcessShake"); + + float shake = Random.Range(minIntensity, maxIntensity) * shakeInfluence; + duration *= shakeInfluence; + + StartCoroutine(ProcessShake(shake, duration)); } - IEnumerator ProcessShake() + IEnumerator ProcessShake(float shake, float duration) { - if (!isShakeRunning) + isShakeRunning = true; + float countdown = duration; + float initialShake = shake; + + while (countdown > 0) { - isShakeRunning = true; - float currentShakeIntensity = Random.Range(shakeIntensityMin, shakeIntensityMax); - - while (currentShakeIntensity > 0) - { - if (shakePosition) - { - transform.position = OriginalPos + Random.insideUnitSphere * currentShakeIntensity; - } - if (shakeRotation) - { - transform.rotation = new Quaternion(OriginalRot.x + Random.Range(-currentShakeIntensity, currentShakeIntensity) * .2f, - OriginalRot.y + Random.Range(-currentShakeIntensity, currentShakeIntensity) * .2f, - OriginalRot.z + Random.Range(-currentShakeIntensity, currentShakeIntensity) * .2f, - OriginalRot.w + Random.Range(-currentShakeIntensity, currentShakeIntensity) * .2f); - } - currentShakeIntensity -= shakeDecay; - yield return null; - } - - isShakeRunning = false; + countdown -= Time.deltaTime; + + float lerpIntensity = countdown / duration; + shake = Mathf.Lerp(0f, initialShake, lerpIntensity); + + transform.position = OriginalPos + Random.insideUnitSphere * shake; + transform.rotation = Quaternion.Euler(OriginalRot.eulerAngles + Random.insideUnitSphere * shake * rotationInfluence); + + yield return null; } + + transform.position = OriginalPos; + transform.rotation = OriginalRot; + isShakeRunning = false; } } } \ No newline at end of file From d4eeaeb201b8bd99342656dfe17b7f23a373afc8 Mon Sep 17 00:00:00 2001 From: Falcon Date: Fri, 28 Apr 2023 18:59:17 +0900 Subject: [PATCH 086/120] Auto Resolution Script It's useful for overcoming very slight differences. It is difficult to apply a large changes in which the resolution is reversed. It can be used appropriately in situations where resolution is important in mobile-like environments. Attach this script to the camera and enter the desired resolution. --- Assets/Scripts/Camera/AutoResolution.cs | 58 +++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 Assets/Scripts/Camera/AutoResolution.cs diff --git a/Assets/Scripts/Camera/AutoResolution.cs b/Assets/Scripts/Camera/AutoResolution.cs new file mode 100644 index 0000000..87fd874 --- /dev/null +++ b/Assets/Scripts/Camera/AutoResolution.cs @@ -0,0 +1,58 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AutoResolution : MonoBehaviour +{ + public int setWidth = 1440; + public int setHeight = 2560; + + private void Start() + { + // Get the main camera and its current dimensions + Camera camera = Camera.main; + Rect rect = camera.rect; + + // Calculate the scale height and width of the screen + float scaleHeight = ((float)Screen.width / Screen.height) / ((float)9 / 16); + float scaleWidth = 1f / scaleHeight; + + // Adjust the camera's dimensions based on the scale height and width + if (scaleHeight < 1) + { + rect.height = scaleHeight; + rect.y = (1f - scaleHeight) / 2f; + } + else + { + rect.width = scaleWidth; + rect.x = (1f - scaleWidth) / 2f; + } + + camera.rect = rect; + + SetResolution(); + } + + public void SetResolution() + { + // Get the current device's screen dimensions + int deviceWidth = Screen.width; + int deviceHeight = Screen.height; + + // Set the screen resolution to the desired dimensions, while maintaining aspect ratio + Screen.SetResolution(setWidth, (int)(((float)deviceHeight / deviceWidth) * setWidth), true); + + // Adjust the camera's dimensions based on the new resolution + if ((float)setWidth / setHeight < (float)deviceWidth / deviceHeight) + { + float newWidth = ((float)setWidth / setHeight) / ((float)deviceWidth / deviceHeight); + Camera.main.rect = new Rect((1f - newWidth) / 2f, 0f, newWidth, 1f); + } + else + { + float newHeight = ((float)deviceWidth / deviceHeight) / ((float)setWidth / setHeight); + Camera.main.rect = new Rect(0f, (1f - newHeight) / 2f, 1f, newHeight); // 새로운 Rect 적용 + } + } +} From 02ac2cde7f6b7c127461e09fa58f0a5fce0b6f7d Mon Sep 17 00:00:00 2001 From: Chase Duffman <74204097+xXxT0SHIIIxXx@users.noreply.github.com> Date: Sat, 6 May 2023 20:24:37 -0700 Subject: [PATCH 087/120] Update README.md Added custom Logo for Unity Library --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aca75b1..2facccc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -# Unity Library -:tada: Welcome to Unity Library :tada: +# ![Unity Library](https://i.imgur.com/btbDvqv.png) + +:tada: Welcome to Unity Library :tada: Useful scripts, snippets and shaders here it is gathered for free. From c06129b3beaa7b0552cdf52026472a446515d2d2 Mon Sep 17 00:00:00 2001 From: Chase Duffman <74204097+xXxT0SHIIIxXx@users.noreply.github.com> Date: Sun, 7 May 2023 10:06:20 -0400 Subject: [PATCH 088/120] Adding Logos for Light and Dark Mode Added Logos for users using Dark Mode and Light Mode --- Logos/Unity_Library_Black.png | Bin 0 -> 33584 bytes Logos/Unity_Library_White.png | Bin 0 -> 35506 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Logos/Unity_Library_Black.png create mode 100644 Logos/Unity_Library_White.png diff --git a/Logos/Unity_Library_Black.png b/Logos/Unity_Library_Black.png new file mode 100644 index 0000000000000000000000000000000000000000..b5761a5ca1b6c229da5ca4c7c41e05a6239d70e2 GIT binary patch literal 33584 zcmdSA1z42bx<3qvf~cfOO9=>yzzkE83W(CJsN~QgEnNm(3P=h_hY|uJk_rqB0!oR5 zG!lYH$G09Z_kQ;|?>^uEIx%xGGtcv^b+0>qcdWo)NkRG;2|WoO9^SDlmnBv3@Ca7$ z@bJlr4}m)$j`OpDi(94=5=y36EFRwJ2M!O)WNVa;<2+X`NS$G_C%0)x`jo^%^6517 zY%;0k!JKoJvl1p|msL_elMygi_=-cB{pg{U=}CKVfS15+hdW zT2<3X^QC3np=L$?uCn!0lT%N5IUW^P3waO_PS-}gv$PXMGGvTzIH$_L_f>wM^Q|I1 z$Bx(X^V{xo!dY>T*w1$HmrO?oINo<%zG*AJCh1iB5dXeaWJ2~*+$W33s^d2nr;a+Q zDe``(&N|d>_lQ;atg!A_po`_nZyc}f^#nMJ6>p0nmD%ofTvj%CEKHiBa^#_=-O#nV zl4>6(d*`@_{MrW`T!R$Kft?6m1iQ=i1YwTI&0XQSmRhG`SN@|rS9`V@?^TONtlnH* zedo|@JnZiM`QpbaR*bxRVCB`GLm{k1$D&XUybgF*h2Cyja6U7TT54J`fPJyS*E&2^ z=^GMhrcrFymdH}cQ8h(M8mfDF-dAH6FQwafC~x9J0x-Z~>&u#Ucz8!Bp+Ef2j~-jV z99{NO*X&jF99gVwt&B`93|Z`*tqoZWolK4JNT5#=7U%^NfRP9yP-r9uiR1?_L5v^< zrU!nYp)2r0@$(D7_yzdk;J3iuouA(Vdf*P?*L@NsY`=kk{+|z!5JB*Qq5px<_x5lB za3A~@Fx+oPg8K0Q8X0;3jSgOz{V#qb294qu1Q*{q(u02g_CoU;Vfn$JB%n7C0Fq|^ z#*b@30i+<(2njI!B-X{VMX>(6!fQ{dDM`8qCdz?aA{!Ii!^jwjrpQ)_!H9trfhZ(bG{lH@Ptg9GURQ8-!<225@MIQc_`B=sGp19*7M z@BeZXCrfKQ67aD%2Iwb10>{FQP{1Zg0VEu$k3^sZVf>JGkwAAyL%0D9W@x0ZuWtl{ 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 nFG8?W-wdA;Qb-4=6 literal 0 HcmV?d00001 diff --git a/Logos/Unity_Library_White.png b/Logos/Unity_Library_White.png new file mode 100644 index 0000000000000000000000000000000000000000..f0d5651376829d2e549d105a38e30ac362637206 GIT binary patch literal 35506 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 MW!^}aN*eqBKjGKi`~Uy| literal 0 HcmV?d00001 From 9e876bc7e4ce9c0282b5e5da42caf0928057f39c Mon Sep 17 00:00:00 2001 From: Chase Duffman <74204097+xXxT0SHIIIxXx@users.noreply.github.com> Date: Sun, 7 May 2023 10:09:35 -0400 Subject: [PATCH 089/120] Update README.md Added Logos for light mode and dark mode --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2facccc..e7f51b0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# ![Unity Library](https://i.imgur.com/btbDvqv.png) - -:tada: Welcome to Unity Library :tada: +# ![Unity Library](https://raw.githubusercontent.com/xXxT0SHIIIxXx/UnityLibrary/master/Logos/Unity_Library_White.png#gh-dark-mode-only) +# ![Unity Library](https://raw.githubusercontent.com/xXxT0SHIIIxXx/UnityLibrary/master/Logos/Unity_Library_Black.png#gh-light-mode-only) +:tada: Welcome to Unity Library :tada: Useful scripts, snippets and shaders here it is gathered for free. From 3088d763e2446029ad68119f1eb516d943cd3625 Mon Sep 17 00:00:00 2001 From: Shubham Kumar <96144990+KatyaanShubham@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:20:28 +0530 Subject: [PATCH 090/120] Update Glow.shader Explanation of changes: 1. Indentation: The entire code block inside Shader "Custom/Glow" is indented one level for better readability. 2. Spacing: Added proper spacing between the curly braces {} for clarity. --- Assets/Shaders/2D/Effects/Glow.shader | 94 ++------------------------- 1 file changed, 4 insertions(+), 90 deletions(-) diff --git a/Assets/Shaders/2D/Effects/Glow.shader b/Assets/Shaders/2D/Effects/Glow.shader index 775b7d2..97da796 100644 --- a/Assets/Shaders/2D/Effects/Glow.shader +++ b/Assets/Shaders/2D/Effects/Glow.shader @@ -1,117 +1,31 @@ -Shader "Custom/Glow" { - - - +@@ -1,117 +1,30 @@ +Shader "Custom/Glow" { Properties { - - - _Color ("Color", Color) = (1,1,1,1) - - - } - - SubShader { - - - Tags { "RenderType"="Transparent" } - - - LOD 200 - - - ZTest Always - - - Cull Off - - - - - - - - - - CGPROGRAM - - - #pragma surface surf Lambert decal:add - - - - - - float4 _Color; - - - - - - struct Input { - - - float3 viewDir; - - - float3 worldNormal; - - - }; - - - - - - void surf (Input IN, inout SurfaceOutput o) { - - - - o.Alpha = _Color.a * pow(abs(dot(normalize(IN.viewDir), - - - - normalize(IN.worldNormal))),4.0); - - - + o.Alpha = _Color.a * pow(abs(dot(normalize(IN.viewDir), normalize(IN.worldNormal))), 4.0); o.Emission = _Color.rgb * o.Alpha; - - - } - - - ENDCG - - - - } - - + } FallBack "Diffuse" - - - } From dda79f9892ef3668a5b2d19b3f416491f1e53c3e Mon Sep 17 00:00:00 2001 From: Shubham Kumar <96144990+KatyaanShubham@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:25:50 +0530 Subject: [PATCH 091/120] Update AssetBundleLoader.cs Explanation of changes: 1. Added using UnityEngine.Networking; to import the required namespace. 2. Created a bundleName variable to specify the name of the asset bundle you are loading. Adjust it according to your asset bundle's name. 3. Added Caching.ClearOtherCachedVersions(bundleName, Hash128.Parse("0")); before starting the download. This line clears the cache for previous versions of the asset bundle with the specified name. --- .../Scripts/AssetBundles/AssetBundleLoader.cs | 76 +++++-------------- 1 file changed, 21 insertions(+), 55 deletions(-) diff --git a/Assets/Scripts/AssetBundles/AssetBundleLoader.cs b/Assets/Scripts/AssetBundles/AssetBundleLoader.cs index d31ae28..db53c54 100644 --- a/Assets/Scripts/AssetBundles/AssetBundleLoader.cs +++ b/Assets/Scripts/AssetBundles/AssetBundleLoader.cs @@ -2,47 +2,34 @@ using UnityEngine; using UnityEngine.Networking; -// AssetBundle cache checker & loader with caching -// worsk by loading .manifest file from server and parsing hash string from it - namespace UnityLibrary { public class AssetBundleLoader : MonoBehaviour { public string assetBundleURL = "http://localhost/bundle"; + private string bundleName = "bundle"; void Start() { - //StartCoroutine(DownloadAndCache(assetBundleURL)); + StartCoroutine(DownloadAndCache(assetBundleURL)); } - /// - /// load assetbundle manifest, check hash, load actual bundle with hash parameter to use caching - /// instantiate gameobject - /// - /// full url to assetbundle file - /// optional parameter to access specific asset from assetbundle - /// IEnumerator DownloadAndCache(string bundleURL, string assetName = "") { - // Wait for the Caching system to be ready while (!Caching.ready) { yield return null; } - // if you want to always load from server, can clear cache first - // Caching.CleanCache(); + // Clear cache for previous versions of the asset bundle + Caching.ClearOtherCachedVersions(bundleName, Hash128.Parse("0")); - // get current bundle hash from server, random value added to avoid caching UnityWebRequest www = UnityWebRequest.Get(bundleURL + ".manifest?r=" + (Random.value * 9999999)); - Debug.Log("Loading manifest:" + bundleURL + ".manifest"); + Debug.Log("Loading manifest: " + bundleURL + ".manifest"); - // wait for load to finish - yield return www.Send(); + yield return www.SendWebRequest(); - // if received error, exit - if (www.isNetworkError == true) + if (www.isNetworkError) { Debug.LogError("www error: " + www.error); www.Dispose(); @@ -50,43 +37,38 @@ IEnumerator DownloadAndCache(string bundleURL, string assetName = "") yield break; } - // create empty hash string - Hash128 hashString = (default(Hash128));// new Hash128(0, 0, 0, 0); + Hash128 hashString = default(Hash128); - // check if received data contains 'ManifestFileVersion' if (www.downloadHandler.text.Contains("ManifestFileVersion")) { - // extract hash string from the received data, TODO should add some error checking here var hashRow = www.downloadHandler.text.ToString().Split("\n".ToCharArray())[5]; hashString = Hash128.Parse(hashRow.Split(':')[1].Trim()); - if (hashString.isValid == true) + if (hashString.isValid) { - // we can check if there is cached version or not - if (Caching.IsVersionCached(bundleURL, hashString) == true) + if (Caching.IsVersionCached(bundleURL, hashString)) { Debug.Log("Bundle with this hash is already cached!"); - } else + } + else { - Debug.Log("No cached version founded for this hash.."); + Debug.Log("No cached version found for this hash.."); } - } else + } + else { - // invalid loaded hash, just try loading latest bundle - Debug.LogError("Invalid hash:" + hashString); + Debug.LogError("Invalid hash: " + hashString); yield break; } - - } else + } + else { Debug.LogError("Manifest doesn't contain string 'ManifestFileVersion': " + bundleURL + ".manifest"); yield break; } - // now download the actual bundle, with hashString parameter it uses cached version if available www = UnityWebRequestAssetBundle.GetAssetBundle(bundleURL + "?r=" + (Random.value * 9999999), hashString, 0); - // wait for load to finish yield return www.SendWebRequest(); if (www.error != null) @@ -97,42 +79,26 @@ IEnumerator DownloadAndCache(string bundleURL, string assetName = "") yield break; } - // get bundle from downloadhandler AssetBundle bundle = ((DownloadHandlerAssetBundle)www.downloadHandler).assetBundle; - GameObject bundlePrefab = null; - // if no asset name is given, take the first/main asset if (assetName == "") { bundlePrefab = (GameObject)bundle.LoadAsset(bundle.GetAllAssetNames()[0]); - } else - { // use asset name to access inside bundle + } + else + { bundlePrefab = (GameObject)bundle.LoadAsset(assetName); } - // if we got something out if (bundlePrefab != null) { - - // instantiate at 0,0,0 and without rotation Instantiate(bundlePrefab, Vector3.zero, Quaternion.identity); - - /* - // fix pink shaders, NOTE: not always needed.. - foreach (Renderer r in go.GetComponentsInChildren(includeInactive: true)) - { - // FIXME: creates multiple materials, not good - var material = Shader.Find(r.material.shader.name); - r.material.shader = null; - r.material.shader = material; - }*/ } www.Dispose(); www = null; - // try to cleanup memory Resources.UnloadUnusedAssets(); bundle.Unload(false); bundle = null; From d2ee8cfde0a18206086ca7917700fca25b163ca3 Mon Sep 17 00:00:00 2001 From: mika Date: Thu, 19 Oct 2023 09:14:56 +0300 Subject: [PATCH 092/120] Create Diffuse (2 Sided Light).shader --- .../2D/Sprites/Diffuse (2 Sided Light).shader | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Assets/Shaders/2D/Sprites/Diffuse (2 Sided Light).shader diff --git a/Assets/Shaders/2D/Sprites/Diffuse (2 Sided Light).shader b/Assets/Shaders/2D/Sprites/Diffuse (2 Sided Light).shader new file mode 100644 index 0000000..cf47668 --- /dev/null +++ b/Assets/Shaders/2D/Sprites/Diffuse (2 Sided Light).shader @@ -0,0 +1,79 @@ +// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) +// lights up sprites from both sides + +Shader "Sprites/Diffuse (2 Sided Light)" +{ + Properties + { + [PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {} + _Color("Tint", Color) = (1,1,1,1) + [MaterialToggle] PixelSnap("Pixel snap", Float) = 0 + [HideInInspector] _RendererColor("RendererColor", Color) = (1,1,1,1) + [HideInInspector] _Flip("Flip", Vector) = (1,1,1,1) + [PerRendererData] _AlphaTex("External Alpha", 2D) = "white" {} + [PerRendererData] _EnableExternalAlpha("Enable External Alpha", Float) = 0 + } + + SubShader + { + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + "PreviewType" = "Plane" + "CanUseSpriteAtlas" = "True" + } + + Cull Off + Lighting Off + ZWrite Off + Blend One OneMinusSrcAlpha + + CGPROGRAM + //#pragma surface surf Lambert vertex:vert nofog nolightmap nodynlightmap keepalpha noinstancing + #pragma surface surf TwoSidedLambert vertex:vert nofog nolightmap nodynlightmap keepalpha noinstancing + #pragma multi_compile_local _ PIXELSNAP_ON + #pragma multi_compile _ ETC1_EXTERNAL_ALPHA + #include "UnitySprites.cginc" + + struct Input + { + float2 uv_MainTex; + fixed4 color; + }; + + // added "abs" 2 sided lighting + half4 LightingTwoSidedLambert(SurfaceOutput s, half3 lightDir, half atten) { + half NdotL = abs(dot(s.Normal, lightDir)); + half4 c; + c.rgb = s.Albedo * _LightColor0.rgb * (NdotL * atten); + c.a = s.Alpha; + return c; + } + + void vert(inout appdata_full v, out Input o) + { + v.vertex = UnityFlipSprite(v.vertex, _Flip); + + #if defined(PIXELSNAP_ON) + v.vertex = UnityPixelSnap(v.vertex); + #endif + + //v.normal.z *= -1; + + UNITY_INITIALIZE_OUTPUT(Input, o); + o.color = v.color * _Color * _RendererColor; + } + + void surf(Input IN, inout SurfaceOutput o) + { + fixed4 c = SampleSpriteTexture(IN.uv_MainTex) * IN.color; + o.Albedo = c.rgb * c.a; + o.Alpha = c.a; + } + ENDCG + } + + Fallback "Transparent/VertexLit" +} From 329f7d8f2bb8306b5df409f5ab03d1cd44595455 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 17 May 2024 11:35:26 +0300 Subject: [PATCH 093/120] Add editor tool to replace string in selected gameobject names --- .../ReplaceCharacterInGameObjectNames.cs | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Assets/Scripts/Editor/BatchTools/ReplaceCharacterInGameObjectNames.cs diff --git a/Assets/Scripts/Editor/BatchTools/ReplaceCharacterInGameObjectNames.cs b/Assets/Scripts/Editor/BatchTools/ReplaceCharacterInGameObjectNames.cs new file mode 100644 index 0000000..105bc74 --- /dev/null +++ b/Assets/Scripts/Editor/BatchTools/ReplaceCharacterInGameObjectNames.cs @@ -0,0 +1,69 @@ +// editor tool to replace string from selected GameObject names + +using UnityEngine; +using UnityEditor; +using UnityEditor.SceneManagement; + +namespace UnityLibrary.Tools +{ + public class ReplaceCharacterInGameObjectNames : EditorWindow + { + private string searchString = "|"; + private string replaceString = "@"; + + [MenuItem("Tools/Replace Characters in GameObject Names")] + public static void ShowWindow() + { + GetWindow("Replace Characters"); + } + + private void OnGUI() + { + GUILayout.Label("Replace Characters in Selected GameObject Names", EditorStyles.boldLabel); + + searchString = EditorGUILayout.TextField("Search String", searchString); + replaceString = EditorGUILayout.TextField("Replace String", replaceString); + + int selectedObjectCount = Selection.gameObjects.Length; + GUILayout.Label($"Selected GameObjects: {selectedObjectCount}", EditorStyles.label); + + if (GUILayout.Button("Replace")) + { + ReplaceCharacters(); + } + } + + private void ReplaceCharacters() + { + GameObject[] selectedObjects = Selection.gameObjects; + + if (selectedObjects.Length == 0) + { + Debug.LogWarning("No GameObjects selected."); + return; + } + + // Start a new undo group + Undo.IncrementCurrentGroup(); + Undo.SetCurrentGroupName("Replace Character in GameObject Names"); + int undoGroup = Undo.GetCurrentGroup(); + + foreach (GameObject obj in selectedObjects) + { + if (obj.name.Contains(searchString)) + { + Undo.RecordObject(obj, "Replace Character in GameObject Name"); + obj.name = obj.name.Replace(searchString, replaceString); + EditorUtility.SetDirty(obj); + } + } + + // End the undo group + Undo.CollapseUndoOperations(undoGroup); + + EditorSceneManager.MarkSceneDirty(EditorSceneManager.GetActiveScene()); + + Debug.Log($"Replaced '{searchString}' with '{replaceString}' in the names of selected GameObjects."); + } + } +} From 2296f02dabe31b8d5a1491308c82e9f13c761010 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 17 May 2024 11:55:08 +0300 Subject: [PATCH 094/120] add editor tool to copy selected gameobject names to clipboard as a list --- .../Editor/BatchTools/CopyGameObjectNames.cs | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs diff --git a/Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs b/Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs new file mode 100644 index 0000000..de28cd4 --- /dev/null +++ b/Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs @@ -0,0 +1,55 @@ +// editor tool to copy names of selected GameObjects to clipboard as a list (so you can paste them in Excel or others..) + +using UnityEngine; +using UnityEditor; +using System.Text; +namespace UnityLibrary.Tools +{ + public class CopyGameObjectNames : EditorWindow + { + private string gameObjectNames = string.Empty; + + [MenuItem("Tools/Copy GameObject Names")] + public static void ShowWindow() + { + GetWindow("Copy GameObject Names"); + } + + private void OnGUI() + { + GUILayout.Label("Copy Names of Selected GameObjects", EditorStyles.boldLabel); + + if (GUILayout.Button("Fetch Names")) + { + FetchNames(); + } + + GUILayout.Label("GameObject Names:", EditorStyles.label); + gameObjectNames = EditorGUILayout.TextArea(gameObjectNames, GUILayout.Height(200)); + + if (GUILayout.Button("Copy to Clipboard")) + { + CopyToClipboard(); + } + } + + private void FetchNames() + { + StringBuilder sb = new StringBuilder(); + GameObject[] selectedObjects = Selection.gameObjects; + + foreach (GameObject obj in selectedObjects) + { + sb.AppendLine(obj.name); + } + + gameObjectNames = sb.ToString(); + } + + private void CopyToClipboard() + { + EditorGUIUtility.systemCopyBuffer = gameObjectNames; + Debug.Log("GameObject names copied to clipboard."); + } + } +} \ No newline at end of file From a39816f5b4a5a2a9d305ec13ac3aef017d49c9b9 Mon Sep 17 00:00:00 2001 From: mika Date: Fri, 17 May 2024 12:21:40 +0300 Subject: [PATCH 095/120] Fix CopyGameObjectNames.cs to copy in correct hierarchy order --- Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs b/Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs index de28cd4..40bf0d0 100644 --- a/Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs +++ b/Assets/Scripts/Editor/BatchTools/CopyGameObjectNames.cs @@ -3,6 +3,7 @@ using UnityEngine; using UnityEditor; using System.Text; +using System.Linq; namespace UnityLibrary.Tools { public class CopyGameObjectNames : EditorWindow @@ -38,7 +39,10 @@ private void FetchNames() StringBuilder sb = new StringBuilder(); GameObject[] selectedObjects = Selection.gameObjects; - foreach (GameObject obj in selectedObjects) + // Sort the selected objects by their sibling index + var sortedObjects = selectedObjects.OrderBy(go => go.transform.GetSiblingIndex()).ToArray(); + + foreach (GameObject obj in sortedObjects) { sb.AppendLine(obj.name); } @@ -52,4 +56,4 @@ private void CopyToClipboard() Debug.Log("GameObject names copied to clipboard."); } } -} \ No newline at end of file +} From f13f9beb250f96c99661b967b4fce3e92ccc8949 Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 6 Aug 2024 13:17:11 +0300 Subject: [PATCH 096/120] Create RendererTypeCounter.cs --- .../Editor/Tools/RendererTypeCounter.cs | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 Assets/Scripts/Editor/Tools/RendererTypeCounter.cs diff --git a/Assets/Scripts/Editor/Tools/RendererTypeCounter.cs b/Assets/Scripts/Editor/Tools/RendererTypeCounter.cs new file mode 100644 index 0000000..0cc0ce2 --- /dev/null +++ b/Assets/Scripts/Editor/Tools/RendererTypeCounter.cs @@ -0,0 +1,108 @@ +// shows renderer stats from selected objects in the editor + +using UnityEngine; +using UnityEditor; + +namespace UnityLibrary +{ + public class RendererTypeCounter : EditorWindow + { + private int activeMeshRendererCount; + private int inactiveMeshRendererCount; + private int activeSkinnedMeshRendererCount; + private int inactiveSkinnedMeshRendererCount; + private int activeSpriteRendererCount; + private int inactiveSpriteRendererCount; + private int totalGameObjectCount; + + [MenuItem("Tools/Renderer Type Counter")] + public static void ShowWindow() + { + GetWindow("Renderer Type Counter"); + } + + private void OnGUI() + { + if (GUILayout.Button("Count Renderers")) + { + CountRenderersInSelection(); + } + + GUILayout.Space(10); + + GUILayout.Label("Active Mesh Renderers: " + activeMeshRendererCount); + GUILayout.Label("Inactive Mesh Renderers: " + inactiveMeshRendererCount); + GUILayout.Label("Active Skinned Mesh Renderers: " + activeSkinnedMeshRendererCount); + GUILayout.Label("Inactive Skinned Mesh Renderers: " + inactiveSkinnedMeshRendererCount); + GUILayout.Label("Active Sprite Renderers: " + activeSpriteRendererCount); + GUILayout.Label("Inactive Sprite Renderers: " + inactiveSpriteRendererCount); + GUILayout.Label("Total GameObjects: " + totalGameObjectCount); + } + + private void CountRenderersInSelection() + { + activeMeshRendererCount = 0; + inactiveMeshRendererCount = 0; + activeSkinnedMeshRendererCount = 0; + inactiveSkinnedMeshRendererCount = 0; + activeSpriteRendererCount = 0; + inactiveSpriteRendererCount = 0; + totalGameObjectCount = 0; + + foreach (GameObject obj in Selection.gameObjects) + { + CountRenderersRecursively(obj); + } + + Repaint(); + } + + private void CountRenderersRecursively(GameObject obj) + { + totalGameObjectCount++; + + bool isActive = obj.activeInHierarchy; + + if (obj.GetComponent()) + { + if (isActive) + { + activeMeshRendererCount++; + } + else + { + inactiveMeshRendererCount++; + } + } + + if (obj.GetComponent()) + { + if (isActive) + { + activeSkinnedMeshRendererCount++; + } + else + { + inactiveSkinnedMeshRendererCount++; + } + } + + if (obj.GetComponent()) + { + if (isActive) + { + activeSpriteRendererCount++; + } + else + { + inactiveSpriteRendererCount++; + } + } + + foreach (Transform child in obj.transform) + { + CountRenderersRecursively(child.gameObject); + } + } + } +} From 4532dd6984ad76ed9b4ea0d1458be943307b6b7f Mon Sep 17 00:00:00 2001 From: Hasan Bayat Date: Fri, 4 Oct 2024 11:49:26 +0330 Subject: [PATCH 097/120] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7f51b0..f185093 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ Feel free to [:postbox: Post your ideas/comments/improvements/recommendations](h ## Credits - [UnityCoder (mika)](https://github.com/unitycoder) (Owner) -- [EmpireWorld (Hasan Bayat)](https://github.com/EmpireWorld) (Owner) +- [hasanbayatme (Hasan Bayat)](https://github.com/hasanbayatme) (Owner) - [Lootheo (Manuel Otheo)](https://github.com/Lootheo) (Member) - [igorrafael (Igor Rafael de Sousa)](https://github.com/igorrafael) (Member) - [nrlnd](https://github.com/nrlnd) (Member) From 3e2d55b01d812be62b5239fc8f2d4c3b3edd2a2b Mon Sep 17 00:00:00 2001 From: mika Date: Tue, 22 Oct 2024 21:46:37 +0300 Subject: [PATCH 098/120] Create FindWhatButtonCallsMyMethod.cs --- .../Tools/FindWhatButtonCallsMyMethod.cs | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Assets/Scripts/Editor/Tools/FindWhatButtonCallsMyMethod.cs diff --git a/Assets/Scripts/Editor/Tools/FindWhatButtonCallsMyMethod.cs b/Assets/Scripts/Editor/Tools/FindWhatButtonCallsMyMethod.cs new file mode 100644 index 0000000..e67f45b --- /dev/null +++ b/Assets/Scripts/Editor/Tools/FindWhatButtonCallsMyMethod.cs @@ -0,0 +1,69 @@ +// prints out which buttons in current scene are referencing your given method + +using UnityEngine; +using UnityEngine.UI; +using UnityEditor; +using UnityEngine.Events; +using System.Reflection; + +namespace UnityLibrary +{ + public class FindWhatButtonCallsMyMethod : EditorWindow + { + private string methodName = "MyMethodHere"; + + [MenuItem("Tools/Find Buttons with Method")] + public static void ShowWindow() + { + GetWindow("FindWhatButtonCallsMyMethod"); + } + + private void OnGUI() + { + GUILayout.Label("Find Buttons that call Method", EditorStyles.boldLabel); + methodName = EditorGUILayout.TextField("Method Name:", methodName); + + if (GUILayout.Button("Find Buttons")) + { + FindButtonsWithMethod(); + } + } + + private void FindButtonsWithMethod() + { + Button[] allButtons = FindObjectsOfType