From 71b13f4850981d5a7d7885bb8c5964981a922d57 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 13:42:03 +0100 Subject: [PATCH 01/13] Upgraded to Unity 2018.3.0f2 --- Packages/manifest.json | 40 ++++++++++++++++++++++++++++-- ProjectSettings/ProjectVersion.txt | 2 +- ProjectSettings/VFXManager.asset | 11 ++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 ProjectSettings/VFXManager.asset diff --git a/Packages/manifest.json b/Packages/manifest.json index 526aca6..16819bf 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,4 +1,40 @@ { - "dependencies": { - } + "dependencies": { + "com.unity.ads": "2.3.1", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.3", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.3.0", + "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" + } } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 454c57f..ca32b1e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.5f1 +m_EditorVersion: 2018.3.0f2 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..6e0eaca --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,11 @@ +%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_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 From 0b78ce0e72a8380f949db8b5d6983b17461dc807 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:06:27 +0100 Subject: [PATCH 02/13] Moved stuff into folders --- Assets/Materials.meta | 8 ++++++++ Assets/{ => Materials}/3DText.mat | 0 Assets/{ => Materials}/3DText.mat.meta | 0 .../{ => Materials}/HighlighterPointersOutline.mat | 0 .../HighlighterPointersOutline.mat.meta | 0 Assets/{ => Materials}/NoduleMat.mat | 0 Assets/{ => Materials}/NoduleMat.mat.meta | 0 Assets/{ => Materials}/VoxelHighlighterMat.mat | 0 Assets/{ => Materials}/VoxelHighlighterMat.mat.meta | 0 Assets/{ => Materials}/VoxelPrefabMat.mat | 0 Assets/{ => Materials}/VoxelPrefabMat.mat.meta | 0 Assets/{ => Materials}/unnamed.mat | 0 Assets/{ => Materials}/unnamed.mat.meta | 0 Assets/Meshes.meta | 8 ++++++++ Assets/{ => Meshes}/Nodule.blend | Bin Assets/{ => Meshes}/Nodule.blend.meta | 0 Assets/{ => Meshes}/Voxel.blend | Bin Assets/{ => Meshes}/Voxel.blend.meta | 0 Assets/{ => Meshes}/Voxel.blend1 | Bin Assets/{ => Meshes}/Voxel.blend1.meta | 0 Assets/{ => Meshes}/VoxelHighlighter.blend | Bin Assets/{ => Meshes}/VoxelHighlighter.blend.meta | 0 Assets/Prefabs.meta | 8 ++++++++ Assets/{ => Prefabs}/NodulePrefab.prefab | 0 Assets/{ => Prefabs}/NodulePrefab.prefab.meta | 0 Assets/{ => Prefabs}/VoxelPrefab.prefab | 0 Assets/{ => Prefabs}/VoxelPrefab.prefab.meta | 0 Assets/Scripts.meta | 8 ++++++++ Assets/{ => Scripts}/AlwaysFaceTowardsCamera.cs | 0 .../{ => Scripts}/AlwaysFaceTowardsCamera.cs.meta | 0 Assets/{ => Scripts}/ChangeColorOnHover.cs | 0 Assets/{ => Scripts}/ChangeColorOnHover.cs.meta | 0 Assets/{ => Scripts}/CutOnClick.cs | 0 Assets/{ => Scripts}/CutOnClick.cs.meta | 0 Assets/{ => Scripts}/DisableTextOnInvisible.cs | 0 Assets/{ => Scripts}/DisableTextOnInvisible.cs.meta | 0 Assets/{ => Scripts}/LerpToPos.cs | 0 Assets/{ => Scripts}/LerpToPos.cs.meta | 0 Assets/{ => Scripts}/NumberToggle.cs | 0 Assets/{ => Scripts}/NumberToggle.cs.meta | 0 Assets/{ => Scripts}/OutlineToggle.cs | 0 Assets/{ => Scripts}/OutlineToggle.cs.meta | 0 Assets/{ => Scripts}/RotateCube.cs | 0 Assets/{ => Scripts}/RotateCube.cs.meta | 0 Assets/{ => Scripts}/SetVoxelProperties.cs | 0 Assets/{ => Scripts}/SetVoxelProperties.cs.meta | 0 Assets/{ => Scripts}/ShowCorrectNumber.cs | 0 Assets/{ => Scripts}/ShowCorrectNumber.cs.meta | 0 Assets/{ => Scripts}/VoxelMover.cs | 0 Assets/{ => Scripts}/VoxelMover.cs.meta | 0 Assets/{ => Scripts}/VoxelSpawner.cs | 0 Assets/{ => Scripts}/VoxelSpawner.cs.meta | 0 Assets/Shaders.meta | 8 ++++++++ Assets/{ => Shaders}/3DText.shader | 0 Assets/{ => Shaders}/3DText.shader.meta | 0 Assets/{ => Shaders}/UltimateOutline.shader | 0 Assets/{ => Shaders}/UltimateOutline.shader.meta | 0 Assets/{ => Shaders}/UniformOutline.shader | 0 Assets/{ => Shaders}/UniformOutline.shader.meta | 0 Assets/{ => Shaders}/VoxelShader.shader | 0 Assets/{ => Shaders}/VoxelShader.shader.meta | 0 61 files changed, 40 insertions(+) create mode 100644 Assets/Materials.meta rename Assets/{ => Materials}/3DText.mat (100%) rename Assets/{ => Materials}/3DText.mat.meta (100%) rename Assets/{ => Materials}/HighlighterPointersOutline.mat (100%) rename Assets/{ => Materials}/HighlighterPointersOutline.mat.meta (100%) rename Assets/{ => Materials}/NoduleMat.mat (100%) rename Assets/{ => Materials}/NoduleMat.mat.meta (100%) rename Assets/{ => Materials}/VoxelHighlighterMat.mat (100%) rename Assets/{ => Materials}/VoxelHighlighterMat.mat.meta (100%) rename Assets/{ => Materials}/VoxelPrefabMat.mat (100%) rename Assets/{ => Materials}/VoxelPrefabMat.mat.meta (100%) rename Assets/{ => Materials}/unnamed.mat (100%) rename Assets/{ => Materials}/unnamed.mat.meta (100%) create mode 100644 Assets/Meshes.meta rename Assets/{ => Meshes}/Nodule.blend (100%) rename Assets/{ => Meshes}/Nodule.blend.meta (100%) rename Assets/{ => Meshes}/Voxel.blend (100%) rename Assets/{ => Meshes}/Voxel.blend.meta (100%) rename Assets/{ => Meshes}/Voxel.blend1 (100%) rename Assets/{ => Meshes}/Voxel.blend1.meta (100%) rename Assets/{ => Meshes}/VoxelHighlighter.blend (100%) rename Assets/{ => Meshes}/VoxelHighlighter.blend.meta (100%) create mode 100644 Assets/Prefabs.meta rename Assets/{ => Prefabs}/NodulePrefab.prefab (100%) rename Assets/{ => Prefabs}/NodulePrefab.prefab.meta (100%) rename Assets/{ => Prefabs}/VoxelPrefab.prefab (100%) rename Assets/{ => Prefabs}/VoxelPrefab.prefab.meta (100%) create mode 100644 Assets/Scripts.meta rename Assets/{ => Scripts}/AlwaysFaceTowardsCamera.cs (100%) rename Assets/{ => Scripts}/AlwaysFaceTowardsCamera.cs.meta (100%) rename Assets/{ => Scripts}/ChangeColorOnHover.cs (100%) rename Assets/{ => Scripts}/ChangeColorOnHover.cs.meta (100%) rename Assets/{ => Scripts}/CutOnClick.cs (100%) rename Assets/{ => Scripts}/CutOnClick.cs.meta (100%) rename Assets/{ => Scripts}/DisableTextOnInvisible.cs (100%) rename Assets/{ => Scripts}/DisableTextOnInvisible.cs.meta (100%) rename Assets/{ => Scripts}/LerpToPos.cs (100%) rename Assets/{ => Scripts}/LerpToPos.cs.meta (100%) rename Assets/{ => Scripts}/NumberToggle.cs (100%) rename Assets/{ => Scripts}/NumberToggle.cs.meta (100%) rename Assets/{ => Scripts}/OutlineToggle.cs (100%) rename Assets/{ => Scripts}/OutlineToggle.cs.meta (100%) rename Assets/{ => Scripts}/RotateCube.cs (100%) rename Assets/{ => Scripts}/RotateCube.cs.meta (100%) rename Assets/{ => Scripts}/SetVoxelProperties.cs (100%) rename Assets/{ => Scripts}/SetVoxelProperties.cs.meta (100%) rename Assets/{ => Scripts}/ShowCorrectNumber.cs (100%) rename Assets/{ => Scripts}/ShowCorrectNumber.cs.meta (100%) rename Assets/{ => Scripts}/VoxelMover.cs (100%) rename Assets/{ => Scripts}/VoxelMover.cs.meta (100%) rename Assets/{ => Scripts}/VoxelSpawner.cs (100%) rename Assets/{ => Scripts}/VoxelSpawner.cs.meta (100%) create mode 100644 Assets/Shaders.meta rename Assets/{ => Shaders}/3DText.shader (100%) rename Assets/{ => Shaders}/3DText.shader.meta (100%) rename Assets/{ => Shaders}/UltimateOutline.shader (100%) rename Assets/{ => Shaders}/UltimateOutline.shader.meta (100%) rename Assets/{ => Shaders}/UniformOutline.shader (100%) rename Assets/{ => Shaders}/UniformOutline.shader.meta (100%) rename Assets/{ => Shaders}/VoxelShader.shader (100%) rename Assets/{ => Shaders}/VoxelShader.shader.meta (100%) diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 0000000..8a52343 --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3286b103be89c3a44a9dcd3e2a2aae2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3DText.mat b/Assets/Materials/3DText.mat similarity index 100% rename from Assets/3DText.mat rename to Assets/Materials/3DText.mat diff --git a/Assets/3DText.mat.meta b/Assets/Materials/3DText.mat.meta similarity index 100% rename from Assets/3DText.mat.meta rename to Assets/Materials/3DText.mat.meta diff --git a/Assets/HighlighterPointersOutline.mat b/Assets/Materials/HighlighterPointersOutline.mat similarity index 100% rename from Assets/HighlighterPointersOutline.mat rename to Assets/Materials/HighlighterPointersOutline.mat diff --git a/Assets/HighlighterPointersOutline.mat.meta b/Assets/Materials/HighlighterPointersOutline.mat.meta similarity index 100% rename from Assets/HighlighterPointersOutline.mat.meta rename to Assets/Materials/HighlighterPointersOutline.mat.meta diff --git a/Assets/NoduleMat.mat b/Assets/Materials/NoduleMat.mat similarity index 100% rename from Assets/NoduleMat.mat rename to Assets/Materials/NoduleMat.mat diff --git a/Assets/NoduleMat.mat.meta b/Assets/Materials/NoduleMat.mat.meta similarity index 100% rename from Assets/NoduleMat.mat.meta rename to Assets/Materials/NoduleMat.mat.meta diff --git a/Assets/VoxelHighlighterMat.mat b/Assets/Materials/VoxelHighlighterMat.mat similarity index 100% rename from Assets/VoxelHighlighterMat.mat rename to Assets/Materials/VoxelHighlighterMat.mat diff --git a/Assets/VoxelHighlighterMat.mat.meta b/Assets/Materials/VoxelHighlighterMat.mat.meta similarity index 100% rename from Assets/VoxelHighlighterMat.mat.meta rename to Assets/Materials/VoxelHighlighterMat.mat.meta diff --git a/Assets/VoxelPrefabMat.mat b/Assets/Materials/VoxelPrefabMat.mat similarity index 100% rename from Assets/VoxelPrefabMat.mat rename to Assets/Materials/VoxelPrefabMat.mat diff --git a/Assets/VoxelPrefabMat.mat.meta b/Assets/Materials/VoxelPrefabMat.mat.meta similarity index 100% rename from Assets/VoxelPrefabMat.mat.meta rename to Assets/Materials/VoxelPrefabMat.mat.meta diff --git a/Assets/unnamed.mat b/Assets/Materials/unnamed.mat similarity index 100% rename from Assets/unnamed.mat rename to Assets/Materials/unnamed.mat diff --git a/Assets/unnamed.mat.meta b/Assets/Materials/unnamed.mat.meta similarity index 100% rename from Assets/unnamed.mat.meta rename to Assets/Materials/unnamed.mat.meta diff --git a/Assets/Meshes.meta b/Assets/Meshes.meta new file mode 100644 index 0000000..a9d16d2 --- /dev/null +++ b/Assets/Meshes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8a460bfb31036c4daa33873ba872227 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Nodule.blend b/Assets/Meshes/Nodule.blend similarity index 100% rename from Assets/Nodule.blend rename to Assets/Meshes/Nodule.blend diff --git a/Assets/Nodule.blend.meta b/Assets/Meshes/Nodule.blend.meta similarity index 100% rename from Assets/Nodule.blend.meta rename to Assets/Meshes/Nodule.blend.meta diff --git a/Assets/Voxel.blend b/Assets/Meshes/Voxel.blend similarity index 100% rename from Assets/Voxel.blend rename to Assets/Meshes/Voxel.blend diff --git a/Assets/Voxel.blend.meta b/Assets/Meshes/Voxel.blend.meta similarity index 100% rename from Assets/Voxel.blend.meta rename to Assets/Meshes/Voxel.blend.meta diff --git a/Assets/Voxel.blend1 b/Assets/Meshes/Voxel.blend1 similarity index 100% rename from Assets/Voxel.blend1 rename to Assets/Meshes/Voxel.blend1 diff --git a/Assets/Voxel.blend1.meta b/Assets/Meshes/Voxel.blend1.meta similarity index 100% rename from Assets/Voxel.blend1.meta rename to Assets/Meshes/Voxel.blend1.meta diff --git a/Assets/VoxelHighlighter.blend b/Assets/Meshes/VoxelHighlighter.blend similarity index 100% rename from Assets/VoxelHighlighter.blend rename to Assets/Meshes/VoxelHighlighter.blend diff --git a/Assets/VoxelHighlighter.blend.meta b/Assets/Meshes/VoxelHighlighter.blend.meta similarity index 100% rename from Assets/VoxelHighlighter.blend.meta rename to Assets/Meshes/VoxelHighlighter.blend.meta diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..4b7f96e --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77c5f1d0fa1bcb4449e33e760edd9e78 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NodulePrefab.prefab b/Assets/Prefabs/NodulePrefab.prefab similarity index 100% rename from Assets/NodulePrefab.prefab rename to Assets/Prefabs/NodulePrefab.prefab diff --git a/Assets/NodulePrefab.prefab.meta b/Assets/Prefabs/NodulePrefab.prefab.meta similarity index 100% rename from Assets/NodulePrefab.prefab.meta rename to Assets/Prefabs/NodulePrefab.prefab.meta diff --git a/Assets/VoxelPrefab.prefab b/Assets/Prefabs/VoxelPrefab.prefab similarity index 100% rename from Assets/VoxelPrefab.prefab rename to Assets/Prefabs/VoxelPrefab.prefab diff --git a/Assets/VoxelPrefab.prefab.meta b/Assets/Prefabs/VoxelPrefab.prefab.meta similarity index 100% rename from Assets/VoxelPrefab.prefab.meta rename to Assets/Prefabs/VoxelPrefab.prefab.meta diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000..a50691b --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3acef111cc7f9ce4798487d29b7aa997 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AlwaysFaceTowardsCamera.cs b/Assets/Scripts/AlwaysFaceTowardsCamera.cs similarity index 100% rename from Assets/AlwaysFaceTowardsCamera.cs rename to Assets/Scripts/AlwaysFaceTowardsCamera.cs diff --git a/Assets/AlwaysFaceTowardsCamera.cs.meta b/Assets/Scripts/AlwaysFaceTowardsCamera.cs.meta similarity index 100% rename from Assets/AlwaysFaceTowardsCamera.cs.meta rename to Assets/Scripts/AlwaysFaceTowardsCamera.cs.meta diff --git a/Assets/ChangeColorOnHover.cs b/Assets/Scripts/ChangeColorOnHover.cs similarity index 100% rename from Assets/ChangeColorOnHover.cs rename to Assets/Scripts/ChangeColorOnHover.cs diff --git a/Assets/ChangeColorOnHover.cs.meta b/Assets/Scripts/ChangeColorOnHover.cs.meta similarity index 100% rename from Assets/ChangeColorOnHover.cs.meta rename to Assets/Scripts/ChangeColorOnHover.cs.meta diff --git a/Assets/CutOnClick.cs b/Assets/Scripts/CutOnClick.cs similarity index 100% rename from Assets/CutOnClick.cs rename to Assets/Scripts/CutOnClick.cs diff --git a/Assets/CutOnClick.cs.meta b/Assets/Scripts/CutOnClick.cs.meta similarity index 100% rename from Assets/CutOnClick.cs.meta rename to Assets/Scripts/CutOnClick.cs.meta diff --git a/Assets/DisableTextOnInvisible.cs b/Assets/Scripts/DisableTextOnInvisible.cs similarity index 100% rename from Assets/DisableTextOnInvisible.cs rename to Assets/Scripts/DisableTextOnInvisible.cs diff --git a/Assets/DisableTextOnInvisible.cs.meta b/Assets/Scripts/DisableTextOnInvisible.cs.meta similarity index 100% rename from Assets/DisableTextOnInvisible.cs.meta rename to Assets/Scripts/DisableTextOnInvisible.cs.meta diff --git a/Assets/LerpToPos.cs b/Assets/Scripts/LerpToPos.cs similarity index 100% rename from Assets/LerpToPos.cs rename to Assets/Scripts/LerpToPos.cs diff --git a/Assets/LerpToPos.cs.meta b/Assets/Scripts/LerpToPos.cs.meta similarity index 100% rename from Assets/LerpToPos.cs.meta rename to Assets/Scripts/LerpToPos.cs.meta diff --git a/Assets/NumberToggle.cs b/Assets/Scripts/NumberToggle.cs similarity index 100% rename from Assets/NumberToggle.cs rename to Assets/Scripts/NumberToggle.cs diff --git a/Assets/NumberToggle.cs.meta b/Assets/Scripts/NumberToggle.cs.meta similarity index 100% rename from Assets/NumberToggle.cs.meta rename to Assets/Scripts/NumberToggle.cs.meta diff --git a/Assets/OutlineToggle.cs b/Assets/Scripts/OutlineToggle.cs similarity index 100% rename from Assets/OutlineToggle.cs rename to Assets/Scripts/OutlineToggle.cs diff --git a/Assets/OutlineToggle.cs.meta b/Assets/Scripts/OutlineToggle.cs.meta similarity index 100% rename from Assets/OutlineToggle.cs.meta rename to Assets/Scripts/OutlineToggle.cs.meta diff --git a/Assets/RotateCube.cs b/Assets/Scripts/RotateCube.cs similarity index 100% rename from Assets/RotateCube.cs rename to Assets/Scripts/RotateCube.cs diff --git a/Assets/RotateCube.cs.meta b/Assets/Scripts/RotateCube.cs.meta similarity index 100% rename from Assets/RotateCube.cs.meta rename to Assets/Scripts/RotateCube.cs.meta diff --git a/Assets/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs similarity index 100% rename from Assets/SetVoxelProperties.cs rename to Assets/Scripts/SetVoxelProperties.cs diff --git a/Assets/SetVoxelProperties.cs.meta b/Assets/Scripts/SetVoxelProperties.cs.meta similarity index 100% rename from Assets/SetVoxelProperties.cs.meta rename to Assets/Scripts/SetVoxelProperties.cs.meta diff --git a/Assets/ShowCorrectNumber.cs b/Assets/Scripts/ShowCorrectNumber.cs similarity index 100% rename from Assets/ShowCorrectNumber.cs rename to Assets/Scripts/ShowCorrectNumber.cs diff --git a/Assets/ShowCorrectNumber.cs.meta b/Assets/Scripts/ShowCorrectNumber.cs.meta similarity index 100% rename from Assets/ShowCorrectNumber.cs.meta rename to Assets/Scripts/ShowCorrectNumber.cs.meta diff --git a/Assets/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs similarity index 100% rename from Assets/VoxelMover.cs rename to Assets/Scripts/VoxelMover.cs diff --git a/Assets/VoxelMover.cs.meta b/Assets/Scripts/VoxelMover.cs.meta similarity index 100% rename from Assets/VoxelMover.cs.meta rename to Assets/Scripts/VoxelMover.cs.meta diff --git a/Assets/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs similarity index 100% rename from Assets/VoxelSpawner.cs rename to Assets/Scripts/VoxelSpawner.cs diff --git a/Assets/VoxelSpawner.cs.meta b/Assets/Scripts/VoxelSpawner.cs.meta similarity index 100% rename from Assets/VoxelSpawner.cs.meta rename to Assets/Scripts/VoxelSpawner.cs.meta diff --git a/Assets/Shaders.meta b/Assets/Shaders.meta new file mode 100644 index 0000000..881c17a --- /dev/null +++ b/Assets/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50b04d7e31fb36b42bd35720cc6e54ec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3DText.shader b/Assets/Shaders/3DText.shader similarity index 100% rename from Assets/3DText.shader rename to Assets/Shaders/3DText.shader diff --git a/Assets/3DText.shader.meta b/Assets/Shaders/3DText.shader.meta similarity index 100% rename from Assets/3DText.shader.meta rename to Assets/Shaders/3DText.shader.meta diff --git a/Assets/UltimateOutline.shader b/Assets/Shaders/UltimateOutline.shader similarity index 100% rename from Assets/UltimateOutline.shader rename to Assets/Shaders/UltimateOutline.shader diff --git a/Assets/UltimateOutline.shader.meta b/Assets/Shaders/UltimateOutline.shader.meta similarity index 100% rename from Assets/UltimateOutline.shader.meta rename to Assets/Shaders/UltimateOutline.shader.meta diff --git a/Assets/UniformOutline.shader b/Assets/Shaders/UniformOutline.shader similarity index 100% rename from Assets/UniformOutline.shader rename to Assets/Shaders/UniformOutline.shader diff --git a/Assets/UniformOutline.shader.meta b/Assets/Shaders/UniformOutline.shader.meta similarity index 100% rename from Assets/UniformOutline.shader.meta rename to Assets/Shaders/UniformOutline.shader.meta diff --git a/Assets/VoxelShader.shader b/Assets/Shaders/VoxelShader.shader similarity index 100% rename from Assets/VoxelShader.shader rename to Assets/Shaders/VoxelShader.shader diff --git a/Assets/VoxelShader.shader.meta b/Assets/Shaders/VoxelShader.shader.meta similarity index 100% rename from Assets/VoxelShader.shader.meta rename to Assets/Shaders/VoxelShader.shader.meta From e57e8466a5290e071e8967e82573f34b2e5817d8 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:11:51 +0100 Subject: [PATCH 03/13] Cleaned up properties of SetVoxelProperties --- Assets/Scripts/NumberToggle.cs | 12 ++--- Assets/Scripts/SetVoxelProperties.cs | 81 +++++++++++++++------------- Assets/Scripts/ShowCorrectNumber.cs | 2 +- Assets/Scripts/VoxelMover.cs | 12 ++--- 4 files changed, 56 insertions(+), 51 deletions(-) diff --git a/Assets/Scripts/NumberToggle.cs b/Assets/Scripts/NumberToggle.cs index 9b7cfcf..cfe95b5 100644 --- a/Assets/Scripts/NumberToggle.cs +++ b/Assets/Scripts/NumberToggle.cs @@ -14,20 +14,20 @@ public void ToggleNumbers() if (numberEnabled) { SetVoxelProperties[] voxels = FindObjectsOfType(); - new List(voxels).ForEach((v) => + new List(voxels).ForEach((System.Action)((v) => { - v.showNumber = true; + v.ShowNumber = true; v.Redraw(); - }); + })); } else { SetVoxelProperties[] voxels = FindObjectsOfType(); - new List(voxels).ForEach((v) => + new List(voxels).ForEach((System.Action)((v) => { - v.showNumber = false; + v.ShowNumber = false; v.Redraw(); - }); + })); } } diff --git a/Assets/Scripts/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs index 9ba8793..2fae588 100644 --- a/Assets/Scripts/SetVoxelProperties.cs +++ b/Assets/Scripts/SetVoxelProperties.cs @@ -1,86 +1,91 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Serialization; public class SetVoxelProperties : MonoBehaviour { - VoxelSpawner cube; - MaterialPropertyBlock propBlock; - Renderer renderer; - public Color color = Color.black; - public int number = 1; - public bool transparent = false; - float colorBrightness = 0.1f; - public bool showNumber = true; + private VoxelSpawner _cube; + private MaterialPropertyBlock _propBlock; + private Renderer _renderer; + private Color color = Color.black; + [SerializeField, FormerlySerializedAs("colorBrightness")] + private float _colorBrightness = 0.1f; + [HideInInspector] + public int Number = 1; + [HideInInspector] + public bool Transparent = false; + [HideInInspector] + public bool ShowNumber = true; void Awake() { - showNumber = FindObjectOfType().numberEnabled; - cube = FindObjectOfType(); - renderer = GetComponent(); - propBlock = new MaterialPropertyBlock(); + ShowNumber = FindObjectOfType().numberEnabled; + _cube = FindObjectOfType(); + _renderer = GetComponent(); + _propBlock = new MaterialPropertyBlock(); } public void SetColor(Color newColor) { color = newColor; - propBlock.SetColor("_Color", color); - propBlock.SetColor("_EmissionColor", NumberToColor(number)); - propBlock.SetTexture("_MainTex", Resources.Load(number.ToString())); - renderer.SetPropertyBlock(propBlock); + _propBlock.SetColor("_Color", color); + _propBlock.SetColor("_EmissionColor", NumberToColor(Number)); + _propBlock.SetTexture("_MainTex", Resources.Load(Number.ToString())); + _renderer.SetPropertyBlock(_propBlock); } public void SetNumber(int newNumber, bool doRedraw) { - number = newNumber; + Number = newNumber; if (doRedraw) { - propBlock.SetColor("_Color", NumberToColor(newNumber)); - propBlock.SetColor("_EmissionColor", NumberToColor(newNumber)); - propBlock.SetColor("_FirstOutlineColor", OutlineColor()); - if (showNumber) + _propBlock.SetColor("_Color", NumberToColor(newNumber)); + _propBlock.SetColor("_EmissionColor", NumberToColor(newNumber)); + _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); + if (ShowNumber) { - propBlock.SetTexture("_MainTex", Resources.Load(number.ToString())); + _propBlock.SetTexture("_MainTex", Resources.Load(Number.ToString())); } else { - propBlock.SetTexture("_MainTex", Resources.Load("blank")); + _propBlock.SetTexture("_MainTex", Resources.Load("blank")); } - renderer.SetPropertyBlock(propBlock); + _renderer.SetPropertyBlock(_propBlock); } } - public void ShowNumber(int displayNumber) + public void DisplayNumber(int displayNumber) { - propBlock.SetColor("_Color", NumberToColor(number)); - propBlock.SetColor("_EmissionColor", NumberToColor(number)); - propBlock.SetColor("_FirstOutlineColor", OutlineColor()); - propBlock.SetTexture("_MainTex", Resources.Load(displayNumber.ToString())); - renderer.SetPropertyBlock(propBlock); + _propBlock.SetColor("_Color", NumberToColor(Number)); + _propBlock.SetColor("_EmissionColor", NumberToColor(Number)); + _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); + _propBlock.SetTexture("_MainTex", Resources.Load(displayNumber.ToString())); + _renderer.SetPropertyBlock(_propBlock); } public void Redraw() { - SetNumber(number, true); + SetNumber(Number, true); } Color NumberToColor(int num) { int numVoxel = 0; - for (float xi = 0; xi < cube.cubeSize; xi++) + for (float xi = 0; xi < _cube.cubeSize; xi++) { - for (float yi = 0; yi < cube.cubeSize; yi++) + for (float yi = 0; yi < _cube.cubeSize; yi++) { - for (float zi = 0; zi < cube.cubeSize; zi++) + for (float zi = 0; zi < _cube.cubeSize; zi++) { numVoxel += 1; if (num == numVoxel) { - if (!transparent) + if (!Transparent) { - return new Color(xi / cube.cubeSize + colorBrightness, yi / cube.cubeSize + colorBrightness, zi / cube.cubeSize + colorBrightness, 1f); + return new Color(xi / _cube.cubeSize + _colorBrightness, yi / _cube.cubeSize + _colorBrightness, zi / _cube.cubeSize + _colorBrightness, 1f); } else { - return new Color(xi / cube.cubeSize + colorBrightness, yi / cube.cubeSize + colorBrightness, zi / cube.cubeSize + colorBrightness, 0.025f); + return new Color(xi / _cube.cubeSize + _colorBrightness, yi / _cube.cubeSize + _colorBrightness, zi / _cube.cubeSize + _colorBrightness, 0.025f); } } } @@ -91,7 +96,7 @@ Color NumberToColor(int num) Color OutlineColor() { - if (transparent) + if (Transparent) { return new Color(0, 0, 0, 0); } else diff --git a/Assets/Scripts/ShowCorrectNumber.cs b/Assets/Scripts/ShowCorrectNumber.cs index 2a90be6..c6e94f4 100644 --- a/Assets/Scripts/ShowCorrectNumber.cs +++ b/Assets/Scripts/ShowCorrectNumber.cs @@ -17,7 +17,7 @@ void Update () { if ((Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2)) || (Input.GetMouseButtonDown(2) && !Input.GetKey(KeyCode.E)) && !showingNumber) { showingNumber = true; - GetComponent().ShowNumber(correctNumber); + GetComponent().DisplayNumber(correctNumber); } if (Input.GetKeyUp(KeyCode.E) || Input.GetMouseButtonUp(2)) { diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index 7e5c536..eb300f3 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -141,7 +141,7 @@ void Update () { { for (int zi = 0; zi < cubeSize; zi++) { - if (vs.voxelArray[xi, yi, zi].number != vs.correctNumberArray[xi, yi, zi]) + if (vs.voxelArray[xi, yi, zi].Number != vs.correctNumberArray[xi, yi, zi]) { stopTimer = false; } @@ -244,7 +244,7 @@ public void CutForward(Vector3 dir) continue; } - if (beforeVoxel.transparent) + if (beforeVoxel.Transparent) { objectsToDeactivate.Add(vs.voxelArray[xi, yi, zi]); } @@ -254,7 +254,7 @@ public void CutForward(Vector3 dir) objectsToDeactivate.ForEach((Obj) => { Obj.transform.parent.GetComponent().enabled = false; - Obj.transparent = true; + Obj.Transparent = true; Obj.Redraw(); }); @@ -285,7 +285,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) continue; } - if (!beforeVoxel.transparent) + if (!beforeVoxel.Transparent) { objectsToActivate.Add(vs.voxelArray[xi, yi, zi]); } @@ -295,7 +295,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) objectsToActivate.ForEach((Obj) => { Obj.transform.parent.GetComponent().enabled = true; - Obj.transparent = false; + Obj.Transparent = false; Obj.Redraw(); }); @@ -327,7 +327,7 @@ void PushRow(Vector3 touched, Vector3 dir, bool fancy) for (int i = 0; i < cubeSize; i++) { Vector3 pos = (touched + (dir * i)); - tempNumArray.Add(vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].number); + tempNumArray.Add(vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].Number); //Debug.Log(tempNumArray[tempNumArray.Count - 1]); } for (int i = 0; i < cubeSize; i++) From 6e7b0a3bafee108e9665f0e3c69b447f805ace87 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:14:43 +0100 Subject: [PATCH 04/13] More cleanup --- Assets/Scripts/AlwaysFaceTowardsCamera.cs | 6 +----- Assets/Scripts/ChangeColorOnHover.cs | 20 +++++++++----------- Assets/Scripts/CutOnClick.cs | 19 +++++++++---------- Assets/Scripts/DisableTextOnInvisible.cs | 4 +--- Assets/Scripts/LerpToPos.cs | 4 +--- Assets/Scripts/NumberToggle.cs | 4 +--- Assets/Scripts/OutlineToggle.cs | 5 +---- Assets/Scripts/RotateCube.cs | 4 +--- Assets/Scripts/SetVoxelProperties.cs | 4 +--- Assets/Scripts/ShowCorrectNumber.cs | 4 +--- Assets/Scripts/VoxelMover.cs | 4 +--- Assets/Scripts/VoxelSpawner.cs | 3 +-- 12 files changed, 28 insertions(+), 53 deletions(-) diff --git a/Assets/Scripts/AlwaysFaceTowardsCamera.cs b/Assets/Scripts/AlwaysFaceTowardsCamera.cs index 4c1a9d6..5cb5ec4 100644 --- a/Assets/Scripts/AlwaysFaceTowardsCamera.cs +++ b/Assets/Scripts/AlwaysFaceTowardsCamera.cs @@ -1,11 +1,7 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; [ExecuteInEditMode] public class AlwaysFaceTowardsCamera : MonoBehaviour { - - void Update () { transform.LookAt(Camera.main.transform, Vector3.up); } diff --git a/Assets/Scripts/ChangeColorOnHover.cs b/Assets/Scripts/ChangeColorOnHover.cs index 6651513..0f6ad9b 100644 --- a/Assets/Scripts/ChangeColorOnHover.cs +++ b/Assets/Scripts/ChangeColorOnHover.cs @@ -1,17 +1,15 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; public class ChangeColorOnHover : MonoBehaviour { - Color startColor; - public Color toColor; - Color lerpToColor; + private Color _startColor; + public Color ToColor; + private Color _lerpToColor; // Use this for initialization void Start () { GetComponent().material = new Material(GetComponent().material); - startColor = GetComponent().material.GetColor("_Color"); + _startColor = GetComponent().material.GetColor("_Color"); } // Update is called once per frame @@ -23,17 +21,17 @@ void Update () { { if (hit.transform.gameObject.GetInstanceID() == gameObject.GetInstanceID()) { - lerpToColor = toColor; + _lerpToColor = ToColor; } else { - lerpToColor = startColor; + _lerpToColor = _startColor; } } else { - lerpToColor = startColor; + _lerpToColor = _startColor; } - GetComponent().material.SetColor("_Color", Color.Lerp(GetComponent().material.color, lerpToColor, Time.deltaTime * 15)); + GetComponent().material.SetColor("_Color", Color.Lerp(GetComponent().material.color, _lerpToColor, Time.deltaTime * 15)); } } diff --git a/Assets/Scripts/CutOnClick.cs b/Assets/Scripts/CutOnClick.cs index a74998b..fd4819a 100644 --- a/Assets/Scripts/CutOnClick.cs +++ b/Assets/Scripts/CutOnClick.cs @@ -1,15 +1,14 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; +using UnityEngine.Serialization; public class CutOnClick : MonoBehaviour { - - public VoxelMover cube; - public bool forward = true; + private VoxelMover _cube; + [SerializeField, FormerlySerializedAs("forward")] + private bool _forward = true; void Start() { - cube = FindObjectOfType(); + _cube = FindObjectOfType(); } void Update() @@ -21,7 +20,7 @@ void Update() { if (hit.transform.gameObject.GetInstanceID() == gameObject.GetInstanceID() && Input.GetMouseButtonDown(0)) { - if (forward) + if (_forward) { GameObject[] nodules = GameObject.FindGameObjectsWithTag("Nodule"); for (int n = 0; n < nodules.Length; n++) @@ -32,10 +31,10 @@ void Update() } } - cube.CutForward(cube.transform.InverseTransformDirection(transform.forward)); + _cube.CutForward(_cube.transform.InverseTransformDirection(transform.forward)); } else { - cube.CutBackward(cube.transform.InverseTransformDirection(-transform.forward), true); + _cube.CutBackward(_cube.transform.InverseTransformDirection(-transform.forward), true); } } } diff --git a/Assets/Scripts/DisableTextOnInvisible.cs b/Assets/Scripts/DisableTextOnInvisible.cs index e8d5de4..b9f409b 100644 --- a/Assets/Scripts/DisableTextOnInvisible.cs +++ b/Assets/Scripts/DisableTextOnInvisible.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; public class DisableTextOnInvisible : MonoBehaviour { diff --git a/Assets/Scripts/LerpToPos.cs b/Assets/Scripts/LerpToPos.cs index 43ef643..7a22092 100644 --- a/Assets/Scripts/LerpToPos.cs +++ b/Assets/Scripts/LerpToPos.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; public class LerpToPos : MonoBehaviour { diff --git a/Assets/Scripts/NumberToggle.cs b/Assets/Scripts/NumberToggle.cs index cfe95b5..9486a83 100644 --- a/Assets/Scripts/NumberToggle.cs +++ b/Assets/Scripts/NumberToggle.cs @@ -1,7 +1,5 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; -using UnityEngine.UI; public class NumberToggle : MonoBehaviour { diff --git a/Assets/Scripts/OutlineToggle.cs b/Assets/Scripts/OutlineToggle.cs index b3d84fc..9fa715a 100644 --- a/Assets/Scripts/OutlineToggle.cs +++ b/Assets/Scripts/OutlineToggle.cs @@ -1,7 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; +using UnityEngine; public class OutlineToggle : MonoBehaviour { diff --git a/Assets/Scripts/RotateCube.cs b/Assets/Scripts/RotateCube.cs index b9629ae..faaf2bb 100644 --- a/Assets/Scripts/RotateCube.cs +++ b/Assets/Scripts/RotateCube.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; public class RotateCube : MonoBehaviour { diff --git a/Assets/Scripts/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs index 2fae588..a6251fc 100644 --- a/Assets/Scripts/SetVoxelProperties.cs +++ b/Assets/Scripts/SetVoxelProperties.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.Serialization; public class SetVoxelProperties : MonoBehaviour { diff --git a/Assets/Scripts/ShowCorrectNumber.cs b/Assets/Scripts/ShowCorrectNumber.cs index c6e94f4..c215a74 100644 --- a/Assets/Scripts/ShowCorrectNumber.cs +++ b/Assets/Scripts/ShowCorrectNumber.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; public class ShowCorrectNumber : MonoBehaviour { diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index eb300f3..138f1b3 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -1,8 +1,6 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using System; public class VoxelMover : MonoBehaviour { diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index 0e1f5be..d8fd17f 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -1,5 +1,4 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; From 008811bd71ad6b1bb08cd1402e5d561f74247bca Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:19:18 +0100 Subject: [PATCH 05/13] More more cleanup --- Assets/Scripts/DisableTextOnInvisible.cs | 7 +++---- Assets/Scripts/LerpToPos.cs | 24 +++++++++++------------- Assets/Scripts/NumberToggle.cs | 7 +++---- Assets/Scripts/OutlineToggle.cs | 6 +++--- Assets/Scripts/RotateCube.cs | 18 ++++++++---------- Assets/Scripts/SetVoxelProperties.cs | 2 +- Assets/Scripts/ShowCorrectNumber.cs | 17 ++++++++--------- Assets/Scripts/VoxelSpawner.cs | 2 +- 8 files changed, 38 insertions(+), 45 deletions(-) diff --git a/Assets/Scripts/DisableTextOnInvisible.cs b/Assets/Scripts/DisableTextOnInvisible.cs index b9f409b..91d7083 100644 --- a/Assets/Scripts/DisableTextOnInvisible.cs +++ b/Assets/Scripts/DisableTextOnInvisible.cs @@ -1,17 +1,16 @@ using UnityEngine; public class DisableTextOnInvisible : MonoBehaviour { - - VoxelSpawner cube; + private VoxelSpawner _cube; void Start() { - cube = FindObjectOfType(); + _cube = FindObjectOfType(); } void Update () { - Vector3 realPos = transform.parent.parent.localPosition - new Vector3(-(cube.cubeSize / 2f) + 0.5f, -(cube.cubeSize / 2f) + 0.5f, -(cube.cubeSize / 2f) + 0.5f); + Vector3 realPos = transform.parent.parent.localPosition - new Vector3(-(_cube.cubeSize / 2f) + 0.5f, -(_cube.cubeSize / 2f) + 0.5f, -(_cube.cubeSize / 2f) + 0.5f); if (realPos.x * realPos.y * realPos.z == 0) { GetComponent().enabled = true; diff --git a/Assets/Scripts/LerpToPos.cs b/Assets/Scripts/LerpToPos.cs index 7a22092..c2922bf 100644 --- a/Assets/Scripts/LerpToPos.cs +++ b/Assets/Scripts/LerpToPos.cs @@ -1,29 +1,27 @@ using UnityEngine; public class LerpToPos : MonoBehaviour { - - bool lerping = false; - Vector3 newPos; - float lerpSpeed; + private bool _lerping = false; + private Vector3 _newPos; + private float _lerpSpeed; void Update() { - if (lerping) + if (_lerping) { - transform.localPosition = Vector3.Lerp(transform.localPosition, newPos, Time.deltaTime * lerpSpeed); + transform.localPosition = Vector3.Lerp(transform.localPosition, _newPos, Time.deltaTime * _lerpSpeed); } - if (Mathf.Abs(transform.localPosition.magnitude - newPos.magnitude) < 0.1f) + if (Mathf.Abs(transform.localPosition.magnitude - _newPos.magnitude) < 0.1f) { - lerping = false; - transform.localPosition = newPos; + _lerping = false; + transform.localPosition = _newPos; } } public void MoveToPos(Vector3 pos, float speed) { - lerpSpeed = speed; - newPos = pos; - lerping = true; + _lerpSpeed = speed; + _newPos = pos; + _lerping = true; } - } diff --git a/Assets/Scripts/NumberToggle.cs b/Assets/Scripts/NumberToggle.cs index 9486a83..10842ee 100644 --- a/Assets/Scripts/NumberToggle.cs +++ b/Assets/Scripts/NumberToggle.cs @@ -3,13 +3,12 @@ public class NumberToggle : MonoBehaviour { - - public bool numberEnabled = true; + public bool NumberEnabled = true; public void ToggleNumbers() { - numberEnabled = !numberEnabled; - if (numberEnabled) + NumberEnabled = !NumberEnabled; + if (NumberEnabled) { SetVoxelProperties[] voxels = FindObjectsOfType(); new List(voxels).ForEach((System.Action)((v) => diff --git a/Assets/Scripts/OutlineToggle.cs b/Assets/Scripts/OutlineToggle.cs index 9fa715a..f5a67b0 100644 --- a/Assets/Scripts/OutlineToggle.cs +++ b/Assets/Scripts/OutlineToggle.cs @@ -2,12 +2,12 @@ public class OutlineToggle : MonoBehaviour { - bool outlineEnabled = true; + private bool _outlineEnabled = true; public void ToggleOutlines() { - outlineEnabled = !outlineEnabled; - if (outlineEnabled) + _outlineEnabled = !_outlineEnabled; + if (_outlineEnabled) { FindObjectOfType().GetComponent().sharedMaterial.SetFloat("_FirstOutlineWidth", 0.02f); } else diff --git a/Assets/Scripts/RotateCube.cs b/Assets/Scripts/RotateCube.cs index faaf2bb..568733e 100644 --- a/Assets/Scripts/RotateCube.cs +++ b/Assets/Scripts/RotateCube.cs @@ -1,13 +1,11 @@ using UnityEngine; +using UnityEngine.Serialization; public class RotateCube : MonoBehaviour { - - void Start () { - - } - - public float mouseSensitivity = 1f; - public float scrollWheelSensitivity = 1f; + [SerializeField, FormerlySerializedAs("mouseSensitivity")] + private float _mouseSensitivity = 1f; + [SerializeField, FormerlySerializedAs("scrollWheelSensitivity")] + private float _scrollWheelSensitivity = 1f; Vector3 lastPos = Vector3.zero; @@ -19,12 +17,12 @@ void Update () { if (Input.GetMouseButton(1)) { Vector3 mouseOffset = Input.mousePosition - lastPos; - transform.RotateAround(Vector3.zero, Vector3.right, mouseOffset.y * mouseSensitivity); - transform.RotateAround(Vector3.zero, Vector3.up, -mouseOffset.x * mouseSensitivity); + transform.RotateAround(Vector3.zero, Vector3.right, mouseOffset.y * _mouseSensitivity); + transform.RotateAround(Vector3.zero, Vector3.up, -mouseOffset.x * _mouseSensitivity); } if (Input.GetAxis("Mouse ScrollWheel") != 0) { - transform.RotateAround(Vector3.zero, Vector3.forward, Input.GetAxis("Mouse ScrollWheel") * scrollWheelSensitivity); + transform.RotateAround(Vector3.zero, Vector3.forward, Input.GetAxis("Mouse ScrollWheel") * _scrollWheelSensitivity); } lastPos = Input.mousePosition; } diff --git a/Assets/Scripts/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs index a6251fc..66918da 100644 --- a/Assets/Scripts/SetVoxelProperties.cs +++ b/Assets/Scripts/SetVoxelProperties.cs @@ -18,7 +18,7 @@ public class SetVoxelProperties : MonoBehaviour { void Awake() { - ShowNumber = FindObjectOfType().numberEnabled; + ShowNumber = FindObjectOfType().NumberEnabled; _cube = FindObjectOfType(); _renderer = GetComponent(); _propBlock = new MaterialPropertyBlock(); diff --git a/Assets/Scripts/ShowCorrectNumber.cs b/Assets/Scripts/ShowCorrectNumber.cs index c215a74..9254279 100644 --- a/Assets/Scripts/ShowCorrectNumber.cs +++ b/Assets/Scripts/ShowCorrectNumber.cs @@ -1,25 +1,24 @@ using UnityEngine; public class ShowCorrectNumber : MonoBehaviour { - - VoxelSpawner cube; - public int correctNumber; - bool showingNumber = false; + private VoxelSpawner _cube; + public int CorrectNumber; + private bool _showingNumber = false; void Start() { - cube = FindObjectOfType(); + _cube = FindObjectOfType(); } void Update () { - if ((Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2)) || (Input.GetMouseButtonDown(2) && !Input.GetKey(KeyCode.E)) && !showingNumber) + if ((Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2)) || (Input.GetMouseButtonDown(2) && !Input.GetKey(KeyCode.E)) && !_showingNumber) { - showingNumber = true; - GetComponent().DisplayNumber(correctNumber); + _showingNumber = true; + GetComponent().DisplayNumber(CorrectNumber); } if (Input.GetKeyUp(KeyCode.E) || Input.GetMouseButtonUp(2)) { - showingNumber = false; + _showingNumber = false; GetComponent().Redraw(); } } diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index d8fd17f..bc93b00 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -47,7 +47,7 @@ void Start () if (numVoxel <= 999) { tempVoxel.GetComponentInChildren().SetNumber(numVoxel, true); - tempVoxel.GetComponentInChildren().correctNumber = numVoxel; + tempVoxel.GetComponentInChildren().CorrectNumber = numVoxel; } //tempVoxel.GetComponentInChildren().SetColor(new Color(xi / cubeSize + 0.1f, yi / cubeSize + 0.1f, zi / cubeSize + 0.1f, 1f)); //renderer.material = new Material(renderer.material); From c92913691792f9954a1503f28de46be0d06a0226 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:27:13 +0100 Subject: [PATCH 06/13] Cleanup --- Assets/Scripts/VoxelMover.cs | 175 +++++++++++++++++---------------- Assets/Scripts/VoxelSpawner.cs | 2 +- 2 files changed, 90 insertions(+), 87 deletions(-) diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index 138f1b3..b8b84cb 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -1,29 +1,32 @@ using System.Collections.Generic; using UnityEngine; +using UnityEngine.Serialization; using UnityEngine.UI; public class VoxelMover : MonoBehaviour { - - public GameObject VoxelHighlighter; + [SerializeField, FormerlySerializedAs("VoxelHighlighter")] + private GameObject _voxelHighlighter = default(GameObject); public Text timeDisplay; public Text movesDisplay; public Text MPSDisplay; - public Text timerButtonText; - float cubeSize; + [SerializeField, FormerlySerializedAs("timerButtonText")] + private Text _timerButtonText = default(Text); + private float _cubeSize; - public Toggle sliceToggle; - bool alternateSliceDir = false; + [SerializeField, FormerlySerializedAs("sliceToggle")] + private Toggle _sliceToggle = default(Toggle); + private bool _alternateSliceDir = false; - Vector3 newPos; - Vector3 newNorm; - Vector3 highlightedVoxel; + private Vector3 _newPos; + private Vector3 _newNorm; + private Vector3 _highlightedVoxel; - bool doTiming = false; - float startTime = 0; - int moves = 0; + private bool _doTiming = false; + private float _startTime = 0; + private int _moves = 0; - public int amountCut = 0; - Vector3 currentCutDir = Vector3.zero; + public int AmountCut = 0; + private Vector3 _currentCutDir = Vector3.zero; VoxelSpawner vs; Vector3[] directionArray = new[] @@ -44,11 +47,11 @@ void Start() } void Update () { - if (doTiming) + if (_doTiming) { - timeDisplay.text = "Time: " + (Time.time - startTime).ToString(); - movesDisplay.text = "Moves: " + (moves).ToString(); - MPSDisplay.text = "MPS: " + (moves/ (Time.time - startTime)).ToString(); + timeDisplay.text = "Time: " + (Time.time - _startTime).ToString(); + movesDisplay.text = "Moves: " + (_moves).ToString(); + MPSDisplay.text = "MPS: " + (_moves/ (Time.time - _startTime)).ToString(); } RaycastHit hit; @@ -57,27 +60,27 @@ void Update () { if (Physics.Raycast(ray, out hit)) { if (hit.transform.tag == "Voxel") { - newPos = hit.transform.position; - newNorm = hit.normal; - highlightedVoxel = hit.transform.localPosition; - VoxelHighlighter.SetActive(true); + _newPos = hit.transform.position; + _newNorm = hit.normal; + _highlightedVoxel = hit.transform.localPosition; + _voxelHighlighter.SetActive(true); } else { - VoxelHighlighter.SetActive(false); + _voxelHighlighter.SetActive(false); } } else { - VoxelHighlighter.SetActive(false); + _voxelHighlighter.SetActive(false); } if (Input.GetKeyDown(KeyCode.R)) { - alternateSliceDir = !alternateSliceDir; + _alternateSliceDir = !_alternateSliceDir; } - if (VoxelHighlighter.activeSelf && Input.GetMouseButtonDown(0)) + if (_voxelHighlighter.activeSelf && Input.GetMouseButtonDown(0)) { - cubeSize = vs.cubeSize; + _cubeSize = vs.cubeSize; for (int c = 0; c < transform.childCount; c++) { if (transform.GetChild(c).tag == "Moved") @@ -87,17 +90,17 @@ void Update () { } } - if (doTiming == false) + if (_doTiming == false) { - base64MoveEncode = Base64Encode((int)cubeSize); - timerButtonText.text = "Stop Timer"; - startTime = Time.time; - doTiming = true; - moves = 0; + base64MoveEncode = Base64Encode((int)_cubeSize); + _timerButtonText.text = "Stop Timer"; + _startTime = Time.time; + _doTiming = true; + _moves = 0; } - Vector3 localNorm = transform.InverseTransformDirection(newNorm); - moves += 1; + Vector3 localNorm = transform.InverseTransformDirection(_newNorm); + _moves += 1; bool tempReturn = true; for (int d = 0; d < directionArray.Length; d++) @@ -113,16 +116,16 @@ void Update () { return; } - if (!sliceToggle.isOn) + if (!_sliceToggle.isOn) { - PushRow(highlightedVoxel, -localNorm, true); + PushRow(_highlightedVoxel, -localNorm, true); } else { - PushSlice(highlightedVoxel, -localNorm); + PushSlice(_highlightedVoxel, -localNorm); } //Base64MoveEncoder - base64MoveEncode += Base64Encode((int)highlightedVoxel.x) + Base64Encode((int)highlightedVoxel.y) + Base64Encode((int)highlightedVoxel.z); + base64MoveEncode += Base64Encode((int)_highlightedVoxel.x) + Base64Encode((int)_highlightedVoxel.y) + Base64Encode((int)_highlightedVoxel.z); for (int i = 0; i < directionArray.Length; i++) { if (directionArray[i] == -localNorm) @@ -133,11 +136,11 @@ void Update () { bool stopTimer = true; - for (int xi = 0; xi < cubeSize; xi++) + for (int xi = 0; xi < _cubeSize; xi++) { - for (int yi = 0; yi < cubeSize; yi++) + for (int yi = 0; yi < _cubeSize; yi++) { - for (int zi = 0; zi < cubeSize; zi++) + for (int zi = 0; zi < _cubeSize; zi++) { if (vs.voxelArray[xi, yi, zi].Number != vs.correctNumberArray[xi, yi, zi]) { @@ -149,21 +152,21 @@ void Update () { if (stopTimer) { Restart(); - timerButtonText.text = "Cube Solved!"; + _timerButtonText.text = "Cube Solved!"; } } //Hardcoded values uwu - if (!sliceToggle.isOn) + if (!_sliceToggle.isOn) { - VoxelHighlighter.transform.position = Vector3.Lerp(VoxelHighlighter.transform.position, newPos, Time.deltaTime * 30); - VoxelHighlighter.transform.up = Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50); + _voxelHighlighter.transform.position = Vector3.Lerp(_voxelHighlighter.transform.position, _newPos, Time.deltaTime * 30); + _voxelHighlighter.transform.up = Vector3.Lerp(_voxelHighlighter.transform.up, _newNorm, Time.deltaTime * 50); } else { - VoxelHighlighter.transform.position = Vector3.Lerp(VoxelHighlighter.transform.position, newPos, Time.deltaTime * 30); + _voxelHighlighter.transform.position = Vector3.Lerp(_voxelHighlighter.transform.position, _newPos, Time.deltaTime * 30); //VoxelHighlighter.transform.up = Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50); - Vector3 localNorm = transform.InverseTransformDirection(newNorm); + Vector3 localNorm = transform.InverseTransformDirection(_newNorm); Vector3 highlightUp = Vector3.zero; Vector3 highlightRight = Vector3.zero; if (Mathf.RoundToInt(vec3Abs(localNorm).x) == 1) @@ -182,16 +185,16 @@ void Update () { highlightRight = new Vector3(1, 0, 0); } - if (!alternateSliceDir) + if (!_alternateSliceDir) { - VoxelHighlighter.transform.rotation = Quaternion.LookRotation( - Vector3.Lerp(VoxelHighlighter.transform.forward, transform.TransformDirection(highlightRight), Time.deltaTime * 50), - Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50)); + _voxelHighlighter.transform.rotation = Quaternion.LookRotation( + Vector3.Lerp(_voxelHighlighter.transform.forward, transform.TransformDirection(highlightRight), Time.deltaTime * 50), + Vector3.Lerp(_voxelHighlighter.transform.up, _newNorm, Time.deltaTime * 50)); } else { - VoxelHighlighter.transform.rotation = Quaternion.LookRotation( - Vector3.Lerp(VoxelHighlighter.transform.forward, transform.TransformDirection(highlightUp), Time.deltaTime * 50), - Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50)); + _voxelHighlighter.transform.rotation = Quaternion.LookRotation( + Vector3.Lerp(_voxelHighlighter.transform.forward, transform.TransformDirection(highlightUp), Time.deltaTime * 50), + Vector3.Lerp(_voxelHighlighter.transform.up, _newNorm, Time.deltaTime * 50)); } } @@ -199,37 +202,37 @@ void Update () { public void Restart() { - doTiming = false; - moves = 0; - timerButtonText.text = "Timer Stopped"; + _doTiming = false; + _moves = 0; + _timerButtonText.text = "Timer Stopped"; } public void ToggleSliceMarkers() { - if (sliceToggle.isOn) + if (_sliceToggle.isOn) { - VoxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(true); + _voxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(true); } else { - VoxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(false); + _voxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(false); } } public void CutForward(Vector3 dir) { - currentCutDir = dir; - cubeSize = vs.cubeSize; - if (amountCut == ((int)cubeSize - 1)) + _currentCutDir = dir; + _cubeSize = vs.cubeSize; + if (AmountCut == ((int)_cubeSize - 1)) { return; } List objectsToDeactivate = new List(); - for (int xi = 0; xi < cubeSize; xi++) + for (int xi = 0; xi < _cubeSize; xi++) { - for (int yi = 0; yi < cubeSize; yi++) + for (int yi = 0; yi < _cubeSize; yi++) { - for (int zi = 0; zi < cubeSize; zi++) + for (int zi = 0; zi < _cubeSize; zi++) { SetVoxelProperties beforeVoxel = null; try @@ -256,23 +259,23 @@ public void CutForward(Vector3 dir) Obj.Redraw(); }); - amountCut += 1; + AmountCut += 1; } public void CutBackward(Vector3 dir, bool resetNodulesOnZero) { - if (amountCut == 0) + if (AmountCut == 0) { return; } List objectsToActivate = new List(); - for (int xi = 0; xi < cubeSize; xi++) + for (int xi = 0; xi < _cubeSize; xi++) { - for (int yi = 0; yi < cubeSize; yi++) + for (int yi = 0; yi < _cubeSize; yi++) { - for (int zi = 0; zi < cubeSize; zi++) + for (int zi = 0; zi < _cubeSize; zi++) { SetVoxelProperties beforeVoxel = null; try @@ -297,9 +300,9 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) Obj.Redraw(); }); - amountCut -= 1; + AmountCut -= 1; - if (amountCut == 0 && resetNodulesOnZero) + if (AmountCut == 0 && resetNodulesOnZero) { GetComponent().nodules.ForEach((n) => { @@ -310,9 +313,9 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) void PushRow(Vector3 touched, Vector3 dir, bool fancy) { - cubeSize = vs.cubeSize; + _cubeSize = vs.cubeSize; - for (int i = 0; i < cubeSize + 1; i++) + for (int i = 0; i < _cubeSize + 1; i++) { if (FindVoxelByPos(touched - (dir * i)) == null) { @@ -322,13 +325,13 @@ void PushRow(Vector3 touched, Vector3 dir, bool fancy) } List tempNumArray = new List(); - for (int i = 0; i < cubeSize; i++) + for (int i = 0; i < _cubeSize; i++) { Vector3 pos = (touched + (dir * i)); tempNumArray.Add(vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].Number); //Debug.Log(tempNumArray[tempNumArray.Count - 1]); } - for (int i = 0; i < cubeSize; i++) + for (int i = 0; i < _cubeSize; i++) { Vector3 pos = (touched + (dir * i)); if (i == 0) @@ -372,7 +375,7 @@ void PushSlice(Vector3 touched, Vector3 dir) Vector3 sliceDir = Vector3.zero; - if (!alternateSliceDir) + if (!_alternateSliceDir) { sliceDir = highlightUp; } @@ -381,20 +384,20 @@ void PushSlice(Vector3 touched, Vector3 dir) sliceDir = highlightRight; } - cubeSize = vs.cubeSize; + _cubeSize = vs.cubeSize; - for (int i = 0; i < cubeSize + 1; i++) + for (int i = 0; i < _cubeSize + 1; i++) { - if (FindVoxelByPos(highlightedVoxel - (sliceDir * i)) == null) + if (FindVoxelByPos(_highlightedVoxel - (sliceDir * i)) == null) { - highlightedVoxel = highlightedVoxel - (sliceDir * (i - 1)); + _highlightedVoxel = _highlightedVoxel - (sliceDir * (i - 1)); break; } } - for (int i = 0; i < cubeSize; i++) + for (int i = 0; i < _cubeSize; i++) { - PushRow(highlightedVoxel + sliceDir * i, dir, true); + PushRow(_highlightedVoxel + sliceDir * i, dir, true); } } @@ -430,7 +433,7 @@ Transform FindVoxelByPos(Vector3 pos) public void Scramble() { - if (amountCut != 0) + if (AmountCut != 0) { return; } diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index bc93b00..66ef744 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -101,7 +101,7 @@ public void ResetCube() Destroy(transform.GetChild(c).gameObject); } } - GetComponent().amountCut = 0; + GetComponent().AmountCut = 0; Start(); } From 1650a152904e6618ead84a1aa4eda8d29a0318d5 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:32:22 +0100 Subject: [PATCH 07/13] Last property cleanup --- Assets/Scripts/DisableTextOnInvisible.cs | 2 +- Assets/Scripts/SetVoxelProperties.cs | 10 ++-- Assets/Scripts/VoxelMover.cs | 30 +++++------ Assets/Scripts/VoxelSpawner.cs | 63 +++++++++++++----------- 4 files changed, 54 insertions(+), 51 deletions(-) diff --git a/Assets/Scripts/DisableTextOnInvisible.cs b/Assets/Scripts/DisableTextOnInvisible.cs index 91d7083..9be3574 100644 --- a/Assets/Scripts/DisableTextOnInvisible.cs +++ b/Assets/Scripts/DisableTextOnInvisible.cs @@ -10,7 +10,7 @@ void Start() void Update () { - Vector3 realPos = transform.parent.parent.localPosition - new Vector3(-(_cube.cubeSize / 2f) + 0.5f, -(_cube.cubeSize / 2f) + 0.5f, -(_cube.cubeSize / 2f) + 0.5f); + Vector3 realPos = transform.parent.parent.localPosition - new Vector3(-(_cube.CubeSize / 2f) + 0.5f, -(_cube.CubeSize / 2f) + 0.5f, -(_cube.CubeSize / 2f) + 0.5f); if (realPos.x * realPos.y * realPos.z == 0) { GetComponent().enabled = true; diff --git a/Assets/Scripts/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs index 66918da..b9f6669 100644 --- a/Assets/Scripts/SetVoxelProperties.cs +++ b/Assets/Scripts/SetVoxelProperties.cs @@ -69,21 +69,21 @@ public void Redraw() Color NumberToColor(int num) { int numVoxel = 0; - for (float xi = 0; xi < _cube.cubeSize; xi++) + for (float xi = 0; xi < _cube.CubeSize; xi++) { - for (float yi = 0; yi < _cube.cubeSize; yi++) + for (float yi = 0; yi < _cube.CubeSize; yi++) { - for (float zi = 0; zi < _cube.cubeSize; zi++) + for (float zi = 0; zi < _cube.CubeSize; zi++) { numVoxel += 1; if (num == numVoxel) { if (!Transparent) { - return new Color(xi / _cube.cubeSize + _colorBrightness, yi / _cube.cubeSize + _colorBrightness, zi / _cube.cubeSize + _colorBrightness, 1f); + return new Color(xi / _cube.CubeSize + _colorBrightness, yi / _cube.CubeSize + _colorBrightness, zi / _cube.CubeSize + _colorBrightness, 1f); } else { - return new Color(xi / _cube.cubeSize + _colorBrightness, yi / _cube.cubeSize + _colorBrightness, zi / _cube.cubeSize + _colorBrightness, 0.025f); + return new Color(xi / _cube.CubeSize + _colorBrightness, yi / _cube.CubeSize + _colorBrightness, zi / _cube.CubeSize + _colorBrightness, 0.025f); } } } diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index b8b84cb..96a717d 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -80,7 +80,7 @@ void Update () { if (_voxelHighlighter.activeSelf && Input.GetMouseButtonDown(0)) { - _cubeSize = vs.cubeSize; + _cubeSize = vs.CubeSize; for (int c = 0; c < transform.childCount; c++) { if (transform.GetChild(c).tag == "Moved") @@ -142,7 +142,7 @@ void Update () { { for (int zi = 0; zi < _cubeSize; zi++) { - if (vs.voxelArray[xi, yi, zi].Number != vs.correctNumberArray[xi, yi, zi]) + if (vs.VoxelArray[xi, yi, zi].Number != vs.CorrectNumberArray[xi, yi, zi]) { stopTimer = false; } @@ -221,7 +221,7 @@ public void ToggleSliceMarkers() public void CutForward(Vector3 dir) { _currentCutDir = dir; - _cubeSize = vs.cubeSize; + _cubeSize = vs.CubeSize; if (AmountCut == ((int)_cubeSize - 1)) { return; @@ -237,17 +237,17 @@ public void CutForward(Vector3 dir) SetVoxelProperties beforeVoxel = null; try { - beforeVoxel = vs.voxelArray[xi - Mathf.RoundToInt(dir.x), yi - Mathf.RoundToInt(dir.y), zi - Mathf.RoundToInt(dir.z)]; + beforeVoxel = vs.VoxelArray[xi - Mathf.RoundToInt(dir.x), yi - Mathf.RoundToInt(dir.y), zi - Mathf.RoundToInt(dir.z)]; } catch { - objectsToDeactivate.Add(vs.voxelArray[xi, yi, zi]); + objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); continue; } if (beforeVoxel.Transparent) { - objectsToDeactivate.Add(vs.voxelArray[xi, yi, zi]); + objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); } } } @@ -280,7 +280,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) SetVoxelProperties beforeVoxel = null; try { - beforeVoxel = vs.voxelArray[xi + Mathf.RoundToInt(dir.x), yi + Mathf.RoundToInt(dir.y), zi + Mathf.RoundToInt(dir.z)]; + beforeVoxel = vs.VoxelArray[xi + Mathf.RoundToInt(dir.x), yi + Mathf.RoundToInt(dir.y), zi + Mathf.RoundToInt(dir.z)]; } catch { continue; @@ -288,7 +288,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) if (!beforeVoxel.Transparent) { - objectsToActivate.Add(vs.voxelArray[xi, yi, zi]); + objectsToActivate.Add(vs.VoxelArray[xi, yi, zi]); } } } @@ -304,7 +304,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) if (AmountCut == 0 && resetNodulesOnZero) { - GetComponent().nodules.ForEach((n) => + GetComponent().Nodules.ForEach((n) => { n.SetActive(true); }); @@ -313,7 +313,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) void PushRow(Vector3 touched, Vector3 dir, bool fancy) { - _cubeSize = vs.cubeSize; + _cubeSize = vs.CubeSize; for (int i = 0; i < _cubeSize + 1; i++) { @@ -328,7 +328,7 @@ void PushRow(Vector3 touched, Vector3 dir, bool fancy) for (int i = 0; i < _cubeSize; i++) { Vector3 pos = (touched + (dir * i)); - tempNumArray.Add(vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].Number); + tempNumArray.Add(vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].Number); //Debug.Log(tempNumArray[tempNumArray.Count - 1]); } for (int i = 0; i < _cubeSize; i++) @@ -336,10 +336,10 @@ void PushRow(Vector3 touched, Vector3 dir, bool fancy) Vector3 pos = (touched + (dir * i)); if (i == 0) { - vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[tempNumArray.Count-1], fancy); + vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[tempNumArray.Count-1], fancy); } else { - vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[i-1], fancy); + vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[i-1], fancy); } } @@ -384,7 +384,7 @@ void PushSlice(Vector3 touched, Vector3 dir) sliceDir = highlightRight; } - _cubeSize = vs.cubeSize; + _cubeSize = vs.CubeSize; for (int i = 0; i < _cubeSize + 1; i++) { @@ -424,7 +424,7 @@ Transform FindVoxelByPos(Vector3 pos) try { - return vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].transform; + return vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].transform; } catch { return null; diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index 66ef744..b8deacf 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -1,47 +1,50 @@ using System.Collections.Generic; using UnityEngine; +using UnityEngine.Serialization; using UnityEngine.UI; public class VoxelSpawner : MonoBehaviour { - public GameObject voxelPrefab; - public GameObject nodulePrefab; - public InputField cubeSizeInput; + [SerializeField, FormerlySerializedAs("voxelPrefab")] + private GameObject _voxelPrefab = null; + [SerializeField, FormerlySerializedAs("nodulePrefab")] + private GameObject _nodulePrefab = null; + [SerializeField, FormerlySerializedAs("cubeSizeInput")] + private InputField _cubeSizeInput = null; - public float noduleOffset = 0.2f; + [SerializeField, FormerlySerializedAs("noduleOffset")] + private float _noduleOffset = 0.2f; //Why is this a float ??? - public float cubeSize; + public float CubeSize; - public List nodules; + public List Nodules; - public Texture2D[] textures; + [SerializeField, FormerlySerializedAs("textures")] + private Texture2D[] _textures; - public SetVoxelProperties[,,] voxelArray; - public int[,,] correctNumberArray; + public SetVoxelProperties[,,] VoxelArray; + public int[,,] CorrectNumberArray { get; private set; } void Start () { - //QualitySettings.vSyncCount = 0; // VSync must be disabled - //Application.targetFrameRate = 20; + CubeSize = int.Parse(_cubeSizeInput.text); - cubeSize = int.Parse(cubeSizeInput.text); - - voxelArray = new SetVoxelProperties[(int)cubeSize, (int)cubeSize, (int)cubeSize]; - correctNumberArray = new int[(int)cubeSize, (int)cubeSize, (int)cubeSize]; + VoxelArray = new SetVoxelProperties[(int)CubeSize, (int)CubeSize, (int)CubeSize]; + CorrectNumberArray = new int[(int)CubeSize, (int)CubeSize, (int)CubeSize]; int numVoxel = 0; - for (float xi = 0; xi < cubeSize; xi++) + for (float xi = 0; xi < CubeSize; xi++) { - for (float yi = 0; yi < cubeSize; yi++) + for (float yi = 0; yi < CubeSize; yi++) { - for (float zi = 0; zi < cubeSize; zi++) + for (float zi = 0; zi < CubeSize; zi++) { numVoxel += 1; - GameObject tempVoxel = Instantiate(voxelPrefab, new Vector3(xi, yi, zi), Quaternion.identity, transform); + GameObject tempVoxel = Instantiate(_voxelPrefab, new Vector3(xi, yi, zi), Quaternion.identity, transform); tempVoxel.transform.localPosition = tempVoxel.transform.localPosition; - voxelArray[(int)xi, (int)yi, (int)zi] = tempVoxel.GetComponentInChildren(); - correctNumberArray[(int)xi, (int)yi, (int)zi] = numVoxel; + VoxelArray[(int)xi, (int)yi, (int)zi] = tempVoxel.GetComponentInChildren(); + CorrectNumberArray[(int)xi, (int)yi, (int)zi] = numVoxel; //Instanced colors if (numVoxel <= 999) @@ -59,21 +62,21 @@ void Start () } } - nodules = new List(); + Nodules = new List(); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(0, -1 - noduleOffset, 0), Quaternion.identity, transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(-1 - noduleOffset, 0, 0), Quaternion.Euler(0,0,-90), transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(0, 0, -1 - noduleOffset), Quaternion.Euler(90, 0, 0), transform)); + Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(0, -1 - _noduleOffset, 0), Quaternion.identity, transform)); + Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(-1 - _noduleOffset, 0, 0), Quaternion.Euler(0,0,-90), transform)); + Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(0, 0, -1 - _noduleOffset), Quaternion.Euler(90, 0, 0), transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(cubeSize - 1, cubeSize + noduleOffset, cubeSize - 1), Quaternion.Euler(180, 0, 0), transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(cubeSize + noduleOffset, cubeSize - 1, cubeSize - 1), Quaternion.Euler(0, 0, 90), transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(cubeSize - 1, cubeSize - 1, cubeSize + noduleOffset), Quaternion.Euler(-90, 0, 0), transform)); + Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize + _noduleOffset, CubeSize - 1), Quaternion.Euler(180, 0, 0), transform)); + Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(CubeSize + _noduleOffset, CubeSize - 1, CubeSize - 1), Quaternion.Euler(0, 0, 90), transform)); + Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize - 1, CubeSize + _noduleOffset), Quaternion.Euler(-90, 0, 0), transform)); //transform.position = new Vector3(-1f, -1f, -1f); - transform.localScale = new Vector3((1 / cubeSize) * 2.5f, (1 / cubeSize) * 2.5f, (1 / cubeSize) * 2.5f); + transform.localScale = new Vector3((1 / CubeSize) * 2.5f, (1 / CubeSize) * 2.5f, (1 / CubeSize) * 2.5f); GameObject center = new GameObject(); center.transform.parent = transform; - center.transform.localPosition = new Vector3(cubeSize / 2 - 0.5f, cubeSize / 2 - 0.5f, cubeSize / 2 - 0.5f); + center.transform.localPosition = new Vector3(CubeSize / 2 - 0.5f, CubeSize / 2 - 0.5f, CubeSize / 2 - 0.5f); center.transform.parent = null; transform.position = -center.transform.position; Destroy(center); From a21ae9efde33f67ebecea872fde0f968b5297b0b Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:35:20 +0100 Subject: [PATCH 08/13] Made some variables into ints in VoxelSpawner and removed uncommented code --- Assets/Scripts/VoxelSpawner.cs | 44 +++++++++++++--------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index b8deacf..807afeb 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -15,8 +15,7 @@ public class VoxelSpawner : MonoBehaviour { [SerializeField, FormerlySerializedAs("noduleOffset")] private float _noduleOffset = 0.2f; - //Why is this a float ??? - public float CubeSize; + public int CubeSize; public List Nodules; @@ -30,21 +29,21 @@ void Start () { CubeSize = int.Parse(_cubeSizeInput.text); - VoxelArray = new SetVoxelProperties[(int)CubeSize, (int)CubeSize, (int)CubeSize]; - CorrectNumberArray = new int[(int)CubeSize, (int)CubeSize, (int)CubeSize]; + VoxelArray = new SetVoxelProperties[CubeSize, CubeSize, CubeSize]; + CorrectNumberArray = new int[CubeSize, CubeSize, CubeSize]; int numVoxel = 0; - for (float xi = 0; xi < CubeSize; xi++) + for (int xi = 0; xi < CubeSize; xi++) { - for (float yi = 0; yi < CubeSize; yi++) + for (int yi = 0; yi < CubeSize; yi++) { - for (float zi = 0; zi < CubeSize; zi++) + for (int zi = 0; zi < CubeSize; zi++) { numVoxel += 1; GameObject tempVoxel = Instantiate(_voxelPrefab, new Vector3(xi, yi, zi), Quaternion.identity, transform); tempVoxel.transform.localPosition = tempVoxel.transform.localPosition; - VoxelArray[(int)xi, (int)yi, (int)zi] = tempVoxel.GetComponentInChildren(); - CorrectNumberArray[(int)xi, (int)yi, (int)zi] = numVoxel; + VoxelArray[xi, yi, zi] = tempVoxel.GetComponentInChildren(); + CorrectNumberArray[xi, yi, zi] = numVoxel; //Instanced colors if (numVoxel <= 999) @@ -52,38 +51,27 @@ void Start () tempVoxel.GetComponentInChildren().SetNumber(numVoxel, true); tempVoxel.GetComponentInChildren().CorrectNumber = numVoxel; } - //tempVoxel.GetComponentInChildren().SetColor(new Color(xi / cubeSize + 0.1f, yi / cubeSize + 0.1f, zi / cubeSize + 0.1f, 1f)); - //renderer.material = new Material(renderer.material); - //renderer.material.color = new Color(xi / cubeSize, yi / cubeSize, zi / cubeSize); - - //tempVoxel.GetComponentInChildren().actualNumber = numVoxel; - //tempVoxel.GetComponentInChildren().actualColor = new Color(xi / cubeSize + 0.1f, yi / cubeSize + 0.1f, zi / cubeSize + 0.1f); } } } Nodules = new List(); - Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(0, -1 - _noduleOffset, 0), Quaternion.identity, transform)); - Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(-1 - _noduleOffset, 0, 0), Quaternion.Euler(0,0,-90), transform)); - Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(0, 0, -1 - _noduleOffset), Quaternion.Euler(90, 0, 0), transform)); + Nodules.Add(Instantiate(_nodulePrefab, new Vector3(0, -1 - _noduleOffset, 0), Quaternion.identity, transform)); + Nodules.Add(Instantiate(_nodulePrefab, new Vector3(-1 - _noduleOffset, 0, 0), Quaternion.Euler(0, 0, -90), transform)); + Nodules.Add(Instantiate(_nodulePrefab, new Vector3(0, 0, -1 - _noduleOffset), Quaternion.Euler(90, 0, 0), transform)); - Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize + _noduleOffset, CubeSize - 1), Quaternion.Euler(180, 0, 0), transform)); - Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(CubeSize + _noduleOffset, CubeSize - 1, CubeSize - 1), Quaternion.Euler(0, 0, 90), transform)); - Nodules.Add((GameObject)Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize - 1, CubeSize + _noduleOffset), Quaternion.Euler(-90, 0, 0), transform)); + Nodules.Add(Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize + _noduleOffset, CubeSize - 1), Quaternion.Euler(180, 0, 0), transform)); + Nodules.Add(Instantiate(_nodulePrefab, new Vector3(CubeSize + _noduleOffset, CubeSize - 1, CubeSize - 1), Quaternion.Euler(0, 0, 90), transform)); + Nodules.Add(Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize - 1, CubeSize + _noduleOffset), Quaternion.Euler(-90, 0, 0), transform)); - //transform.position = new Vector3(-1f, -1f, -1f); - transform.localScale = new Vector3((1 / CubeSize) * 2.5f, (1 / CubeSize) * 2.5f, (1 / CubeSize) * 2.5f); + transform.localScale = new Vector3((1f / CubeSize) * 2.5f, (1f / CubeSize) * 2.5f, (1f / CubeSize) * 2.5f); GameObject center = new GameObject(); center.transform.parent = transform; - center.transform.localPosition = new Vector3(CubeSize / 2 - 0.5f, CubeSize / 2 - 0.5f, CubeSize / 2 - 0.5f); + center.transform.localPosition = new Vector3(CubeSize / 2f - 0.5f, CubeSize / 2f - 0.5f, CubeSize / 2f - 0.5f); center.transform.parent = null; transform.position = -center.transform.position; Destroy(center); - //transform.parent = center.transform; - //center.transform.position = Vector3.zero; - //transform.parent = null; - //Destroy(center); GetComponent().base64MoveEncode = ""; } From e7f104c38bd07c7dea17d4146945ee7d3b9a6e14 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 14:37:15 +0100 Subject: [PATCH 09/13] Forgot to capitalize some variables --- Assets/Scripts/VoxelMover.cs | 8 ++++---- Assets/Scripts/VoxelSpawner.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index 96a717d..e7e75aa 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -6,8 +6,8 @@ public class VoxelMover : MonoBehaviour { [SerializeField, FormerlySerializedAs("VoxelHighlighter")] private GameObject _voxelHighlighter = default(GameObject); - public Text timeDisplay; - public Text movesDisplay; + public Text TimeDisplay; + public Text MovesDisplay; public Text MPSDisplay; [SerializeField, FormerlySerializedAs("timerButtonText")] private Text _timerButtonText = default(Text); @@ -49,8 +49,8 @@ void Start() void Update () { if (_doTiming) { - timeDisplay.text = "Time: " + (Time.time - _startTime).ToString(); - movesDisplay.text = "Moves: " + (_moves).ToString(); + TimeDisplay.text = "Time: " + (Time.time - _startTime).ToString(); + MovesDisplay.text = "Moves: " + (_moves).ToString(); MPSDisplay.text = "MPS: " + (_moves/ (Time.time - _startTime)).ToString(); } diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index 807afeb..1a14b8f 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -78,8 +78,8 @@ void Start () public void ResetCube() { - GetComponent().timeDisplay.text = "Time: 0"; - GetComponent().movesDisplay.text = "Moves: 0"; + GetComponent().TimeDisplay.text = "Time: 0"; + GetComponent().MovesDisplay.text = "Moves: 0"; GetComponent().MPSDisplay.text = "MPS: 0"; GetComponent().Restart(); transform.localScale = Vector3.one; From da93373384e3d7c45053e03944883b687716a992 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 15:31:36 +0100 Subject: [PATCH 10/13] Ran resharper cleanup --- Assets/Scripts/AlwaysFaceTowardsCamera.cs | 10 +- Assets/Scripts/ChangeColorOnHover.cs | 45 +- Assets/Scripts/CutOnClick.cs | 50 ++- Assets/Scripts/DisableTextOnInvisible.cs | 25 +- Assets/Scripts/LerpToPos.cs | 23 +- Assets/Scripts/NumberToggle.cs | 31 +- Assets/Scripts/OutlineToggle.cs | 20 +- Assets/Scripts/RotateCube.cs | 51 ++- Assets/Scripts/SetVoxelProperties.cs | 99 ++--- Assets/Scripts/ShowCorrectNumber.cs | 20 +- Assets/Scripts/VoxelMover.cs | 476 +++++++++++----------- Assets/Scripts/VoxelSpawner.cs | 168 +++++--- 12 files changed, 577 insertions(+), 441 deletions(-) diff --git a/Assets/Scripts/AlwaysFaceTowardsCamera.cs b/Assets/Scripts/AlwaysFaceTowardsCamera.cs index 5cb5ec4..865fd9f 100644 --- a/Assets/Scripts/AlwaysFaceTowardsCamera.cs +++ b/Assets/Scripts/AlwaysFaceTowardsCamera.cs @@ -1,8 +1,10 @@ using UnityEngine; [ExecuteInEditMode] -public class AlwaysFaceTowardsCamera : MonoBehaviour { - void Update () { +public class AlwaysFaceTowardsCamera : MonoBehaviour +{ + private void Update() + { transform.LookAt(Camera.main.transform, Vector3.up); - } -} + } +} \ No newline at end of file diff --git a/Assets/Scripts/ChangeColorOnHover.cs b/Assets/Scripts/ChangeColorOnHover.cs index 0f6ad9b..225de5f 100644 --- a/Assets/Scripts/ChangeColorOnHover.cs +++ b/Assets/Scripts/ChangeColorOnHover.cs @@ -1,37 +1,46 @@ using UnityEngine; -public class ChangeColorOnHover : MonoBehaviour { - +public class ChangeColorOnHover : MonoBehaviour +{ + private Color _lerpToColor; private Color _startColor; public Color ToColor; - private Color _lerpToColor; - // Use this for initialization - void Start () { - GetComponent().material = new Material(GetComponent().material); + // Use this for initialization + private void Start() + { + GetComponent().material = + new Material(GetComponent().material); _startColor = GetComponent().material.GetColor("_Color"); } - - // Update is called once per frame - void Update () { + + // Update is called once per frame + private void Update() + { RaycastHit hit; - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); if (Physics.Raycast(ray, out hit)) { - if (hit.transform.gameObject.GetInstanceID() == gameObject.GetInstanceID()) - { + if (hit.transform.gameObject.GetInstanceID() == + gameObject.GetInstanceID()) _lerpToColor = ToColor; - } else - { _lerpToColor = _startColor; - } - } else + } + else { _lerpToColor = _startColor; } - GetComponent().material.SetColor("_Color", Color.Lerp(GetComponent().material.color, _lerpToColor, Time.deltaTime * 15)); + GetComponent() + .material.SetColor( + "_Color", + Color.Lerp( + GetComponent().material.color, + _lerpToColor, + Time.deltaTime * 15 + ) + ); } -} +} \ No newline at end of file diff --git a/Assets/Scripts/CutOnClick.cs b/Assets/Scripts/CutOnClick.cs index fd4819a..c2805fb 100644 --- a/Assets/Scripts/CutOnClick.cs +++ b/Assets/Scripts/CutOnClick.cs @@ -1,42 +1,52 @@ using UnityEngine; using UnityEngine.Serialization; -public class CutOnClick : MonoBehaviour { +public class CutOnClick : MonoBehaviour +{ + [SerializeField] [FormerlySerializedAs("forward")] + private readonly bool _forward = true; + private VoxelMover _cube; - [SerializeField, FormerlySerializedAs("forward")] - private bool _forward = true; - void Start() + private void Start() { _cube = FindObjectOfType(); } - void Update() + private void Update() { RaycastHit hit; - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); if (Physics.Raycast(ray, out hit)) - { - if (hit.transform.gameObject.GetInstanceID() == gameObject.GetInstanceID() && Input.GetMouseButtonDown(0)) + if (hit.transform.gameObject.GetInstanceID() == + gameObject.GetInstanceID() && + Input.GetMouseButtonDown(0)) { if (_forward) { - GameObject[] nodules = GameObject.FindGameObjectsWithTag("Nodule"); - for (int n = 0; n < nodules.Length; n++) - { - if (nodules[n].GetInstanceID() != transform.parent.parent.gameObject.GetInstanceID()) - { + var nodules = + GameObject.FindGameObjectsWithTag("Nodule"); + for (var n = 0; n < nodules.Length; n++) + if (nodules[n].GetInstanceID() != + transform.parent.parent.gameObject.GetInstanceID()) nodules[n].SetActive(false); - } - } - _cube.CutForward(_cube.transform.InverseTransformDirection(transform.forward)); - } else + _cube.CutForward( + _cube.transform.InverseTransformDirection( + transform.forward + ) + ); + } + else { - _cube.CutBackward(_cube.transform.InverseTransformDirection(-transform.forward), true); + _cube.CutBackward( + _cube.transform.InverseTransformDirection( + -transform.forward + ), + true + ); } } - } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/DisableTextOnInvisible.cs b/Assets/Scripts/DisableTextOnInvisible.cs index 9be3574..d25f0d4 100644 --- a/Assets/Scripts/DisableTextOnInvisible.cs +++ b/Assets/Scripts/DisableTextOnInvisible.cs @@ -1,22 +1,25 @@ using UnityEngine; -public class DisableTextOnInvisible : MonoBehaviour { +public class DisableTextOnInvisible : MonoBehaviour +{ private VoxelSpawner _cube; - void Start() + private void Start() { _cube = FindObjectOfType(); } - void Update () { - - Vector3 realPos = transform.parent.parent.localPosition - new Vector3(-(_cube.CubeSize / 2f) + 0.5f, -(_cube.CubeSize / 2f) + 0.5f, -(_cube.CubeSize / 2f) + 0.5f); + private void Update() + { + var realPos = transform.parent.parent.localPosition - + new Vector3( + -(_cube.CubeSize / 2f) + 0.5f, + -(_cube.CubeSize / 2f) + 0.5f, + -(_cube.CubeSize / 2f) + 0.5f + ); if (realPos.x * realPos.y * realPos.z == 0) - { GetComponent().enabled = true; - } else - { + else GetComponent().enabled = false; - } - } -} + } +} \ No newline at end of file diff --git a/Assets/Scripts/LerpToPos.cs b/Assets/Scripts/LerpToPos.cs index c2922bf..301c331 100644 --- a/Assets/Scripts/LerpToPos.cs +++ b/Assets/Scripts/LerpToPos.cs @@ -1,17 +1,22 @@ using UnityEngine; -public class LerpToPos : MonoBehaviour { - private bool _lerping = false; - private Vector3 _newPos; +public class LerpToPos : MonoBehaviour +{ + private bool _lerping; private float _lerpSpeed; + private Vector3 _newPos; - void Update() + private void Update() { if (_lerping) - { - transform.localPosition = Vector3.Lerp(transform.localPosition, _newPos, Time.deltaTime * _lerpSpeed); - } - if (Mathf.Abs(transform.localPosition.magnitude - _newPos.magnitude) < 0.1f) + transform.localPosition = Vector3.Lerp( + transform.localPosition, + _newPos, + Time.deltaTime * _lerpSpeed + ); + + if (Mathf.Abs(transform.localPosition.magnitude - _newPos.magnitude) < + 0.1f) { _lerping = false; transform.localPosition = _newPos; @@ -24,4 +29,4 @@ public void MoveToPos(Vector3 pos, float speed) _newPos = pos; _lerping = true; } -} +} \ No newline at end of file diff --git a/Assets/Scripts/NumberToggle.cs b/Assets/Scripts/NumberToggle.cs index 10842ee..83c3e65 100644 --- a/Assets/Scripts/NumberToggle.cs +++ b/Assets/Scripts/NumberToggle.cs @@ -10,22 +10,25 @@ public void ToggleNumbers() NumberEnabled = !NumberEnabled; if (NumberEnabled) { - SetVoxelProperties[] voxels = FindObjectsOfType(); - new List(voxels).ForEach((System.Action)((v) => - { - v.ShowNumber = true; - v.Redraw(); - })); + var voxels = FindObjectsOfType(); + new List(voxels).ForEach( + v => + { + v.ShowNumber = true; + v.Redraw(); + } + ); } else { - SetVoxelProperties[] voxels = FindObjectsOfType(); - new List(voxels).ForEach((System.Action)((v) => - { - v.ShowNumber = false; - v.Redraw(); - })); + var voxels = FindObjectsOfType(); + new List(voxels).ForEach( + v => + { + v.ShowNumber = false; + v.Redraw(); + } + ); } } - -} +} \ No newline at end of file diff --git a/Assets/Scripts/OutlineToggle.cs b/Assets/Scripts/OutlineToggle.cs index f5a67b0..31a7d35 100644 --- a/Assets/Scripts/OutlineToggle.cs +++ b/Assets/Scripts/OutlineToggle.cs @@ -1,19 +1,19 @@ using UnityEngine; -public class OutlineToggle : MonoBehaviour { - +public class OutlineToggle : MonoBehaviour +{ private bool _outlineEnabled = true; public void ToggleOutlines() { _outlineEnabled = !_outlineEnabled; if (_outlineEnabled) - { - FindObjectOfType().GetComponent().sharedMaterial.SetFloat("_FirstOutlineWidth", 0.02f); - } else - { - FindObjectOfType().GetComponent().sharedMaterial.SetFloat("_FirstOutlineWidth", 0f); - } + FindObjectOfType() + .GetComponent() + .sharedMaterial.SetFloat("_FirstOutlineWidth", 0.02f); + else + FindObjectOfType() + .GetComponent() + .sharedMaterial.SetFloat("_FirstOutlineWidth", 0f); } - -} +} \ No newline at end of file diff --git a/Assets/Scripts/RotateCube.cs b/Assets/Scripts/RotateCube.cs index 568733e..0ebf0ac 100644 --- a/Assets/Scripts/RotateCube.cs +++ b/Assets/Scripts/RotateCube.cs @@ -1,29 +1,42 @@ using UnityEngine; using UnityEngine.Serialization; -public class RotateCube : MonoBehaviour { - [SerializeField, FormerlySerializedAs("mouseSensitivity")] - private float _mouseSensitivity = 1f; - [SerializeField, FormerlySerializedAs("scrollWheelSensitivity")] - private float _scrollWheelSensitivity = 1f; +public class RotateCube : MonoBehaviour +{ + [SerializeField] [FormerlySerializedAs("mouseSensitivity")] + private readonly float _mouseSensitivity = 1f; - Vector3 lastPos = Vector3.zero; + [SerializeField] [FormerlySerializedAs("scrollWheelSensitivity")] + private readonly float _scrollWheelSensitivity = 1f; + + private Vector3 lastPos = Vector3.zero; + + private void Update() + { + if (Input.GetMouseButtonDown(1)) lastPos = Input.mousePosition; - void Update () { - if (Input.GetMouseButtonDown(1)) - { - lastPos = Input.mousePosition; - } if (Input.GetMouseButton(1)) { - Vector3 mouseOffset = Input.mousePosition - lastPos; - transform.RotateAround(Vector3.zero, Vector3.right, mouseOffset.y * _mouseSensitivity); - transform.RotateAround(Vector3.zero, Vector3.up, -mouseOffset.x * _mouseSensitivity); + var mouseOffset = Input.mousePosition - lastPos; + transform.RotateAround( + Vector3.zero, + Vector3.right, + mouseOffset.y * _mouseSensitivity + ); + transform.RotateAround( + Vector3.zero, + Vector3.up, + -mouseOffset.x * _mouseSensitivity + ); } + if (Input.GetAxis("Mouse ScrollWheel") != 0) - { - transform.RotateAround(Vector3.zero, Vector3.forward, Input.GetAxis("Mouse ScrollWheel") * _scrollWheelSensitivity); - } + transform.RotateAround( + Vector3.zero, + Vector3.forward, + Input.GetAxis("Mouse ScrollWheel") * _scrollWheelSensitivity + ); + lastPos = Input.mousePosition; - } -} + } +} \ No newline at end of file diff --git a/Assets/Scripts/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs index b9f6669..03f317b 100644 --- a/Assets/Scripts/SetVoxelProperties.cs +++ b/Assets/Scripts/SetVoxelProperties.cs @@ -1,35 +1,37 @@ using UnityEngine; using UnityEngine.Serialization; -public class SetVoxelProperties : MonoBehaviour { +public class SetVoxelProperties : MonoBehaviour +{ + [SerializeField] [FormerlySerializedAs("colorBrightness")] + private readonly float _colorBrightness = 0.1f; private VoxelSpawner _cube; private MaterialPropertyBlock _propBlock; private Renderer _renderer; private Color color = Color.black; - [SerializeField, FormerlySerializedAs("colorBrightness")] - private float _colorBrightness = 0.1f; - [HideInInspector] - public int Number = 1; - [HideInInspector] - public bool Transparent = false; - [HideInInspector] - public bool ShowNumber = true; - void Awake() + [HideInInspector] public int Number = 1; + [HideInInspector] public bool ShowNumber = true; + [HideInInspector] public bool Transparent = false; + + private void Awake() { ShowNumber = FindObjectOfType().NumberEnabled; _cube = FindObjectOfType(); _renderer = GetComponent(); _propBlock = new MaterialPropertyBlock(); } - - public void SetColor(Color newColor) + + public void SetColor(Color newColor) { color = newColor; _propBlock.SetColor("_Color", color); _propBlock.SetColor("_EmissionColor", NumberToColor(Number)); - _propBlock.SetTexture("_MainTex", Resources.Load(Number.ToString())); + _propBlock.SetTexture( + "_MainTex", + Resources.Load(Number.ToString()) + ); _renderer.SetPropertyBlock(_propBlock); } @@ -42,12 +44,16 @@ public void SetNumber(int newNumber, bool doRedraw) _propBlock.SetColor("_EmissionColor", NumberToColor(newNumber)); _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); if (ShowNumber) - { - _propBlock.SetTexture("_MainTex", Resources.Load(Number.ToString())); - } else - { - _propBlock.SetTexture("_MainTex", Resources.Load("blank")); - } + _propBlock.SetTexture( + "_MainTex", + Resources.Load(Number.ToString()) + ); + else + _propBlock.SetTexture( + "_MainTex", + Resources.Load("blank") + ); + _renderer.SetPropertyBlock(_propBlock); } } @@ -57,7 +63,10 @@ public void DisplayNumber(int displayNumber) _propBlock.SetColor("_Color", NumberToColor(Number)); _propBlock.SetColor("_EmissionColor", NumberToColor(Number)); _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); - _propBlock.SetTexture("_MainTex", Resources.Load(displayNumber.ToString())); + _propBlock.SetTexture( + "_MainTex", + Resources.Load(displayNumber.ToString()) + ); _renderer.SetPropertyBlock(_propBlock); } @@ -66,40 +75,38 @@ public void Redraw() SetNumber(Number, true); } - Color NumberToColor(int num) + private Color NumberToColor(int num) { - int numVoxel = 0; + var numVoxel = 0; for (float xi = 0; xi < _cube.CubeSize; xi++) + for (float yi = 0; yi < _cube.CubeSize; yi++) + for (float zi = 0; zi < _cube.CubeSize; zi++) { - for (float yi = 0; yi < _cube.CubeSize; yi++) + numVoxel += 1; + if (num == numVoxel) { - for (float zi = 0; zi < _cube.CubeSize; zi++) - { - numVoxel += 1; - if (num == numVoxel) - { - if (!Transparent) - { - return new Color(xi / _cube.CubeSize + _colorBrightness, yi / _cube.CubeSize + _colorBrightness, zi / _cube.CubeSize + _colorBrightness, 1f); - } else - { - return new Color(xi / _cube.CubeSize + _colorBrightness, yi / _cube.CubeSize + _colorBrightness, zi / _cube.CubeSize + _colorBrightness, 0.025f); - } - } - } + if (!Transparent) + return new Color( + xi / _cube.CubeSize + _colorBrightness, + yi / _cube.CubeSize + _colorBrightness, + zi / _cube.CubeSize + _colorBrightness, + 1f + ); + return new Color( + xi / _cube.CubeSize + _colorBrightness, + yi / _cube.CubeSize + _colorBrightness, + zi / _cube.CubeSize + _colorBrightness, + 0.025f + ); } } + return Color.black; } - Color OutlineColor() + private Color OutlineColor() { - if (Transparent) - { - return new Color(0, 0, 0, 0); - } else - { - return new Color(0, 0, 0, 1); - } + if (Transparent) return new Color(0, 0, 0, 0); + return new Color(0, 0, 0, 1); } -} +} \ No newline at end of file diff --git a/Assets/Scripts/ShowCorrectNumber.cs b/Assets/Scripts/ShowCorrectNumber.cs index 9254279..9e7ca17 100644 --- a/Assets/Scripts/ShowCorrectNumber.cs +++ b/Assets/Scripts/ShowCorrectNumber.cs @@ -1,25 +1,31 @@ using UnityEngine; -public class ShowCorrectNumber : MonoBehaviour { +public class ShowCorrectNumber : MonoBehaviour +{ private VoxelSpawner _cube; + private bool _showingNumber; public int CorrectNumber; - private bool _showingNumber = false; - void Start() + private void Start() { _cube = FindObjectOfType(); } - void Update () { - if ((Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2)) || (Input.GetMouseButtonDown(2) && !Input.GetKey(KeyCode.E)) && !_showingNumber) + private void Update() + { + if (Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2) || + Input.GetMouseButtonDown(2) && + !Input.GetKey(KeyCode.E) && + !_showingNumber) { _showingNumber = true; GetComponent().DisplayNumber(CorrectNumber); } + if (Input.GetKeyUp(KeyCode.E) || Input.GetMouseButtonUp(2)) { _showingNumber = false; GetComponent().Redraw(); } - } -} + } +} \ No newline at end of file diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index e7e75aa..cd58b49 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -3,113 +3,119 @@ using UnityEngine.Serialization; using UnityEngine.UI; -public class VoxelMover : MonoBehaviour { - [SerializeField, FormerlySerializedAs("VoxelHighlighter")] - private GameObject _voxelHighlighter = default(GameObject); - public Text TimeDisplay; - public Text MovesDisplay; - public Text MPSDisplay; - [SerializeField, FormerlySerializedAs("timerButtonText")] - private Text _timerButtonText = default(Text); - private float _cubeSize; +public class VoxelMover : MonoBehaviour +{ + [SerializeField] [FormerlySerializedAs("sliceToggle")] + private readonly Toggle _sliceToggle = default(Toggle); - [SerializeField, FormerlySerializedAs("sliceToggle")] - private Toggle _sliceToggle = default(Toggle); - private bool _alternateSliceDir = false; + [SerializeField] [FormerlySerializedAs("timerButtonText")] + private readonly Text _timerButtonText = default(Text); - private Vector3 _newPos; - private Vector3 _newNorm; - private Vector3 _highlightedVoxel; + [SerializeField] [FormerlySerializedAs("VoxelHighlighter")] + private readonly GameObject _voxelHighlighter = default(GameObject); - private bool _doTiming = false; - private float _startTime = 0; - private int _moves = 0; + private readonly Vector3[] directionArray = + { + new Vector3(1, 0, 0), + new Vector3(-1, 0, 0), + new Vector3(0, 1, 0), + new Vector3(0, -1, 0), + new Vector3(0, 0, 1), + new Vector3(0, 0, -1) + }; + + private bool _alternateSliceDir; - public int AmountCut = 0; + private float _cubeSize; private Vector3 _currentCutDir = Vector3.zero; - VoxelSpawner vs; - Vector3[] directionArray = new[] - { - new Vector3(1, 0, 0), - new Vector3(-1, 0, 0), - new Vector3(0, 1, 0), - new Vector3(0, -1, 0), - new Vector3(0, 0, 1), - new Vector3(0, 0, -1) - }; + private bool _doTiming; + private Vector3 _highlightedVoxel; + private int _moves; + private Vector3 _newNorm; + + private Vector3 _newPos; + + private float _startTime; + + public int AmountCut; public string base64MoveEncode = ""; - void Start() + public Text MovesDisplay; + public Text MPSDisplay; + + public Text TimeDisplay; + + private VoxelSpawner vs; + + private void Start() { vs = FindObjectOfType(); } - void Update () { + private void Update() + { if (_doTiming) { - TimeDisplay.text = "Time: " + (Time.time - _startTime).ToString(); - MovesDisplay.text = "Moves: " + (_moves).ToString(); - MPSDisplay.text = "MPS: " + (_moves/ (Time.time - _startTime)).ToString(); + TimeDisplay.text = "Time: " + (Time.time - _startTime); + MovesDisplay.text = "Moves: " + _moves; + MPSDisplay.text = + "MPS: " + _moves / (Time.time - _startTime); } RaycastHit hit; - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); - if (Physics.Raycast(ray, out hit)) { + if (Physics.Raycast(ray, out hit)) + { if (hit.transform.tag == "Voxel") { _newPos = hit.transform.position; _newNorm = hit.normal; _highlightedVoxel = hit.transform.localPosition; _voxelHighlighter.SetActive(true); - } else + } + else { _voxelHighlighter.SetActive(false); } - } else + } + else { _voxelHighlighter.SetActive(false); } if (Input.GetKeyDown(KeyCode.R)) - { _alternateSliceDir = !_alternateSliceDir; - } if (_voxelHighlighter.activeSelf && Input.GetMouseButtonDown(0)) { _cubeSize = vs.CubeSize; - for (int c = 0; c < transform.childCount; c++) - { + for (var c = 0; c < transform.childCount; c++) if (transform.GetChild(c).tag == "Moved") { Debug.Log("BREAK AVERTED"); return; } - } if (_doTiming == false) { - base64MoveEncode = Base64Encode((int)_cubeSize); + base64MoveEncode = Base64Encode((int) _cubeSize); _timerButtonText.text = "Stop Timer"; _startTime = Time.time; _doTiming = true; _moves = 0; } - - Vector3 localNorm = transform.InverseTransformDirection(_newNorm); + + var localNorm = transform.InverseTransformDirection(_newNorm); _moves += 1; - bool tempReturn = true; - for (int d = 0; d < directionArray.Length; d++) - { + var tempReturn = true; + for (var d = 0; d < directionArray.Length; d++) if (-localNorm == directionArray[d]) - { tempReturn = false; - } - } + if (tempReturn) { Debug.Log("WEIRD DIRECTION: " + -localNorm); @@ -117,38 +123,27 @@ void Update () { } if (!_sliceToggle.isOn) - { PushRow(_highlightedVoxel, -localNorm, true); - } else - { + else PushSlice(_highlightedVoxel, -localNorm); - } //Base64MoveEncoder - base64MoveEncode += Base64Encode((int)_highlightedVoxel.x) + Base64Encode((int)_highlightedVoxel.y) + Base64Encode((int)_highlightedVoxel.z); - for (int i = 0; i < directionArray.Length; i++) - { + base64MoveEncode += Base64Encode((int) _highlightedVoxel.x) + + Base64Encode((int) _highlightedVoxel.y) + + Base64Encode((int) _highlightedVoxel.z); + for (var i = 0; i < directionArray.Length; i++) if (directionArray[i] == -localNorm) - { base64MoveEncode += Base64Encode(i); - } - } - - bool stopTimer = true; - for (int xi = 0; xi < _cubeSize; xi++) - { - for (int yi = 0; yi < _cubeSize; yi++) - { - for (int zi = 0; zi < _cubeSize; zi++) - { - if (vs.VoxelArray[xi, yi, zi].Number != vs.CorrectNumberArray[xi, yi, zi]) - { - stopTimer = false; - } - } - } - } + + var stopTimer = true; + for (var xi = 0; xi < _cubeSize; xi++) + for (var yi = 0; yi < _cubeSize; yi++) + for (var zi = 0; zi < _cubeSize; zi++) + if (vs.VoxelArray[xi, yi, zi].Number != + vs.CorrectNumberArray[xi, yi, zi]) + stopTimer = false; + if (stopTimer) { Restart(); @@ -159,16 +154,29 @@ void Update () { //Hardcoded values uwu if (!_sliceToggle.isOn) { - _voxelHighlighter.transform.position = Vector3.Lerp(_voxelHighlighter.transform.position, _newPos, Time.deltaTime * 30); - _voxelHighlighter.transform.up = Vector3.Lerp(_voxelHighlighter.transform.up, _newNorm, Time.deltaTime * 50); - } else + _voxelHighlighter.transform.position = Vector3.Lerp( + _voxelHighlighter.transform.position, + _newPos, + Time.deltaTime * 30 + ); + _voxelHighlighter.transform.up = Vector3.Lerp( + _voxelHighlighter.transform.up, + _newNorm, + Time.deltaTime * 50 + ); + } + else { - _voxelHighlighter.transform.position = Vector3.Lerp(_voxelHighlighter.transform.position, _newPos, Time.deltaTime * 30); + _voxelHighlighter.transform.position = Vector3.Lerp( + _voxelHighlighter.transform.position, + _newPos, + Time.deltaTime * 30 + ); //VoxelHighlighter.transform.up = Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50); - Vector3 localNorm = transform.InverseTransformDirection(_newNorm); - Vector3 highlightUp = Vector3.zero; - Vector3 highlightRight = Vector3.zero; + var localNorm = transform.InverseTransformDirection(_newNorm); + var highlightUp = Vector3.zero; + var highlightRight = Vector3.zero; if (Mathf.RoundToInt(vec3Abs(localNorm).x) == 1) { highlightUp = new Vector3(0, 1, 0); @@ -186,17 +194,31 @@ void Update () { } if (!_alternateSliceDir) - { _voxelHighlighter.transform.rotation = Quaternion.LookRotation( - Vector3.Lerp(_voxelHighlighter.transform.forward, transform.TransformDirection(highlightRight), Time.deltaTime * 50), - Vector3.Lerp(_voxelHighlighter.transform.up, _newNorm, Time.deltaTime * 50)); - } else - { + Vector3.Lerp( + _voxelHighlighter.transform.forward, + transform.TransformDirection(highlightRight), + Time.deltaTime * 50 + ), + Vector3.Lerp( + _voxelHighlighter.transform.up, + _newNorm, + Time.deltaTime * 50 + ) + ); + else _voxelHighlighter.transform.rotation = Quaternion.LookRotation( - Vector3.Lerp(_voxelHighlighter.transform.forward, transform.TransformDirection(highlightUp), Time.deltaTime * 50), - Vector3.Lerp(_voxelHighlighter.transform.up, _newNorm, Time.deltaTime * 50)); - } - + Vector3.Lerp( + _voxelHighlighter.transform.forward, + transform.TransformDirection(highlightUp), + Time.deltaTime * 50 + ), + Vector3.Lerp( + _voxelHighlighter.transform.up, + _newNorm, + Time.deltaTime * 50 + ) + ); } } @@ -210,153 +232,145 @@ public void Restart() public void ToggleSliceMarkers() { if (_sliceToggle.isOn) - { - _voxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(true); - } else - { - _voxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(false); - } + _voxelHighlighter.transform.Find("SliceMarkers") + .gameObject.SetActive(true); + else + _voxelHighlighter.transform.Find("SliceMarkers") + .gameObject.SetActive(false); } public void CutForward(Vector3 dir) { _currentCutDir = dir; _cubeSize = vs.CubeSize; - if (AmountCut == ((int)_cubeSize - 1)) - { - return; - } + if (AmountCut == (int) _cubeSize - 1) return; - List objectsToDeactivate = new List(); - for (int xi = 0; xi < _cubeSize; xi++) + var objectsToDeactivate = + new List(); + for (var xi = 0; xi < _cubeSize; xi++) + for (var yi = 0; yi < _cubeSize; yi++) + for (var zi = 0; zi < _cubeSize; zi++) { - for (int yi = 0; yi < _cubeSize; yi++) + SetVoxelProperties beforeVoxel = null; + try { - for (int zi = 0; zi < _cubeSize; zi++) - { - SetVoxelProperties beforeVoxel = null; - try - { - beforeVoxel = vs.VoxelArray[xi - Mathf.RoundToInt(dir.x), yi - Mathf.RoundToInt(dir.y), zi - Mathf.RoundToInt(dir.z)]; - } - catch - { - objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); - continue; - } - - if (beforeVoxel.Transparent) - { - objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); - } - } + beforeVoxel = vs.VoxelArray[xi - Mathf.RoundToInt(dir.x), + yi - Mathf.RoundToInt(dir.y), + zi - Mathf.RoundToInt(dir.z)]; + } + catch + { + objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); + continue; } + + if (beforeVoxel.Transparent) + objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); } - objectsToDeactivate.ForEach((Obj) => - { - Obj.transform.parent.GetComponent().enabled = false; - Obj.Transparent = true; - Obj.Redraw(); - }); + + objectsToDeactivate.ForEach( + Obj => + { + Obj.transform.parent.GetComponent().enabled = false; + Obj.Transparent = true; + Obj.Redraw(); + } + ); AmountCut += 1; } public void CutBackward(Vector3 dir, bool resetNodulesOnZero) { - if (AmountCut == 0) - { - return; - } + if (AmountCut == 0) return; - List objectsToActivate = new List(); - for (int xi = 0; xi < _cubeSize; xi++) + var objectsToActivate = new List(); + for (var xi = 0; xi < _cubeSize; xi++) + for (var yi = 0; yi < _cubeSize; yi++) + for (var zi = 0; zi < _cubeSize; zi++) { - for (int yi = 0; yi < _cubeSize; yi++) + SetVoxelProperties beforeVoxel = null; + try { - for (int zi = 0; zi < _cubeSize; zi++) - { - SetVoxelProperties beforeVoxel = null; - try - { - beforeVoxel = vs.VoxelArray[xi + Mathf.RoundToInt(dir.x), yi + Mathf.RoundToInt(dir.y), zi + Mathf.RoundToInt(dir.z)]; - } catch - { - continue; - } - - if (!beforeVoxel.Transparent) - { - objectsToActivate.Add(vs.VoxelArray[xi, yi, zi]); - } - } + beforeVoxel = vs.VoxelArray[xi + Mathf.RoundToInt(dir.x), + yi + Mathf.RoundToInt(dir.y), + zi + Mathf.RoundToInt(dir.z)]; + } + catch + { + continue; } + + if (!beforeVoxel.Transparent) + objectsToActivate.Add(vs.VoxelArray[xi, yi, zi]); } - objectsToActivate.ForEach((Obj) => - { - Obj.transform.parent.GetComponent().enabled = true; - Obj.Transparent = false; - Obj.Redraw(); - }); + + objectsToActivate.ForEach( + Obj => + { + Obj.transform.parent.GetComponent().enabled = true; + Obj.Transparent = false; + Obj.Redraw(); + } + ); AmountCut -= 1; if (AmountCut == 0 && resetNodulesOnZero) - { - GetComponent().Nodules.ForEach((n) => - { - n.SetActive(true); - }); - } + GetComponent() + .Nodules.ForEach(n => { n.SetActive(true); }); } - void PushRow(Vector3 touched, Vector3 dir, bool fancy) + private void PushRow(Vector3 touched, Vector3 dir, bool fancy) { _cubeSize = vs.CubeSize; - for (int i = 0; i < _cubeSize + 1; i++) - { - if (FindVoxelByPos(touched - (dir * i)) == null) + for (var i = 0; i < _cubeSize + 1; i++) + if (FindVoxelByPos(touched - dir * i) == null) { - touched = touched - (dir * (i - 1)); + touched = touched - dir * (i - 1); break; } - } - List tempNumArray = new List(); - for (int i = 0; i < _cubeSize; i++) + var tempNumArray = new List(); + for (var i = 0; i < _cubeSize; i++) { - Vector3 pos = (touched + (dir * i)); - tempNumArray.Add(vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].Number); + var pos = touched + dir * i; + tempNumArray.Add( + vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .Number + ); //Debug.Log(tempNumArray[tempNumArray.Count - 1]); } - for (int i = 0; i < _cubeSize; i++) + + for (var i = 0; i < _cubeSize; i++) { - Vector3 pos = (touched + (dir * i)); + var pos = touched + dir * i; if (i == 0) - { - vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[tempNumArray.Count-1], fancy); - } else - { - vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[i-1], fancy); - } + vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .SetNumber(tempNumArray[tempNumArray.Count - 1], fancy); + else + vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .SetNumber(tempNumArray[i - 1], fancy); } - for (int c = 0; c < transform.childCount; c++) - { + for (var c = 0; c < transform.childCount; c++) if (transform.GetChild(c).tag == "Moved") - { transform.GetChild(c).tag = "Voxel"; - } - } } - void PushSlice(Vector3 touched, Vector3 dir) + private void PushSlice(Vector3 touched, Vector3 dir) { //HACKY - Vector3 highlightUp = Vector3.zero; - Vector3 highlightRight = Vector3.zero; + var highlightUp = Vector3.zero; + var highlightRight = Vector3.zero; if (Mathf.RoundToInt(vec3Abs(dir).x) == 1) { highlightUp = new Vector3(0, 1, 0); @@ -373,45 +387,45 @@ void PushSlice(Vector3 touched, Vector3 dir) highlightRight = new Vector3(1, 0, 0); } - Vector3 sliceDir = Vector3.zero; + var sliceDir = Vector3.zero; if (!_alternateSliceDir) - { sliceDir = highlightUp; - } else - { sliceDir = highlightRight; - } _cubeSize = vs.CubeSize; - for (int i = 0; i < _cubeSize + 1; i++) - { - if (FindVoxelByPos(_highlightedVoxel - (sliceDir * i)) == null) + for (var i = 0; i < _cubeSize + 1; i++) + if (FindVoxelByPos(_highlightedVoxel - sliceDir * i) == null) { - _highlightedVoxel = _highlightedVoxel - (sliceDir * (i - 1)); + _highlightedVoxel = _highlightedVoxel - sliceDir * (i - 1); break; } - } - for (int i = 0; i < _cubeSize; i++) - { + for (var i = 0; i < _cubeSize; i++) PushRow(_highlightedVoxel + sliceDir * i, dir, true); - } } - Vector3 floorVec3ToInt(Vector3 in_vec) + private Vector3 floorVec3ToInt(Vector3 in_vec) { - return new Vector3(Mathf.FloorToInt(in_vec.x), Mathf.FloorToInt(in_vec.y), Mathf.FloorToInt(in_vec.z)); + return new Vector3( + Mathf.FloorToInt(in_vec.x), + Mathf.FloorToInt(in_vec.y), + Mathf.FloorToInt(in_vec.z) + ); } - Vector3 vec3Abs(Vector3 in_vec) + private Vector3 vec3Abs(Vector3 in_vec) { - return new Vector3(Mathf.Abs(in_vec.x), Mathf.Abs(in_vec.y), Mathf.Abs(in_vec.z)); + return new Vector3( + Mathf.Abs(in_vec.x), + Mathf.Abs(in_vec.y), + Mathf.Abs(in_vec.z) + ); } - Transform FindVoxelByPos(Vector3 pos) + private Transform FindVoxelByPos(Vector3 pos) { /*for (int c = 0; c < transform.childCount; c++) { @@ -424,8 +438,12 @@ Transform FindVoxelByPos(Vector3 pos) try { - return vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].transform; - } catch + return vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .transform; + } + catch { return null; } @@ -433,35 +451,29 @@ Transform FindVoxelByPos(Vector3 pos) public void Scramble() { - if (AmountCut != 0) - { - return; - } + if (AmountCut != 0) return; - for (int i = 0; i < 1000; i++) - { - ScrambleOne(true); - } + for (var i = 0; i < 1000; i++) ScrambleOne(true); } - void ScrambleOne(bool end) + private void ScrambleOne(bool end) { - int randVoxel = UnityEngine.Random.Range(0, transform.childCount); + var randVoxel = Random.Range(0, transform.childCount); if (transform.GetChild(randVoxel).tag == "Voxel") - { - //if (!sliceToggle.isOn) - //{ - PushRow(transform.GetChild(randVoxel).localPosition, directionArray[UnityEngine.Random.Range(0, directionArray.Length - 1)], end); - //} else - //{ - // PushSlice(transform.GetChild(randVoxel).localPosition, directionArray[UnityEngine.Random.Range(0, directionArray.Length - 1)]); - //} - } + PushRow( + transform.GetChild(randVoxel).localPosition, + directionArray[Random.Range( + 0, + directionArray.Length - 1 + )], + end + ); } public string Base64Encode(int num) { - string base64Table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + var base64Table = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; return base64Table[num].ToString(); } -} +} \ No newline at end of file diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index 1a14b8f..8bcc5f4 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -3,78 +3,147 @@ using UnityEngine.Serialization; using UnityEngine.UI; -public class VoxelSpawner : MonoBehaviour { +public class VoxelSpawner : MonoBehaviour +{ + [SerializeField] [FormerlySerializedAs("cubeSizeInput")] + private readonly InputField _cubeSizeInput = null; - [SerializeField, FormerlySerializedAs("voxelPrefab")] - private GameObject _voxelPrefab = null; - [SerializeField, FormerlySerializedAs("nodulePrefab")] - private GameObject _nodulePrefab = null; - [SerializeField, FormerlySerializedAs("cubeSizeInput")] - private InputField _cubeSizeInput = null; + [SerializeField] [FormerlySerializedAs("noduleOffset")] + private readonly float _noduleOffset = 0.2f; - [SerializeField, FormerlySerializedAs("noduleOffset")] - private float _noduleOffset = 0.2f; + [SerializeField] [FormerlySerializedAs("nodulePrefab")] + private readonly GameObject _nodulePrefab = null; + + [SerializeField] [FormerlySerializedAs("voxelPrefab")] + private readonly GameObject _voxelPrefab = null; + + [SerializeField] [FormerlySerializedAs("textures")] + private Texture2D[] _textures; public int CubeSize; public List Nodules; - [SerializeField, FormerlySerializedAs("textures")] - private Texture2D[] _textures; - public SetVoxelProperties[,,] VoxelArray; public int[,,] CorrectNumberArray { get; private set; } - void Start () + private void Start() { CubeSize = int.Parse(_cubeSizeInput.text); VoxelArray = new SetVoxelProperties[CubeSize, CubeSize, CubeSize]; CorrectNumberArray = new int[CubeSize, CubeSize, CubeSize]; - int numVoxel = 0; - for (int xi = 0; xi < CubeSize; xi++) + var numVoxel = 0; + for (var xi = 0; xi < CubeSize; xi++) + for (var yi = 0; yi < CubeSize; yi++) + for (var zi = 0; zi < CubeSize; zi++) { - for (int yi = 0; yi < CubeSize; yi++) + numVoxel += 1; + var tempVoxel = Instantiate( + _voxelPrefab, + new Vector3(xi, yi, zi), + Quaternion.identity, + transform + ); + tempVoxel.transform.localPosition = + tempVoxel.transform.localPosition; + VoxelArray[xi, yi, zi] = + tempVoxel.GetComponentInChildren(); + CorrectNumberArray[xi, yi, zi] = numVoxel; + + //Instanced colors + if (numVoxel <= 999) { - for (int zi = 0; zi < CubeSize; zi++) - { - numVoxel += 1; - GameObject tempVoxel = Instantiate(_voxelPrefab, new Vector3(xi, yi, zi), Quaternion.identity, transform); - tempVoxel.transform.localPosition = tempVoxel.transform.localPosition; - VoxelArray[xi, yi, zi] = tempVoxel.GetComponentInChildren(); - CorrectNumberArray[xi, yi, zi] = numVoxel; - - //Instanced colors - if (numVoxel <= 999) - { - tempVoxel.GetComponentInChildren().SetNumber(numVoxel, true); - tempVoxel.GetComponentInChildren().CorrectNumber = numVoxel; - } - } + tempVoxel.GetComponentInChildren() + .SetNumber(numVoxel, true); + tempVoxel.GetComponentInChildren() + .CorrectNumber = numVoxel; } } Nodules = new List(); - Nodules.Add(Instantiate(_nodulePrefab, new Vector3(0, -1 - _noduleOffset, 0), Quaternion.identity, transform)); - Nodules.Add(Instantiate(_nodulePrefab, new Vector3(-1 - _noduleOffset, 0, 0), Quaternion.Euler(0, 0, -90), transform)); - Nodules.Add(Instantiate(_nodulePrefab, new Vector3(0, 0, -1 - _noduleOffset), Quaternion.Euler(90, 0, 0), transform)); - - Nodules.Add(Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize + _noduleOffset, CubeSize - 1), Quaternion.Euler(180, 0, 0), transform)); - Nodules.Add(Instantiate(_nodulePrefab, new Vector3(CubeSize + _noduleOffset, CubeSize - 1, CubeSize - 1), Quaternion.Euler(0, 0, 90), transform)); - Nodules.Add(Instantiate(_nodulePrefab, new Vector3(CubeSize - 1, CubeSize - 1, CubeSize + _noduleOffset), Quaternion.Euler(-90, 0, 0), transform)); - - transform.localScale = new Vector3((1f / CubeSize) * 2.5f, (1f / CubeSize) * 2.5f, (1f / CubeSize) * 2.5f); - GameObject center = new GameObject(); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3(0, -1 - _noduleOffset, 0), + Quaternion.identity, + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3(-1 - _noduleOffset, 0, 0), + Quaternion.Euler(0, 0, -90), + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3(0, 0, -1 - _noduleOffset), + Quaternion.Euler(90, 0, 0), + transform + ) + ); + + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3( + CubeSize - 1, + CubeSize + _noduleOffset, + CubeSize - 1 + ), + Quaternion.Euler(180, 0, 0), + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3( + CubeSize + _noduleOffset, + CubeSize - 1, + CubeSize - 1 + ), + Quaternion.Euler(0, 0, 90), + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3( + CubeSize - 1, + CubeSize - 1, + CubeSize + _noduleOffset + ), + Quaternion.Euler(-90, 0, 0), + transform + ) + ); + + transform.localScale = new Vector3( + 1f / CubeSize * 2.5f, + 1f / CubeSize * 2.5f, + 1f / CubeSize * 2.5f + ); + var center = new GameObject(); center.transform.parent = transform; - center.transform.localPosition = new Vector3(CubeSize / 2f - 0.5f, CubeSize / 2f - 0.5f, CubeSize / 2f - 0.5f); + center.transform.localPosition = new Vector3( + CubeSize / 2f - 0.5f, + CubeSize / 2f - 0.5f, + CubeSize / 2f - 0.5f + ); center.transform.parent = null; transform.position = -center.transform.position; Destroy(center); GetComponent().base64MoveEncode = ""; - } + } public void ResetCube() { @@ -85,15 +154,12 @@ public void ResetCube() transform.localScale = Vector3.one; transform.position = Vector3.zero; transform.rotation = Quaternion.identity; - for (int c = 0; c < transform.childCount; c++) - { - if (transform.GetChild(c).tag == "Voxel" || transform.GetChild(c).tag == "Nodule") - { + for (var c = 0; c < transform.childCount; c++) + if (transform.GetChild(c).tag == "Voxel" || + transform.GetChild(c).tag == "Nodule") Destroy(transform.GetChild(c).gameObject); - } - } + GetComponent().AmountCut = 0; Start(); } - -} +} \ No newline at end of file From 7e4a5be0ba3424c44ad92de01d900ee556311054 Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 15:45:50 +0100 Subject: [PATCH 11/13] More cleanup --- Assets/Scripts/ChangeColorOnHover.cs | 10 +- Assets/Scripts/CutOnClick.cs | 1 + Assets/Scripts/OutlineToggle.cs | 14 ++- Assets/Scripts/RotateCube.cs | 10 +- Assets/Scripts/SetVoxelProperties.cs | 43 ++++---- Assets/Scripts/ShowCorrectNumber.cs | 6 -- Assets/Scripts/VoxelMover.cs | 140 +++++++++++++-------------- Assets/Scripts/VoxelSpawner.cs | 21 ++-- 8 files changed, 120 insertions(+), 125 deletions(-) diff --git a/Assets/Scripts/ChangeColorOnHover.cs b/Assets/Scripts/ChangeColorOnHover.cs index 225de5f..6e13943 100644 --- a/Assets/Scripts/ChangeColorOnHover.cs +++ b/Assets/Scripts/ChangeColorOnHover.cs @@ -22,11 +22,11 @@ private void Update() if (Physics.Raycast(ray, out hit)) { - if (hit.transform.gameObject.GetInstanceID() == - gameObject.GetInstanceID()) - _lerpToColor = ToColor; - else - _lerpToColor = _startColor; + var hitId = hit.transform.gameObject.GetInstanceID(); + _lerpToColor + = hitId == gameObject.GetInstanceID() + ? ToColor + : _startColor; } else { diff --git a/Assets/Scripts/CutOnClick.cs b/Assets/Scripts/CutOnClick.cs index c2805fb..f7e78b4 100644 --- a/Assets/Scripts/CutOnClick.cs +++ b/Assets/Scripts/CutOnClick.cs @@ -4,6 +4,7 @@ public class CutOnClick : MonoBehaviour { [SerializeField] [FormerlySerializedAs("forward")] + // ReSharper disable once ConvertToConstant.Local private readonly bool _forward = true; private VoxelMover _cube; diff --git a/Assets/Scripts/OutlineToggle.cs b/Assets/Scripts/OutlineToggle.cs index 31a7d35..258c8fd 100644 --- a/Assets/Scripts/OutlineToggle.cs +++ b/Assets/Scripts/OutlineToggle.cs @@ -7,13 +7,11 @@ public class OutlineToggle : MonoBehaviour public void ToggleOutlines() { _outlineEnabled = !_outlineEnabled; - if (_outlineEnabled) - FindObjectOfType() - .GetComponent() - .sharedMaterial.SetFloat("_FirstOutlineWidth", 0.02f); - else - FindObjectOfType() - .GetComponent() - .sharedMaterial.SetFloat("_FirstOutlineWidth", 0f); + FindObjectOfType() + .GetComponent() + .sharedMaterial.SetFloat( + "_FirstOutlineWidth", + _outlineEnabled ? 0.02f : 0f + ); } } \ No newline at end of file diff --git a/Assets/Scripts/RotateCube.cs b/Assets/Scripts/RotateCube.cs index 0ebf0ac..edd9eeb 100644 --- a/Assets/Scripts/RotateCube.cs +++ b/Assets/Scripts/RotateCube.cs @@ -4,20 +4,22 @@ public class RotateCube : MonoBehaviour { [SerializeField] [FormerlySerializedAs("mouseSensitivity")] + // ReSharper disable once ConvertToConstant.Local private readonly float _mouseSensitivity = 1f; [SerializeField] [FormerlySerializedAs("scrollWheelSensitivity")] + // ReSharper disable once ConvertToConstant.Local private readonly float _scrollWheelSensitivity = 1f; - private Vector3 lastPos = Vector3.zero; + private Vector3 _lastPos = Vector3.zero; private void Update() { - if (Input.GetMouseButtonDown(1)) lastPos = Input.mousePosition; + if (Input.GetMouseButtonDown(1)) _lastPos = Input.mousePosition; if (Input.GetMouseButton(1)) { - var mouseOffset = Input.mousePosition - lastPos; + var mouseOffset = Input.mousePosition - _lastPos; transform.RotateAround( Vector3.zero, Vector3.right, @@ -37,6 +39,6 @@ private void Update() Input.GetAxis("Mouse ScrollWheel") * _scrollWheelSensitivity ); - lastPos = Input.mousePosition; + _lastPos = Input.mousePosition; } } \ No newline at end of file diff --git a/Assets/Scripts/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs index 03f317b..b402ab5 100644 --- a/Assets/Scripts/SetVoxelProperties.cs +++ b/Assets/Scripts/SetVoxelProperties.cs @@ -3,13 +3,15 @@ public class SetVoxelProperties : MonoBehaviour { + private Color _color = Color.black; + [SerializeField] [FormerlySerializedAs("colorBrightness")] - private readonly float _colorBrightness = 0.1f; + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _colorBrightness = 0.1f; private VoxelSpawner _cube; private MaterialPropertyBlock _propBlock; private Renderer _renderer; - private Color color = Color.black; [HideInInspector] public int Number = 1; [HideInInspector] public bool ShowNumber = true; @@ -25,8 +27,8 @@ private void Awake() public void SetColor(Color newColor) { - color = newColor; - _propBlock.SetColor("_Color", color); + _color = newColor; + _propBlock.SetColor("_Color", _color); _propBlock.SetColor("_EmissionColor", NumberToColor(Number)); _propBlock.SetTexture( "_MainTex", @@ -38,24 +40,18 @@ public void SetColor(Color newColor) public void SetNumber(int newNumber, bool doRedraw) { Number = newNumber; - if (doRedraw) - { - _propBlock.SetColor("_Color", NumberToColor(newNumber)); - _propBlock.SetColor("_EmissionColor", NumberToColor(newNumber)); - _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); - if (ShowNumber) - _propBlock.SetTexture( - "_MainTex", - Resources.Load(Number.ToString()) - ); - else - _propBlock.SetTexture( - "_MainTex", - Resources.Load("blank") - ); + if (!doRedraw) return; + _propBlock.SetColor("_Color", NumberToColor(newNumber)); + _propBlock.SetColor("_EmissionColor", NumberToColor(newNumber)); + _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); + _propBlock.SetTexture( + "_MainTex", + ShowNumber + ? Resources.Load(Number.ToString()) + : Resources.Load("blank") + ); - _renderer.SetPropertyBlock(_propBlock); - } + _renderer.SetPropertyBlock(_propBlock); } public void DisplayNumber(int displayNumber) @@ -106,7 +102,8 @@ private Color NumberToColor(int num) private Color OutlineColor() { - if (Transparent) return new Color(0, 0, 0, 0); - return new Color(0, 0, 0, 1); + return Transparent + ? new Color(0, 0, 0, 0) + : new Color(0, 0, 0, 1); } } \ No newline at end of file diff --git a/Assets/Scripts/ShowCorrectNumber.cs b/Assets/Scripts/ShowCorrectNumber.cs index 9e7ca17..9a322f1 100644 --- a/Assets/Scripts/ShowCorrectNumber.cs +++ b/Assets/Scripts/ShowCorrectNumber.cs @@ -2,15 +2,9 @@ public class ShowCorrectNumber : MonoBehaviour { - private VoxelSpawner _cube; private bool _showingNumber; public int CorrectNumber; - private void Start() - { - _cube = FindObjectOfType(); - } - private void Update() { if (Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2) || diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index cd58b49..8e8ab0b 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -5,16 +5,7 @@ public class VoxelMover : MonoBehaviour { - [SerializeField] [FormerlySerializedAs("sliceToggle")] - private readonly Toggle _sliceToggle = default(Toggle); - - [SerializeField] [FormerlySerializedAs("timerButtonText")] - private readonly Text _timerButtonText = default(Text); - - [SerializeField] [FormerlySerializedAs("VoxelHighlighter")] - private readonly GameObject _voxelHighlighter = default(GameObject); - - private readonly Vector3[] directionArray = + private readonly Vector3[] _directionArray = { new Vector3(1, 0, 0), new Vector3(-1, 0, 0), @@ -27,7 +18,6 @@ [SerializeField] [FormerlySerializedAs("VoxelHighlighter")] private bool _alternateSliceDir; private float _cubeSize; - private Vector3 _currentCutDir = Vector3.zero; private bool _doTiming; private Vector3 _highlightedVoxel; @@ -36,22 +26,34 @@ [SerializeField] [FormerlySerializedAs("VoxelHighlighter")] private Vector3 _newPos; + [SerializeField] [FormerlySerializedAs("sliceToggle")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private Toggle _sliceToggle = default(Toggle); + private float _startTime; + [SerializeField] [FormerlySerializedAs("timerButtonText")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private Text _timerButtonText = default(Text); + + [SerializeField] [FormerlySerializedAs("VoxelHighlighter")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private GameObject _voxelHighlighter = default(GameObject); + + private VoxelSpawner _vs; + public int AmountCut; - public string base64MoveEncode = ""; + public string Base64MoveEncode = ""; public Text MovesDisplay; - public Text MPSDisplay; + public Text MpsDisplay; public Text TimeDisplay; - private VoxelSpawner vs; - private void Start() { - vs = FindObjectOfType(); + _vs = FindObjectOfType(); } private void Update() @@ -60,7 +62,7 @@ private void Update() { TimeDisplay.text = "Time: " + (Time.time - _startTime); MovesDisplay.text = "Moves: " + _moves; - MPSDisplay.text = + MpsDisplay.text = "MPS: " + _moves / (Time.time - _startTime); } @@ -91,7 +93,7 @@ private void Update() if (_voxelHighlighter.activeSelf && Input.GetMouseButtonDown(0)) { - _cubeSize = vs.CubeSize; + _cubeSize = _vs.CubeSize; for (var c = 0; c < transform.childCount; c++) if (transform.GetChild(c).tag == "Moved") { @@ -101,7 +103,7 @@ private void Update() if (_doTiming == false) { - base64MoveEncode = Base64Encode((int) _cubeSize); + Base64MoveEncode = Base64Encode((int) _cubeSize); _timerButtonText.text = "Stop Timer"; _startTime = Time.time; _doTiming = true; @@ -112,8 +114,8 @@ private void Update() _moves += 1; var tempReturn = true; - for (var d = 0; d < directionArray.Length; d++) - if (-localNorm == directionArray[d]) + for (var d = 0; d < _directionArray.Length; d++) + if (-localNorm == _directionArray[d]) tempReturn = false; if (tempReturn) @@ -128,20 +130,20 @@ private void Update() PushSlice(_highlightedVoxel, -localNorm); //Base64MoveEncoder - base64MoveEncode += Base64Encode((int) _highlightedVoxel.x) + + Base64MoveEncode += Base64Encode((int) _highlightedVoxel.x) + Base64Encode((int) _highlightedVoxel.y) + Base64Encode((int) _highlightedVoxel.z); - for (var i = 0; i < directionArray.Length; i++) - if (directionArray[i] == -localNorm) - base64MoveEncode += Base64Encode(i); + for (var i = 0; i < _directionArray.Length; i++) + if (_directionArray[i] == -localNorm) + Base64MoveEncode += Base64Encode(i); var stopTimer = true; for (var xi = 0; xi < _cubeSize; xi++) for (var yi = 0; yi < _cubeSize; yi++) for (var zi = 0; zi < _cubeSize; zi++) - if (vs.VoxelArray[xi, yi, zi].Number != - vs.CorrectNumberArray[xi, yi, zi]) + if (_vs.VoxelArray[xi, yi, zi].Number != + _vs.CorrectNumberArray[xi, yi, zi]) stopTimer = false; if (stopTimer) @@ -177,17 +179,17 @@ private void Update() var localNorm = transform.InverseTransformDirection(_newNorm); var highlightUp = Vector3.zero; var highlightRight = Vector3.zero; - if (Mathf.RoundToInt(vec3Abs(localNorm).x) == 1) + if (Mathf.RoundToInt(Vec3Abs(localNorm).x) == 1) { highlightUp = new Vector3(0, 1, 0); highlightRight = new Vector3(0, 0, 1); } - else if (Mathf.RoundToInt(vec3Abs(localNorm).y) == 1) + else if (Mathf.RoundToInt(Vec3Abs(localNorm).y) == 1) { highlightUp = new Vector3(0, 0, 1); highlightRight = new Vector3(1, 0, 0); } - else if (Mathf.RoundToInt(vec3Abs(localNorm).z) == 1) + else if (Mathf.RoundToInt(Vec3Abs(localNorm).z) == 1) { highlightUp = new Vector3(0, 1, 0); highlightRight = new Vector3(1, 0, 0); @@ -231,18 +233,13 @@ public void Restart() public void ToggleSliceMarkers() { - if (_sliceToggle.isOn) - _voxelHighlighter.transform.Find("SliceMarkers") - .gameObject.SetActive(true); - else - _voxelHighlighter.transform.Find("SliceMarkers") - .gameObject.SetActive(false); + _voxelHighlighter.transform.Find("SliceMarkers") + .gameObject.SetActive(_sliceToggle.isOn); } public void CutForward(Vector3 dir) { - _currentCutDir = dir; - _cubeSize = vs.CubeSize; + _cubeSize = _vs.CubeSize; if (AmountCut == (int) _cubeSize - 1) return; var objectsToDeactivate = @@ -251,29 +248,30 @@ public void CutForward(Vector3 dir) for (var yi = 0; yi < _cubeSize; yi++) for (var zi = 0; zi < _cubeSize; zi++) { - SetVoxelProperties beforeVoxel = null; + SetVoxelProperties beforeVoxel; try { - beforeVoxel = vs.VoxelArray[xi - Mathf.RoundToInt(dir.x), + beforeVoxel = _vs.VoxelArray[ + xi - Mathf.RoundToInt(dir.x), yi - Mathf.RoundToInt(dir.y), zi - Mathf.RoundToInt(dir.z)]; } catch { - objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); + objectsToDeactivate.Add(_vs.VoxelArray[xi, yi, zi]); continue; } if (beforeVoxel.Transparent) - objectsToDeactivate.Add(vs.VoxelArray[xi, yi, zi]); + objectsToDeactivate.Add(_vs.VoxelArray[xi, yi, zi]); } objectsToDeactivate.ForEach( - Obj => + obj => { - Obj.transform.parent.GetComponent().enabled = false; - Obj.Transparent = true; - Obj.Redraw(); + obj.transform.parent.GetComponent().enabled = false; + obj.Transparent = true; + obj.Redraw(); } ); @@ -293,7 +291,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) SetVoxelProperties beforeVoxel = null; try { - beforeVoxel = vs.VoxelArray[xi + Mathf.RoundToInt(dir.x), + beforeVoxel = _vs.VoxelArray[xi + Mathf.RoundToInt(dir.x), yi + Mathf.RoundToInt(dir.y), zi + Mathf.RoundToInt(dir.z)]; } @@ -303,15 +301,15 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) } if (!beforeVoxel.Transparent) - objectsToActivate.Add(vs.VoxelArray[xi, yi, zi]); + objectsToActivate.Add(_vs.VoxelArray[xi, yi, zi]); } objectsToActivate.ForEach( - Obj => + obj => { - Obj.transform.parent.GetComponent().enabled = true; - Obj.Transparent = false; - Obj.Redraw(); + obj.transform.parent.GetComponent().enabled = true; + obj.Transparent = false; + obj.Redraw(); } ); @@ -324,7 +322,7 @@ public void CutBackward(Vector3 dir, bool resetNodulesOnZero) private void PushRow(Vector3 touched, Vector3 dir, bool fancy) { - _cubeSize = vs.CubeSize; + _cubeSize = _vs.CubeSize; for (var i = 0; i < _cubeSize + 1; i++) if (FindVoxelByPos(touched - dir * i) == null) @@ -338,7 +336,7 @@ private void PushRow(Vector3 touched, Vector3 dir, bool fancy) { var pos = touched + dir * i; tempNumArray.Add( - vs.VoxelArray[Mathf.RoundToInt(pos.x), + _vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)] .Number @@ -350,12 +348,12 @@ private void PushRow(Vector3 touched, Vector3 dir, bool fancy) { var pos = touched + dir * i; if (i == 0) - vs.VoxelArray[Mathf.RoundToInt(pos.x), + _vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)] .SetNumber(tempNumArray[tempNumArray.Count - 1], fancy); else - vs.VoxelArray[Mathf.RoundToInt(pos.x), + _vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)] .SetNumber(tempNumArray[i - 1], fancy); @@ -371,17 +369,17 @@ private void PushSlice(Vector3 touched, Vector3 dir) //HACKY var highlightUp = Vector3.zero; var highlightRight = Vector3.zero; - if (Mathf.RoundToInt(vec3Abs(dir).x) == 1) + if (Mathf.RoundToInt(Vec3Abs(dir).x) == 1) { highlightUp = new Vector3(0, 1, 0); highlightRight = new Vector3(0, 0, 1); } - else if (Mathf.RoundToInt(vec3Abs(dir).y) == 1) + else if (Mathf.RoundToInt(Vec3Abs(dir).y) == 1) { highlightUp = new Vector3(0, 0, 1); highlightRight = new Vector3(1, 0, 0); } - else if (Mathf.RoundToInt(vec3Abs(dir).z) == 1) + else if (Mathf.RoundToInt(Vec3Abs(dir).z) == 1) { highlightUp = new Vector3(0, 1, 0); highlightRight = new Vector3(1, 0, 0); @@ -394,7 +392,7 @@ private void PushSlice(Vector3 touched, Vector3 dir) else sliceDir = highlightRight; - _cubeSize = vs.CubeSize; + _cubeSize = _vs.CubeSize; for (var i = 0; i < _cubeSize + 1; i++) if (FindVoxelByPos(_highlightedVoxel - sliceDir * i) == null) @@ -407,21 +405,21 @@ private void PushSlice(Vector3 touched, Vector3 dir) PushRow(_highlightedVoxel + sliceDir * i, dir, true); } - private Vector3 floorVec3ToInt(Vector3 in_vec) + private Vector3 FloorVec3ToInt(Vector3 inVec) { return new Vector3( - Mathf.FloorToInt(in_vec.x), - Mathf.FloorToInt(in_vec.y), - Mathf.FloorToInt(in_vec.z) + Mathf.FloorToInt(inVec.x), + Mathf.FloorToInt(inVec.y), + Mathf.FloorToInt(inVec.z) ); } - private Vector3 vec3Abs(Vector3 in_vec) + private Vector3 Vec3Abs(Vector3 inVec) { return new Vector3( - Mathf.Abs(in_vec.x), - Mathf.Abs(in_vec.y), - Mathf.Abs(in_vec.z) + Mathf.Abs(inVec.x), + Mathf.Abs(inVec.y), + Mathf.Abs(inVec.z) ); } @@ -438,7 +436,7 @@ private Transform FindVoxelByPos(Vector3 pos) try { - return vs.VoxelArray[Mathf.RoundToInt(pos.x), + return _vs.VoxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)] .transform; @@ -462,9 +460,9 @@ private void ScrambleOne(bool end) if (transform.GetChild(randVoxel).tag == "Voxel") PushRow( transform.GetChild(randVoxel).localPosition, - directionArray[Random.Range( + _directionArray[Random.Range( 0, - directionArray.Length - 1 + _directionArray.Length - 1 )], end ); diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index 8bcc5f4..2ce960c 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -6,20 +6,25 @@ public class VoxelSpawner : MonoBehaviour { [SerializeField] [FormerlySerializedAs("cubeSizeInput")] - private readonly InputField _cubeSizeInput = null; + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private InputField _cubeSizeInput = null; [SerializeField] [FormerlySerializedAs("noduleOffset")] - private readonly float _noduleOffset = 0.2f; + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _noduleOffset = 0.2f; [SerializeField] [FormerlySerializedAs("nodulePrefab")] - private readonly GameObject _nodulePrefab = null; - - [SerializeField] [FormerlySerializedAs("voxelPrefab")] - private readonly GameObject _voxelPrefab = null; + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private GameObject _nodulePrefab = null; [SerializeField] [FormerlySerializedAs("textures")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local private Texture2D[] _textures; + [SerializeField] [FormerlySerializedAs("voxelPrefab")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private GameObject _voxelPrefab = null; + public int CubeSize; public List Nodules; @@ -142,14 +147,14 @@ private void Start() transform.position = -center.transform.position; Destroy(center); - GetComponent().base64MoveEncode = ""; + GetComponent().Base64MoveEncode = ""; } public void ResetCube() { GetComponent().TimeDisplay.text = "Time: 0"; GetComponent().MovesDisplay.text = "Moves: 0"; - GetComponent().MPSDisplay.text = "MPS: 0"; + GetComponent().MpsDisplay.text = "MPS: 0"; GetComponent().Restart(); transform.localScale = Vector3.one; transform.position = Vector3.zero; From cca7368ce543691b8c298f38108cbebbb52bd61b Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 16:54:25 +0100 Subject: [PATCH 12/13] Fixed some resharper errors that occured due to Unity Compatibility not being updated yet --- Assets/Scripts/ChangeColorOnHover.cs | 3 +-- Assets/Scripts/CutOnClick.cs | 4 ++-- Assets/Scripts/RotateCube.cs | 8 ++++---- Assets/Scripts/VoxelMover.cs | 4 +++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/ChangeColorOnHover.cs b/Assets/Scripts/ChangeColorOnHover.cs index 6e13943..75b4352 100644 --- a/Assets/Scripts/ChangeColorOnHover.cs +++ b/Assets/Scripts/ChangeColorOnHover.cs @@ -23,8 +23,7 @@ private void Update() if (Physics.Raycast(ray, out hit)) { var hitId = hit.transform.gameObject.GetInstanceID(); - _lerpToColor - = hitId == gameObject.GetInstanceID() + _lerpToColor = hitId == gameObject.GetInstanceID() ? ToColor : _startColor; } diff --git a/Assets/Scripts/CutOnClick.cs b/Assets/Scripts/CutOnClick.cs index f7e78b4..0da38ce 100644 --- a/Assets/Scripts/CutOnClick.cs +++ b/Assets/Scripts/CutOnClick.cs @@ -4,8 +4,8 @@ public class CutOnClick : MonoBehaviour { [SerializeField] [FormerlySerializedAs("forward")] - // ReSharper disable once ConvertToConstant.Local - private readonly bool _forward = true; + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private bool _forward = true; private VoxelMover _cube; diff --git a/Assets/Scripts/RotateCube.cs b/Assets/Scripts/RotateCube.cs index edd9eeb..f8df0bf 100644 --- a/Assets/Scripts/RotateCube.cs +++ b/Assets/Scripts/RotateCube.cs @@ -4,12 +4,12 @@ public class RotateCube : MonoBehaviour { [SerializeField] [FormerlySerializedAs("mouseSensitivity")] - // ReSharper disable once ConvertToConstant.Local - private readonly float _mouseSensitivity = 1f; + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _mouseSensitivity = 1f; [SerializeField] [FormerlySerializedAs("scrollWheelSensitivity")] - // ReSharper disable once ConvertToConstant.Local - private readonly float _scrollWheelSensitivity = 1f; + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _scrollWheelSensitivity = 1f; private Vector3 _lastPos = Vector3.zero; diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs index 8e8ab0b..c983583 100644 --- a/Assets/Scripts/VoxelMover.cs +++ b/Assets/Scripts/VoxelMover.cs @@ -46,9 +46,11 @@ [SerializeField] [FormerlySerializedAs("VoxelHighlighter")] public string Base64MoveEncode = ""; + [FormerlySerializedAs("movesDisplay")] public Text MovesDisplay; + [FormerlySerializedAs("MPSDisplay")] public Text MpsDisplay; - + [FormerlySerializedAs("timeDisplay")] public Text TimeDisplay; private void Start() From 7a0c5de00f1619c18621e4fcdb8d7b1b79c7f91e Mon Sep 17 00:00:00 2001 From: ITR Date: Mon, 31 Dec 2018 17:38:39 +0100 Subject: [PATCH 13/13] Added rotating cube to face by using number keys --- Assets/Scenes/Main.unity | 1037 +++++++++++++++++++------------- Assets/Scripts/RotateCube.cs | 25 +- Assets/Scripts/VoxelSpawner.cs | 8 +- 3 files changed, 658 insertions(+), 412 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 333b703..16b8506 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -114,7 +113,7 @@ NavMeshSettings: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1001 &12804087 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -165,18 +164,20 @@ Prefab: value: 0.75 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c98514e0c536df142ad9e62b1ad457a4, type: 3} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: c98514e0c536df142ad9e62b1ad457a4, type: 3} --- !u!4 &12804088 stripped Transform: - m_PrefabParentObject: {fileID: 400000, guid: c98514e0c536df142ad9e62b1ad457a4, type: 3} - m_PrefabInternal: {fileID: 12804087} + m_CorrespondingSourceObject: {fileID: 400000, guid: c98514e0c536df142ad9e62b1ad457a4, + type: 3} + m_PrefabInstance: {fileID: 12804087} + m_PrefabAsset: {fileID: 0} --- !u!1 &59373408 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 59373409} - component: {fileID: 59373411} @@ -191,8 +192,9 @@ GameObject: --- !u!224 &59373409 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59373408} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -211,8 +213,9 @@ RectTransform: --- !u!114 &59373410 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59373408} m_Enabled: 1 m_EditorHideFlags: 0 @@ -244,15 +247,18 @@ MonoBehaviour: --- !u!222 &59373411 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59373408} + m_CullTransparentMesh: 0 --- !u!1 &81369165 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 81369166} - component: {fileID: 81369168} @@ -267,8 +273,9 @@ GameObject: --- !u!224 &81369166 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81369165} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -285,8 +292,9 @@ RectTransform: --- !u!114 &81369167 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81369165} m_Enabled: 1 m_EditorHideFlags: 0 @@ -318,15 +326,18 @@ MonoBehaviour: --- !u!222 &81369168 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81369165} + m_CullTransparentMesh: 0 --- !u!1 &99743792 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 99743793} - component: {fileID: 99743795} @@ -341,8 +352,9 @@ GameObject: --- !u!224 &99743793 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99743792} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -359,8 +371,9 @@ RectTransform: --- !u!114 &99743794 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99743792} m_Enabled: 1 m_EditorHideFlags: 0 @@ -383,18 +396,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &99743795 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99743792} + m_CullTransparentMesh: 0 --- !u!1 &154530391 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 154530395} - component: {fileID: 154530394} @@ -410,8 +427,9 @@ GameObject: --- !u!114 &154530392 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_Enabled: 1 m_EditorHideFlags: 0 @@ -426,8 +444,9 @@ MonoBehaviour: --- !u!114 &154530393 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_Enabled: 1 m_EditorHideFlags: 0 @@ -447,8 +466,9 @@ MonoBehaviour: --- !u!223 &154530394 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_Enabled: 1 serializedVersion: 3 @@ -467,8 +487,9 @@ Canvas: --- !u!224 &154530395 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -499,9 +520,10 @@ RectTransform: --- !u!1 &268802747 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 268802748} - component: {fileID: 268802750} @@ -516,8 +538,9 @@ GameObject: --- !u!224 &268802748 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268802747} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -534,8 +557,9 @@ RectTransform: --- !u!114 &268802749 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268802747} m_Enabled: 1 m_EditorHideFlags: 0 @@ -567,15 +591,18 @@ MonoBehaviour: --- !u!222 &268802750 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268802747} + m_CullTransparentMesh: 0 --- !u!1 &282840810 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 282840814} - component: {fileID: 282840813} @@ -590,20 +617,27 @@ GameObject: --- !u!81 &282840811 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_Enabled: 1 --- !u!20 &282840813 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.0627451, g: 0.1254902, b: 0.15294118, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -633,8 +667,9 @@ Camera: --- !u!4 &282840814 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -5} @@ -646,9 +681,10 @@ Transform: --- !u!1 &347405215 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 347405216} m_Layer: 0 @@ -661,8 +697,9 @@ GameObject: --- !u!4 &347405216 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 347405215} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -676,9 +713,10 @@ Transform: --- !u!1 &350318796 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 350318797} - component: {fileID: 350318800} @@ -694,8 +732,9 @@ GameObject: --- !u!224 &350318797 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -713,8 +752,9 @@ RectTransform: --- !u!114 &350318798 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} m_Enabled: 1 m_EditorHideFlags: 0 @@ -765,8 +805,9 @@ MonoBehaviour: --- !u!114 &350318799 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} m_Enabled: 1 m_EditorHideFlags: 0 @@ -789,18 +830,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &350318800 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} + m_CullTransparentMesh: 0 --- !u!1 &390043173 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 390043174} - component: {fileID: 390043176} @@ -815,8 +860,9 @@ GameObject: --- !u!224 &390043174 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390043173} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -827,14 +873,15 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 104.1, y: -37.9} + m_AnchoredPosition: {x: 104.1, y: -37.899902} m_SizeDelta: {x: 79.77, y: 41.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &390043175 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390043173} m_Enabled: 1 m_EditorHideFlags: 0 @@ -866,15 +913,18 @@ MonoBehaviour: --- !u!222 &390043176 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390043173} + m_CullTransparentMesh: 0 --- !u!1 &428167310 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 428167311} - component: {fileID: 428167313} @@ -889,8 +939,9 @@ GameObject: --- !u!224 &428167311 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428167310} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -907,8 +958,9 @@ RectTransform: --- !u!114 &428167312 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428167310} m_Enabled: 1 m_EditorHideFlags: 0 @@ -934,7 +986,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 'Right Click + Drag: @@ -958,19 +1010,27 @@ MonoBehaviour: R (In Slice Push Mode): - Alternate slice direction' + Alternate slice direction + + + Number Keys: + + Rotate Cube to Face' --- !u!222 &428167313 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428167310} + m_CullTransparentMesh: 0 --- !u!1 &449400619 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 449400620} - component: {fileID: 449400622} @@ -985,8 +1045,9 @@ GameObject: --- !u!224 &449400620 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449400619} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1003,8 +1064,9 @@ RectTransform: --- !u!114 &449400621 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449400619} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1036,15 +1098,18 @@ MonoBehaviour: --- !u!222 &449400622 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449400619} + m_CullTransparentMesh: 0 --- !u!1 &537953202 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 537953203} - component: {fileID: 537953205} @@ -1059,8 +1124,9 @@ GameObject: --- !u!224 &537953203 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537953202} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1077,8 +1143,9 @@ RectTransform: --- !u!114 &537953204 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537953202} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1110,15 +1177,18 @@ MonoBehaviour: --- !u!222 &537953205 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537953202} + m_CullTransparentMesh: 0 --- !u!1 &554361993 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 554361994} - component: {fileID: 554361996} @@ -1133,8 +1203,9 @@ GameObject: --- !u!224 &554361994 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554361993} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1152,8 +1223,9 @@ RectTransform: --- !u!114 &554361995 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554361993} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1176,18 +1248,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &554361996 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554361993} + m_CullTransparentMesh: 0 --- !u!1 &657444041 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 657444042} m_Layer: 0 @@ -1200,8 +1276,9 @@ GameObject: --- !u!4 &657444042 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 657444041} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1215,9 +1292,10 @@ Transform: --- !u!1 &809175372 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 809175373} - component: {fileID: 809175375} @@ -1232,8 +1310,9 @@ GameObject: --- !u!224 &809175373 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809175372} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1244,14 +1323,15 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 97.6001, y: -126.600006} + m_AnchoredPosition: {x: 97.6001, y: -126.6001} m_SizeDelta: {x: 152.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &809175374 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809175372} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1283,15 +1363,18 @@ MonoBehaviour: --- !u!222 &809175375 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809175372} + m_CullTransparentMesh: 0 --- !u!1 &833310158 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 833310159} - component: {fileID: 833310161} @@ -1306,8 +1389,9 @@ GameObject: --- !u!224 &833310159 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833310158} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1324,8 +1408,9 @@ RectTransform: --- !u!114 &833310160 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833310158} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1357,15 +1442,18 @@ MonoBehaviour: --- !u!222 &833310161 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833310158} + m_CullTransparentMesh: 0 --- !u!1 &970895259 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 970895260} - component: {fileID: 970895262} @@ -1380,8 +1468,9 @@ GameObject: --- !u!224 &970895260 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970895259} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1398,8 +1487,9 @@ RectTransform: --- !u!114 &970895261 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970895259} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1431,15 +1521,18 @@ MonoBehaviour: --- !u!222 &970895262 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970895259} + m_CullTransparentMesh: 0 --- !u!1 &1019371023 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1019371024} - component: {fileID: 1019371027} @@ -1455,8 +1548,9 @@ GameObject: --- !u!224 &1019371024 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1475,8 +1569,9 @@ RectTransform: --- !u!114 &1019371025 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1538,8 +1633,9 @@ MonoBehaviour: --- !u!114 &1019371026 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1562,18 +1658,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1019371027 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} + m_CullTransparentMesh: 0 --- !u!1 &1042185950 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1042185951} - component: {fileID: 1042185953} @@ -1588,8 +1688,9 @@ GameObject: --- !u!224 &1042185951 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042185950} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1607,8 +1708,9 @@ RectTransform: --- !u!114 &1042185952 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042185950} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1631,18 +1733,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1042185953 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042185950} + m_CullTransparentMesh: 0 --- !u!1 &1045097593 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1045097594} - component: {fileID: 1045097597} @@ -1658,8 +1764,9 @@ GameObject: --- !u!224 &1045097594 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1677,8 +1784,9 @@ RectTransform: --- !u!114 &1045097595 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1729,8 +1837,9 @@ MonoBehaviour: --- !u!114 &1045097596 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1753,18 +1862,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1045097597 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} + m_CullTransparentMesh: 0 --- !u!1 &1070507235 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1070507236} - component: {fileID: 1070507239} @@ -1780,8 +1893,9 @@ GameObject: --- !u!224 &1070507236 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1799,8 +1913,9 @@ RectTransform: --- !u!114 &1070507237 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1851,8 +1966,9 @@ MonoBehaviour: --- !u!114 &1070507238 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1875,18 +1991,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1070507239 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} + m_CullTransparentMesh: 0 --- !u!1 &1098131446 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1098131449} - component: {fileID: 1098131448} @@ -1901,8 +2021,9 @@ GameObject: --- !u!114 &1098131447 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098131446} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1919,8 +2040,9 @@ MonoBehaviour: --- !u!114 &1098131448 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098131446} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1933,8 +2055,9 @@ MonoBehaviour: --- !u!4 &1098131449 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098131446} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1946,9 +2069,10 @@ Transform: --- !u!1 &1113746190 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1113746191} - component: {fileID: 1113746193} @@ -1963,8 +2087,9 @@ GameObject: --- !u!224 &1113746191 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113746190} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1981,8 +2106,9 @@ RectTransform: --- !u!114 &1113746192 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113746190} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2014,15 +2140,18 @@ MonoBehaviour: --- !u!222 &1113746193 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113746190} + m_CullTransparentMesh: 0 --- !u!1 &1114387945 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1114387946} - component: {fileID: 1114387950} @@ -2038,8 +2167,9 @@ GameObject: --- !u!4 &1114387946 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2052,61 +2182,65 @@ Transform: --- !u!114 &1114387947 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 24d6d028a115b63498e516387b034068, type: 3} m_Name: m_EditorClassIdentifier: - voxelPrefab: {fileID: 1858495366900724, guid: 1b47cf94056d9d14f918731a659eff9b, - type: 2} - nodulePrefab: {fileID: 1447001498371202, guid: 73ff7c8e463a803468b53d92149b5eed, - type: 2} - cubeSizeInput: {fileID: 1019371025} - noduleOffset: 0.2 - cubeSize: 4 - nodules: [] - textures: [] + _cubeSizeInput: {fileID: 1019371025} + _noduleOffset: 0.2 + _nodulePrefab: {fileID: 1447001498371202, guid: 73ff7c8e463a803468b53d92149b5eed, + type: 3} + _textures: [] + _voxelPrefab: {fileID: 1858495366900724, guid: 1b47cf94056d9d14f918731a659eff9b, + type: 3} + CubeSize: 0 + Nodules: [] --- !u!114 &1114387948 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 987bf3435e12e7f4b8cf9460e2c733a6, type: 3} m_Name: m_EditorClassIdentifier: - VoxelHighlighter: {fileID: 347405215} - timeDisplay: {fileID: 1833866638} - movesDisplay: {fileID: 2052951257} - MPSDisplay: {fileID: 1113746192} - timerButtonText: {fileID: 449400621} - sliceToggle: {fileID: 1896405177} - amountCut: 0 - base64MoveEncode: + _sliceToggle: {fileID: 1896405177} + _timerButtonText: {fileID: 449400621} + _voxelHighlighter: {fileID: 347405215} + AmountCut: 0 + Base64MoveEncode: + MovesDisplay: {fileID: 2052951257} + MpsDisplay: {fileID: 1113746192} + TimeDisplay: {fileID: 1833866638} --- !u!114 &1114387950 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 52b53a205b9f51a43be8088bacd0ee59, type: 3} m_Name: m_EditorClassIdentifier: - mouseSensitivity: 1 - scrollWheelSensitivity: 50 + _mouseSensitivity: 1 + _scrollWheelSensitivity: 50 --- !u!1 &1120225737 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1120225738} - component: {fileID: 1120225741} @@ -2122,8 +2256,9 @@ GameObject: --- !u!4 &1120225738 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0.8, y: 0.5, z: 0} @@ -2135,8 +2270,9 @@ Transform: --- !u!136 &1120225739 CapsuleCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2148,8 +2284,9 @@ CapsuleCollider: --- !u!23 &1120225740 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_Enabled: 1 m_CastShadows: 1 @@ -2159,6 +2296,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: be6fce174d4a8a7448f01196b7bb93df, type: 2} m_StaticBatchInfo: @@ -2183,16 +2321,18 @@ MeshRenderer: --- !u!33 &1120225741 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1166394406 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1166394407} - component: {fileID: 1166394409} @@ -2207,8 +2347,9 @@ GameObject: --- !u!224 &1166394407 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166394406} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2225,8 +2366,9 @@ RectTransform: --- !u!114 &1166394408 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166394406} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2249,18 +2391,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1166394409 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166394406} + m_CullTransparentMesh: 0 --- !u!1 &1195483096 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1195483097} - component: {fileID: 1195483099} @@ -2275,8 +2421,9 @@ GameObject: --- !u!224 &1195483097 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195483096} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2295,20 +2442,22 @@ RectTransform: --- !u!114 &1195483098 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195483096} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ae14794e4b9cdd941bf620b017ba389a, type: 3} m_Name: m_EditorClassIdentifier: - numberEnabled: 1 + NumberEnabled: 1 --- !u!114 &1195483099 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195483096} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2363,9 +2512,10 @@ MonoBehaviour: --- !u!1 &1373506339 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1373506340} - component: {fileID: 1373506342} @@ -2380,8 +2530,9 @@ GameObject: --- !u!224 &1373506340 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373506339} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2398,8 +2549,9 @@ RectTransform: --- !u!114 &1373506341 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373506339} m_Enabled: 0 m_EditorHideFlags: 0 @@ -2431,15 +2583,18 @@ MonoBehaviour: --- !u!222 &1373506342 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373506339} + m_CullTransparentMesh: 0 --- !u!1 &1382206521 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1382206522} - component: {fileID: 1382206524} @@ -2454,8 +2609,9 @@ GameObject: --- !u!224 &1382206522 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382206521} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2475,8 +2631,9 @@ RectTransform: --- !u!114 &1382206523 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382206521} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2499,18 +2656,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1382206524 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382206521} + m_CullTransparentMesh: 0 --- !u!1 &1483598027 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1483598028} - component: {fileID: 1483598030} @@ -2525,8 +2686,9 @@ GameObject: --- !u!224 &1483598028 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483598027} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2543,8 +2705,9 @@ RectTransform: --- !u!114 &1483598029 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483598027} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2576,15 +2739,18 @@ MonoBehaviour: --- !u!222 &1483598030 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483598027} + m_CullTransparentMesh: 0 --- !u!1 &1551487403 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1551487404} - component: {fileID: 1551487405} @@ -2599,8 +2765,9 @@ GameObject: --- !u!224 &1551487404 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551487403} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2619,8 +2786,9 @@ RectTransform: --- !u!114 &1551487405 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551487403} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2675,8 +2843,9 @@ MonoBehaviour: --- !u!114 &1551487406 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551487403} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2686,9 +2855,10 @@ MonoBehaviour: --- !u!1 &1563078044 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1563078045} - component: {fileID: 1563078047} @@ -2703,8 +2873,9 @@ GameObject: --- !u!224 &1563078045 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563078044} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2721,8 +2892,9 @@ RectTransform: --- !u!114 &1563078046 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563078044} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2754,15 +2926,18 @@ MonoBehaviour: --- !u!222 &1563078047 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563078044} + m_CullTransparentMesh: 0 --- !u!1 &1576558608 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1576558609} - component: {fileID: 1576558611} @@ -2777,8 +2952,9 @@ GameObject: --- !u!224 &1576558609 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576558608} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2795,8 +2971,9 @@ RectTransform: --- !u!114 &1576558610 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576558608} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2828,15 +3005,18 @@ MonoBehaviour: --- !u!222 &1576558611 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576558608} + m_CullTransparentMesh: 0 --- !u!1 &1703125874 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1703125875} - component: {fileID: 1703125878} @@ -2852,8 +3032,9 @@ GameObject: --- !u!4 &1703125875 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.8, y: 0.5, z: 0} @@ -2865,8 +3046,9 @@ Transform: --- !u!136 &1703125876 CapsuleCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2878,8 +3060,9 @@ CapsuleCollider: --- !u!23 &1703125877 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_Enabled: 1 m_CastShadows: 1 @@ -2889,6 +3072,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: be6fce174d4a8a7448f01196b7bb93df, type: 2} m_StaticBatchInfo: @@ -2913,16 +3097,18 @@ MeshRenderer: --- !u!33 &1703125878 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1730922578 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1730922579} - component: {fileID: 1730922581} @@ -2937,8 +3123,9 @@ GameObject: --- !u!224 &1730922579 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1730922578} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2955,8 +3142,9 @@ RectTransform: --- !u!114 &1730922580 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1730922578} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2988,15 +3176,18 @@ MonoBehaviour: --- !u!222 &1730922581 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1730922578} + m_CullTransparentMesh: 0 --- !u!1 &1734698203 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1734698204} - component: {fileID: 1734698206} @@ -3011,8 +3202,9 @@ GameObject: --- !u!224 &1734698204 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734698203} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3030,8 +3222,9 @@ RectTransform: --- !u!114 &1734698205 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734698203} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3054,18 +3247,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1734698206 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734698203} + m_CullTransparentMesh: 0 --- !u!1 &1747178639 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1747178640} - component: {fileID: 1747178642} @@ -3080,8 +3277,9 @@ GameObject: --- !u!224 &1747178640 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747178639} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3098,8 +3296,9 @@ RectTransform: --- !u!114 &1747178641 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747178639} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3122,18 +3321,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1747178642 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747178639} + m_CullTransparentMesh: 0 --- !u!1 &1833866636 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1833866637} - component: {fileID: 1833866639} @@ -3148,8 +3351,9 @@ GameObject: --- !u!224 &1833866637 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833866636} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3166,8 +3370,9 @@ RectTransform: --- !u!114 &1833866638 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833866636} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3199,15 +3404,18 @@ MonoBehaviour: --- !u!222 &1833866639 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833866636} + m_CullTransparentMesh: 0 --- !u!1 &1896405174 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1896405175} - component: {fileID: 1896405177} @@ -3222,8 +3430,9 @@ GameObject: --- !u!224 &1896405175 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896405174} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3242,20 +3451,22 @@ RectTransform: --- !u!114 &1896405176 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896405174} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ae14794e4b9cdd941bf620b017ba389a, type: 3} m_Name: m_EditorClassIdentifier: - numberEnabled: 1 + NumberEnabled: 1 --- !u!114 &1896405177 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896405174} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3310,9 +3521,10 @@ MonoBehaviour: --- !u!1 &2052951255 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2052951256} - component: {fileID: 2052951258} @@ -3327,8 +3539,9 @@ GameObject: --- !u!224 &2052951256 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052951255} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3345,8 +3558,9 @@ RectTransform: --- !u!114 &2052951257 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052951255} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3378,15 +3592,18 @@ MonoBehaviour: --- !u!222 &2052951258 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052951255} + m_CullTransparentMesh: 0 --- !u!1 &2099384730 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2099384731} - component: {fileID: 2099384733} @@ -3401,8 +3618,9 @@ GameObject: --- !u!224 &2099384731 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099384730} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3419,8 +3637,9 @@ RectTransform: --- !u!114 &2099384732 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099384730} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3452,6 +3671,8 @@ MonoBehaviour: --- !u!222 &2099384733 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099384730} + m_CullTransparentMesh: 0 diff --git a/Assets/Scripts/RotateCube.cs b/Assets/Scripts/RotateCube.cs index f8df0bf..b52eb9f 100644 --- a/Assets/Scripts/RotateCube.cs +++ b/Assets/Scripts/RotateCube.cs @@ -3,16 +3,25 @@ public class RotateCube : MonoBehaviour { - [SerializeField] [FormerlySerializedAs("mouseSensitivity")] + [SerializeField] + [FormerlySerializedAs("mouseSensitivity")] // ReSharper disable once FieldCanBeMadeReadOnly.Local private float _mouseSensitivity = 1f; - [SerializeField] [FormerlySerializedAs("scrollWheelSensitivity")] + [SerializeField] + [FormerlySerializedAs("scrollWheelSensitivity")] // ReSharper disable once FieldCanBeMadeReadOnly.Local private float _scrollWheelSensitivity = 1f; + private VoxelSpawner _voxelSpawner; private Vector3 _lastPos = Vector3.zero; + private void Start() + { + _voxelSpawner = GetComponent(); + } + + private void Update() { if (Input.GetMouseButtonDown(1)) _lastPos = Input.mousePosition; @@ -40,5 +49,17 @@ private void Update() ); _lastPos = Input.mousePosition; + + for (int i = 0; i < 6; i++) + { + if (Input.GetKeyDown(KeyCode.Alpha1 + i)) + { + Vector3 vector = Vector3.zero; + vector[(i + 2) % 3] = i < 3 ? 1 : -1; + transform.forward = vector; + transform.position = Vector3.zero; + _voxelSpawner.CenterCube(); + } + } } } \ No newline at end of file diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs index 2ce960c..bd7196a 100644 --- a/Assets/Scripts/VoxelSpawner.cs +++ b/Assets/Scripts/VoxelSpawner.cs @@ -136,6 +136,12 @@ private void Start() 1f / CubeSize * 2.5f, 1f / CubeSize * 2.5f ); + CenterCube(); + GetComponent().Base64MoveEncode = ""; + } + + public void CenterCube() + { var center = new GameObject(); center.transform.parent = transform; center.transform.localPosition = new Vector3( @@ -146,8 +152,6 @@ private void Start() center.transform.parent = null; transform.position = -center.transform.position; Destroy(center); - - GetComponent().Base64MoveEncode = ""; } public void ResetCube()