diff --git a/Assets/Prefabs/Menu.prefab b/Assets/Prefabs/Menu.prefab index a875df7..ccb1e02 100644 --- a/Assets/Prefabs/Menu.prefab +++ b/Assets/Prefabs/Menu.prefab @@ -1754,7 +1754,7 @@ Canvas: m_GameObject: {fileID: 5305278010342315831} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -1820,6 +1820,8 @@ MonoBehaviour: m_EditorClassIdentifier: currentVis: {fileID: 5305278009821670017} vfxMenu: {fileID: 0} + mouseHideTimeSeconds: 3 + mouseHideThreshold: 3 --- !u!1 &6466943970290633308 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat b/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat index 772e35b..88da7d0 100644 --- a/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat +++ b/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat @@ -142,7 +142,7 @@ Material: - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - - _Brightness: 3.9499998 + - _Brightness: 3.1000001 - _CoatMask: 0 - _CullMode: 2 - _CullModeForward: 2 @@ -235,7 +235,7 @@ Material: - _UVEmissive: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 - - _Wildness: 5.721429 + - _Wildness: 4.921429 - _Wow: 4 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 @@ -243,7 +243,7 @@ Material: - _ZWrite: 1 - _Zing: 0 - _Zip: 0.5 - - _Zoom: -0.2628572 + - _Zoom: -0.54285717 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Scenes/MDNA_GeneDrive.unity b/Assets/Scenes/MDNA_GeneDrive.unity index cb6238a..2661ccd 100644 --- a/Assets/Scenes/MDNA_GeneDrive.unity +++ b/Assets/Scenes/MDNA_GeneDrive.unity @@ -820,11 +820,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6299956056252612629, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_SizeDelta.x - value: 219 + value: 64 objectReference: {fileID: 0} - target: {fileID: 6299956056252612629, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_SizeDelta.y - value: 60 + value: 64 objectReference: {fileID: 0} - target: {fileID: 7200639167805561534, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_RootOrder @@ -833,7 +833,7 @@ PrefabInstance: - target: {fileID: 7817393215567595311, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_Texture value: - objectReference: {fileID: 2800000, guid: 9c39ce62ca6b36f45af28ac4bb70d702, type: 3} + objectReference: {fileID: 2800000, guid: bcf19558d625cc1459278eea869f67c1, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} --- !u!1 &667181310 diff --git a/Assets/Scenes/MDNA_GeneDrive/GeneDrive.mat b/Assets/Scenes/MDNA_GeneDrive/GeneDrive.mat index 72b255b..49f198e 100644 --- a/Assets/Scenes/MDNA_GeneDrive/GeneDrive.mat +++ b/Assets/Scenes/MDNA_GeneDrive/GeneDrive.mat @@ -211,8 +211,8 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SpecularOcclusionMode: 1 - - _SphereSize: 0.94285715 - - _SphereStretch: 0.5928571 + - _SphereSize: 0.9785714 + - _SphereStretch: 0.6 - _SrcBlend: 1 - _StencilRef: 0 - _StencilRefDepth: 8 diff --git a/Assets/Scenes/MDNA_GeneDrive/GeneDrive.shader b/Assets/Scenes/MDNA_GeneDrive/GeneDrive.shader index 4ab4fb7..425fc67 100644 --- a/Assets/Scenes/MDNA_GeneDrive/GeneDrive.shader +++ b/Assets/Scenes/MDNA_GeneDrive/GeneDrive.shader @@ -152,10 +152,14 @@ Shader "FullScreen/GeneDrive" // camera coordinates float2 uv = guv; - float3 eye = float3(sin(time * 0.1) * 5.0, cos(time * 0.1) * 5.0 + 0.5, 1.0); + float tau = 6.283185307179586; + + float3 eye = float3(0.0, 0.0, 0.0); + // float3 at = float3(sin(time * 0.1) * tau, cos(time * 0.1) * tau + 0.5, sin(time * 0.1) + 0.2 * tau); + float3 at = float3(sin(time * 0.1) * tau, cos(time * 0.1) * tau + 0.5, sin(time * 0.1) + 0.2 * tau); // float3 eye = float3(5.0, 5.0, 1.0); - float3 at = float3(0.0, 0.0, 0.0); + // float3 at = float3(0.0, 0.0, 0.0); float3 z = normalize(at-eye); float3 x = normalize(cross(z, float3(0.0,1.0,0.0))); float3 y = cross(x, z); diff --git a/Assets/Util/CursorHide.cs b/Assets/Util/CursorHide.cs new file mode 100644 index 0000000..f90eb7a --- /dev/null +++ b/Assets/Util/CursorHide.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using System.Collections; + +public class CursorHide : MonoBehaviour { + public float hideAfterSeconds = 3f; + public float thresholdInPixels = 3f; + + float _lastTime; + Vector3 _lastMousePos; + + void Start () { + _lastTime = Time.timeSinceLevelLoad; + _lastMousePos = Input.mousePosition; + } + + void Update () { + Vector2 dx = Input.mousePosition - _lastMousePos; + bool move = (dx.sqrMagnitude > (thresholdInPixels * thresholdInPixels)); + _lastMousePos = Input.mousePosition; + + if (move) + _lastTime = Time.timeSinceLevelLoad; + + Cursor.visible = (Time.timeSinceLevelLoad - _lastTime) < hideAfterSeconds; + } +} \ No newline at end of file diff --git a/Assets/Util/CursorHide.cs.meta b/Assets/Util/CursorHide.cs.meta new file mode 100644 index 0000000..a7bc66a --- /dev/null +++ b/Assets/Util/CursorHide.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7e3f63f71f856934f8bb5743688a4732 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Util/Loader.cs b/Assets/Util/Loader.cs index 21bcee8..6fa33eb 100644 --- a/Assets/Util/Loader.cs +++ b/Assets/Util/Loader.cs @@ -18,6 +18,11 @@ public class Loader : MonoBehaviour { private KeyCode PrevButton = KeyCode.Backspace; private KeyCode MenuButton = KeyCode.Escape; + public float mouseHideTimeSeconds = 3f; + public float mouseHideThreshold = 3f; + float mouseLastMoveTime; + Vector3 mouseLastMovePos; + void Awake() { ToggleMenu(menuVisible); } @@ -26,6 +31,11 @@ public class Loader : MonoBehaviour { scene = SceneManager.GetActiveScene(); currentVis.text = scene.name; // Debug.Log("Active Scene name is: " + scene.name + "\nActive Scene index: " + scene.buildIndex); + + // cursor visibility + mouseLastMoveTime = Time.timeSinceLevelLoad; + mouseLastMovePos = Input.mousePosition; + } void Update() { @@ -40,6 +50,8 @@ public class Loader : MonoBehaviour { if (Input.GetKeyDown(MenuButton)) { ToggleMenu(!menuVisible); } + + CheckMouseVisibility(); } void VfxMenuVisible(bool v) { @@ -58,6 +70,21 @@ public class Loader : MonoBehaviour { menuVisible = visible; } + void CheckMouseVisibility() { + if (menuVisible) { + Vector2 dx = Input.mousePosition - mouseLastMovePos; + bool move = (dx.sqrMagnitude > (mouseHideThreshold * mouseHideThreshold)); + mouseLastMovePos = Input.mousePosition; + + if (move) + mouseLastMoveTime = Time.timeSinceLevelLoad; + + Cursor.visible = (Time.timeSinceLevelLoad - mouseLastMoveTime) < mouseHideTimeSeconds; + } else { + Cursor.visible = false; + } + } + public void NextScene() { int current = scene.buildIndex; int next = (current + 1) % (SceneManager.sceneCountInBuildSettings); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 6804eb4..f77cf60 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,13 +27,13 @@ EditorUserSettings: value: 575201005001585d0e0c547a49205b4410164f29792d23337e7e4465e3b5603c flags: 0 RecentlyUsedSceneGuid-7: - value: 550407570457580d5a0f0a7a13755c4417154b2b7a707369757f4a67b7e56368 + value: 5606060550530a5a5e5b5573417a5e4444164e7f7f2e70647c794566e7e3376e flags: 0 RecentlyUsedSceneGuid-8: - value: 020405530005580d5e5b552616755b444e164e722e2d71607f794935b2b8353e + value: 550407570457580d5a0f0a7a13755c4417154b2b7a707369757f4a67b7e56368 flags: 0 RecentlyUsedSceneGuid-9: - value: 5606060550530a5a5e5b5573417a5e4444164e7f7f2e70647c794566e7e3376e + value: 020405530005580d5e5b552616755b444e164e722e2d71607f794935b2b8353e flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c723e3b3b270b3e3a2729633c133af6f9 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 1b69979..03f6983 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -67,7 +67,7 @@ MonoBehaviour: m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 - m_Stats: 1 + m_Stats: 0 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: d2e5fcffd4e5fcff04eefcff840afdff9212fdffea2dfdffd835fdff625afdff8a74ffff229cffff72adffff3cc1ffff24c3ffff02c5ffff1cfbffff9c8b00004e96000094960000fa960000e2cb0000a8ea0000d2ea000052eb0000 + m_ExpandedIDs: 1077fbff3478fbff1c79fbffee79fbffbe7afbff8e7bfbff607cfbff327dfbff047efbffd67efbffa87ffbff7480fbff4081fbff1282fbffe482fbffb683fbff8884fbff5a85fbff2c86fbff0087fbffd287fbffac88fbff2e8bfbff5a8cfbff548ffbff2690fbfff690fbffc691fbff9892fbff6a93fbff3c94fbff1a95fbffec95fbffb896fbff8697fbff5898fbff2a99fbfffc99fbffce9afbffa29bfbff749cfbff489dfbff1a9efbfffc9efbff76c5fbff78c5fbff54c7fbffe2d0fbff34d9fbff80e3fbff00edfbff7cf8fbff9cfffbffd2e5fcffd4e5fcff04eefcff840afdff9212fdffea2dfdffd835fdff625afdff8a74ffff229cffff72adffff3cc1ffff24c3ffff02c5ffff1cfbffff9c8b00004e96000094960000fa960000e2cb0000a8ea0000d2ea000052eb0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -712,8 +712,7 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets/Scenes/MDNA_GeneDrive + m_Folders: [] m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -753,10 +752,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 415} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2630000f4630000f6630000f8630000fa630000fc630000fe63000000640000026400000464000006640000086400000a6400000c6400000e64000010640000126400001464000016640000a6650000e4650000b6ca0000 + m_ExpandedIDs: ffffffff00000000f2630000f4630000f6630000f8630000fa630000fc630000fe63000000640000026400000464000006640000086400000a6400000c6400000e64000010640000126400001464000016640000a665000000310100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: