diff --git a/Assets/Scenes/5-RiftRaid.unity b/Assets/Scenes/5-RiftRaid.unity index ce58c7c6..3e7c91d6 100644 --- a/Assets/Scenes/5-RiftRaid.unity +++ b/Assets/Scenes/5-RiftRaid.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.06424892, g: 0.12860116, b: 0.13426697, a: 1} + m_IndirectSpecularColor: {r: 0.02749148, g: 0.05776922, b: 0.060655944, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -790,8 +790,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 134944216} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.040000916, z: 0} - m_LocalScale: {x: 6, y: 1, z: 6} + m_LocalPosition: {x: 27.5, y: 0.040000916, z: 27.5} + m_LocalScale: {x: 7, y: 1, z: 7} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1175936220} @@ -1306,7 +1306,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &237057714 Transform: m_ObjectHideFlags: 0 @@ -1348,7 +1348,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &248450006 Transform: m_ObjectHideFlags: 0 @@ -1786,7 +1786,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &340524202 Transform: m_ObjectHideFlags: 0 @@ -2863,7 +2863,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &556373958 Transform: m_ObjectHideFlags: 0 @@ -3415,6 +3415,74 @@ Transform: m_CorrespondingSourceObject: {fileID: 5740706088277981957, guid: 48ce0dab15dcddb4495c7a5a09fa4dfa, type: 3} m_PrefabInstance: {fileID: 637271318} m_PrefabAsset: {fileID: 0} +--- !u!1 &637323087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 637323089} + - component: {fileID: 637323088} + m_Layer: 0 + m_Name: WFCGenerator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &637323088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637323087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c1a1ca9b18823d42ab7bb08d8f5ba37, type: 3} + m_Name: + m_EditorClassIdentifier: + chunkCompatibilityMatrix: {fileID: 2019242170} + mapParent: {fileID: 637323089} + gridWidth: 15 + gridHeight: 15 + chunkSizeX: 4 + chunkSizeZ: 4 + seed: 0 + randomizeSeed: 1 + closedBorders: 1 + delayAwait: 1 + delayCoroutine: 0.001 + branchFrequency: 0.3 + branchLengthMin: 2 + branchLengthMax: 4 + startEndPairs: + - start: {fileID: 1360312207} + end: {fileID: 2033486273} + - start: {fileID: 2033486273} + end: {fileID: 1360312207} + - start: {fileID: 2034774969} + end: {fileID: 854122134} + - start: {fileID: 854122134} + end: {fileID: 2034774969} + enforceMainPath: 1 +--- !u!4 &637323089 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637323087} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &638709670 GameObject: m_ObjectHideFlags: 0 @@ -3582,7 +3650,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &648452233 Transform: m_ObjectHideFlags: 0 @@ -3888,7 +3956,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &688442111 Transform: m_ObjectHideFlags: 0 @@ -4545,7 +4613,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &795019769 Transform: m_ObjectHideFlags: 0 @@ -5094,6 +5162,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 851517553} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &854122133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 854122134} + m_Layer: 0 + m_Name: bot right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &854122134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854122133} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 13, y: 0, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1930129393} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &865689403 PrefabInstance: m_ObjectHideFlags: 0 @@ -5942,7 +6041,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1075813283 Transform: m_ObjectHideFlags: 0 @@ -6689,7 +6788,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1170482197 Transform: m_ObjectHideFlags: 0 @@ -6942,7 +7041,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1265395838 Transform: m_ObjectHideFlags: 0 @@ -7657,6 +7756,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 5740706088277981957, guid: 48ce0dab15dcddb4495c7a5a09fa4dfa, type: 3} m_PrefabInstance: {fileID: 1360162934} m_PrefabAsset: {fileID: 0} +--- !u!1 &1360312206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1360312207} + m_Layer: 0 + m_Name: bot left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1360312207 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360312206} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 0, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1930129393} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1374779896 GameObject: m_ObjectHideFlags: 0 @@ -8100,7 +8230,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1437851255 Transform: m_ObjectHideFlags: 0 @@ -8971,7 +9101,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1707409587} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 15, y: 0, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10418,6 +10548,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1924587607} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1930129392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1930129393} + m_Layer: 0 + m_Name: PossiblePlayerSpawnPoints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1930129393 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1930129392} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1360312207} + - {fileID: 2034774969} + - {fileID: 2033486273} + - {fileID: 854122134} + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1944075520 PrefabInstance: m_ObjectHideFlags: 0 @@ -10876,6 +11041,83 @@ Transform: m_CorrespondingSourceObject: {fileID: 5740706088277981957, guid: 48ce0dab15dcddb4495c7a5a09fa4dfa, type: 3} m_PrefabInstance: {fileID: 2007471869} m_PrefabAsset: {fileID: 0} +--- !u!1 &2019242169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2019242171} + - component: {fileID: 2019242170} + m_Layer: 0 + m_Name: Chunk Connection Registry Generator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2019242170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019242169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9775f8965af138545a7909520fa64b29, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabs: + - {fileID: 7255329216686614878, guid: 886e784542947f24eaa8aaf49dfcc4ad, type: 3} + - {fileID: 7255329216686614878, guid: b62fe1fb5c728ce4b99c117233646204, type: 3} + - {fileID: 7255329216686614878, guid: af41ffc7b83427e4e90a10c9dcc833a2, type: 3} + - {fileID: 7255329216686614878, guid: 7dbefec577d5e284fbddd5a29842cc2c, type: 3} + - {fileID: 2704001218989138493, guid: 2c83cfd89cb8a284caca24f2ca9d0ba3, type: 3} + - {fileID: 2704001218989138493, guid: bd98fb12d63b7bc49ae0f03c2245b435, type: 3} + - {fileID: 2704001218989138493, guid: 6a774c110d5aeb1408324d380adb8955, type: 3} + - {fileID: 2704001218989138493, guid: 3162a96ef13239b41ba3d21ca801cdc4, type: 3} + - {fileID: 2704001218989138493, guid: d9e49365637f4444a99840103c5d5a44, type: 3} + - {fileID: 2704001218989138493, guid: 80ed2fe86d7677d498f807270b37b1f7, type: 3} + - {fileID: 2704001218989138493, guid: 989f0d6e8bde6834ebbd740844aeba0e, type: 3} + - {fileID: 7919088255103129344, guid: 55a0e845f95f1974f880c446a4af8303, type: 3} + - {fileID: 7919088255103129344, guid: 9a95e856383ff334b8850ad578cb6d65, type: 3} + - {fileID: 7919088255103129344, guid: 09343d8e8bc60e445bae34f6881ffe59, type: 3} + - {fileID: 2704001218989138493, guid: 10dc33d8ada12f84ebd7234446f34c45, type: 3} + - {fileID: 2704001218989138493, guid: 2fce0180ccd18534faacb5e22db086b9, type: 3} + - {fileID: 7919088255103129344, guid: 503e9bc31e02ce046bda52996a26fe22, type: 3} + - {fileID: 7255329216686614878, guid: a809dc39cad8b27429e59a86867fd6d6, type: 3} + - {fileID: 7919088255103129344, guid: a00c0b36ee4586144a9ec800f0d38830, type: 3} + - {fileID: 7919088255103129344, guid: 31dfb5210a9d64b41bb417620dd68533, type: 3} + - {fileID: 7919088255103129344, guid: 963551cb04192a84088ddaaa3500f559, type: 3} + - {fileID: 7919088255103129344, guid: cc3828d7e55dcf04b85290093563dff2, type: 3} + - {fileID: 2704001218989138493, guid: d32ae7acb5c9b0f489ce40dc2e15c772, type: 3} + - {fileID: 7919088255103129344, guid: e2e591d216fb2734aba113997efa3797, type: 3} + - {fileID: 7919088255103129344, guid: 2bbd6e86a833c8a4e9ee47a195ec46c1, type: 3} + - {fileID: 7919088255103129344, guid: 1ff71b2adbd7a854cb82ddfd95f25afb, type: 3} + - {fileID: 7919088255103129344, guid: 2653cb9ee3eaab74ca647ba7532e1608, type: 3} + - {fileID: 7919088255103129344, guid: 1e236b387bdb75c4ab929f783d7e3f24, type: 3} + - {fileID: 7919088255103129344, guid: 31934c838854a3c4baa7ad791fd520d3, type: 3} + - {fileID: 7919088255103129344, guid: 2b7862a7ca7290d4c922cecdd20528bb, type: 3} + - {fileID: 7919088255103129344, guid: a057db1023afbb44993f4161fe103b41, type: 3} + - {fileID: 7919088255103129344, guid: f818560f421c6f348b9d516c62c52d09, type: 3} +--- !u!4 &2019242171 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019242169} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2025597757 PrefabInstance: m_ObjectHideFlags: 0 @@ -11008,6 +11250,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 5740706088277981957, guid: 48ce0dab15dcddb4495c7a5a09fa4dfa, type: 3} m_PrefabInstance: {fileID: 2028361605} m_PrefabAsset: {fileID: 0} +--- !u!1 &2033486272 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2033486273} + m_Layer: 0 + m_Name: top right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2033486273 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2033486272} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 13, y: 0, z: 13} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1930129393} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2034774968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2034774969} + m_Layer: 0 + m_Name: top left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2034774969 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034774968} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 0, z: 13} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1930129393} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2039545540 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/-ProceduralGeneration/WavefunctionCollapse/Scripts/WFCGenerator.cs b/Assets/Scripts/-ProceduralGeneration/WavefunctionCollapse/Scripts/WFCGenerator.cs index 73f45db1..e0f60f80 100644 --- a/Assets/Scripts/-ProceduralGeneration/WavefunctionCollapse/Scripts/WFCGenerator.cs +++ b/Assets/Scripts/-ProceduralGeneration/WavefunctionCollapse/Scripts/WFCGenerator.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using UnityEngine; +using UnityEngine.AI; public class WFCGenerator : MonoBehaviour { @@ -82,7 +83,7 @@ public class WFCGenerator : MonoBehaviour Vector2Int current = startPoint; mainPath.Add(current); - while (current != endPoint) + while (current != endPoint || !mainPath.Contains(endPoint)) { Vector2Int next = GetNextPathPoint(current); if (!IsOutOfBounds(next) && !mainPath.Contains(next)) @@ -666,7 +667,7 @@ public class WFCGenerator : MonoBehaviour if (validPrefabs.Count == 0) { //LocalResetCell(neighborCell, chunkCompatibilityMatrix.prefabs); - Debug.LogError($"Contradiction at {neighborPos}! No valid prefabs for {dir}/{requiredSocket}."); + Debug.LogWarning($"Contradiction at {neighborPos}! No valid prefabs for {dir}/{requiredSocket}."); //broken = true; //cellsToProcess.Enqueue(neighborPos); return; @@ -712,7 +713,7 @@ public class WFCGenerator : MonoBehaviour if (cell.PossiblePrefabs.Count == 0) { - Debug.LogError($"Cell {cell.GridPosition} has no possible prefabs!"); + Debug.LogWarning($"Cell {cell.GridPosition} has no possible prefabs!"); throw new InvalidOperationException("Contradiction encountered."); } @@ -725,7 +726,7 @@ public class WFCGenerator : MonoBehaviour case Direction.South: return conn.SouthConnection; case Direction.East: return conn.EastConnection; case Direction.West: return conn.WestConnection; - default: throw new ArgumentException("Invalid direction"); + default: Debug.LogWarning("Invalid direction"); return ConnectionSocket.border; } } @@ -827,6 +828,8 @@ public class WFCGenerator : MonoBehaviour CollapseCell(cellPos); yield return new WaitForSeconds(delayCoroutine); } + + //build navmesh } bool AllCellsCollapsed() diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index fa63cede..5cae3442 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 6.567157 + - _Rotation: 87.62012 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1