From 3640f8a21f4a144d57734dcba1d4818f58495971 Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Sun, 26 Nov 2023 00:13:14 +0100 Subject: [PATCH] Added noise testing, created connected tiles --- Assets/IMG/Materials/newTile.mat | 10 +- Assets/Scenes/TestScene.unity | 331 ++++++++ Assets/Scenes/TestScene.unity.meta | 7 + Assets/Scripts/NoiseGenerator.cs | 74 +- Assets/Scripts/Testing/NoiseTesting.cs | 204 +++++ Assets/Scripts/Testing/NoiseTesting.cs.meta | 11 + Assets/Scripts/Testing/Tile.prefab | 228 ++++++ Assets/Scripts/Testing/Tile.prefab.meta | 7 + Assets/Scripts/WorldGenerator.cs | 2 +- UserSettings/EditorUserSettings.asset | 3 + .../Layouts/CurrentMaximizeLayout.dwlt | 738 +++++++++--------- 11 files changed, 1228 insertions(+), 387 deletions(-) create mode 100644 Assets/Scenes/TestScene.unity create mode 100644 Assets/Scenes/TestScene.unity.meta create mode 100644 Assets/Scripts/Testing/NoiseTesting.cs create mode 100644 Assets/Scripts/Testing/NoiseTesting.cs.meta create mode 100644 Assets/Scripts/Testing/Tile.prefab create mode 100644 Assets/Scripts/Testing/Tile.prefab.meta diff --git a/Assets/IMG/Materials/newTile.mat b/Assets/IMG/Materials/newTile.mat index d1ad39b..e5d154b 100644 --- a/Assets/IMG/Materials/newTile.mat +++ b/Assets/IMG/Materials/newTile.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: newTile m_Shader: {fileID: 4800000, guid: 3bf4effba2f519c4fb7d3a87f4635f08, type: 3} - m_ShaderKeywords: _COLORCOLOR_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _COLORCOLOR_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -55,6 +60,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity new file mode 100644 index 0000000..65d966e --- /dev/null +++ b/Assets/Scenes/TestScene.unity @@ -0,0 +1,331 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &154033017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 154033020} + - component: {fileID: 154033019} + - component: {fileID: 154033018} + - component: {fileID: 154033021} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &154033018 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154033017} + m_Enabled: 1 +--- !u!20 &154033019 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154033017} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &154033020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154033017} + serializedVersion: 2 + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 50, z: -67} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} +--- !u!114 &154033021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154033017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21edae6d584d6527bbb87c3393c1274f, type: 3} + m_Name: + m_EditorClassIdentifier: + tilePrefab: {fileID: 7573435787306895624, guid: a3113b7ce76b2d5c1998c0dadca2acdd, type: 3} +--- !u!1 &1664013424 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1664013426} + - component: {fileID: 1664013425} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1664013425 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664013424} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1664013426 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664013424} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 154033020} + - {fileID: 1664013426} diff --git a/Assets/Scenes/TestScene.unity.meta b/Assets/Scenes/TestScene.unity.meta new file mode 100644 index 0000000..a0ea524 --- /dev/null +++ b/Assets/Scenes/TestScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ede33da799ae12ae7b239acbbe465005 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NoiseGenerator.cs b/Assets/Scripts/NoiseGenerator.cs index 219cf4b..8a51577 100644 --- a/Assets/Scripts/NoiseGenerator.cs +++ b/Assets/Scripts/NoiseGenerator.cs @@ -17,7 +17,7 @@ public class NoiseGenerator else{ applyNormalNoise(tile, map); }*/ - applyNormalNoise(tile, map); + applyNewNoise(tile, map); } @@ -46,6 +46,52 @@ public class NoiseGenerator tile.GetComponent().setType(tiletype); } + private void applyNewNoise(GameObject tile, Dictionary map) + { + //resetMesh(tile); + Mesh mesh = tile.GetComponent().mesh; + Vector3[] vertices = mesh.vertices; + float[] samples; + Color32[] colors; + Color32 low; + Color32 high; + string tiletype = ""; + samples = calculateBasicSamples(tile); + + low = new Color32(0, 150, 0, 255); + high = new Color32(0, 110, 20, 255); + + float lowestValue = 10; + float highestValue = 0; + + for (int i = 0; i < samples.Length; i++) + { + if (lowestValue > samples[i]) + { + lowestValue = samples[i]; + } + if (highestValue < samples[i]) + { + highestValue = samples[i]; + } + } + + float modifier = highestValue - lowestValue; + + colors = new Color32[samples.Length]; + for (int i = 0; i < samples.Length; i++) + { + colors[i] = Color32.Lerp(low, high, (1 / modifier) * (samples[i] - lowestValue)); + } + + for (int i = 0; i < samples.Length; i++) + { + vertices[i].y = samples[i] * 3; + } + applyMesh(tile, vertices, mesh, colors); + tile.GetComponent().setType(tiletype); + } + private void applyNormalNoise(GameObject tile, Dictionary map) { //resetMesh(tile); @@ -92,7 +138,7 @@ public class NoiseGenerator high = new Color32(0, 185, 0, 255); tiletype = "Plane"; } - + float lowestValue = 10; float highestValue = 0; @@ -146,18 +192,16 @@ public class NoiseGenerator float[] samples = new float[vertices.Length]; for (int i = 0; i < vertices.Length; i++) { - if (vertices[i].x != 5 && vertices[i].z != 5 && vertices[i].x != -5 && vertices[i].z != -5) - { - float xCord = tile.GetComponent().getPosition().x + vertices[i].x / (vertices.Length - 1) * 10; - float yCord = tile.GetComponent().getPosition().z + vertices[i].z / (vertices.Length - 1) * 10; - float sample = Mathf.PerlinNoise(xCord, yCord) - 0.1f * rand.Next(0, 6); - samples[i] = sample; - } + float xCord = tile.GetComponent().getPosition().x + vertices[i].x / (vertices.Length - 1) * 10; + float yCord = tile.GetComponent().getPosition().z + vertices[i].z / (vertices.Length - 1) * 10; + float sample = Mathf.PerlinNoise(xCord, yCord) - 0.1f * rand.Next(0, 6); + samples[i] = sample; } return samples; } - private float[] calculateSamplesCity(GameObject tile){ + private float[] calculateSamplesCity(GameObject tile) + { Mesh mesh = tile.GetComponent().mesh; Vector3[] vertices = mesh.vertices; float[] samples = new float[vertices.Length]; @@ -209,7 +253,7 @@ public class NoiseGenerator Vector3[] vertices = mesh.vertices; float[] samples = calculateBasicSamples(tile); - bool isVertical = (rand.Next(0,2) == 0 ? true : false); + bool isVertical = (rand.Next(0, 2) == 0 ? true : false); int startX = 0; int startZ = 0; @@ -260,9 +304,9 @@ public class NoiseGenerator { for (int k = 0; k < vertices.Length; k++) { - if (Mathf.Round(vertices[k].x) == randX+i && Mathf.Round(vertices[k].z) == randZ+j) + if (Mathf.Round(vertices[k].x) == randX + i && Mathf.Round(vertices[k].z) == randZ + j) { - samples[k] = samples[k] - rand.Next(1,3) - 0.25f * rand.Next(0,4); + samples[k] = samples[k] - rand.Next(1, 3) - 0.25f * rand.Next(0, 4); break; } } @@ -289,7 +333,7 @@ public class NoiseGenerator result = result + "\"vertices\": {\r\n"; for (int i = 0; i < vertices.Length; i++) { - result = result + FileHandler.generateJSON("vertice"+i, "\"" + vertices[i].x + "/" + vertices[i].y + "/" + vertices[i].z + "\""); + result = result + FileHandler.generateJSON("vertice" + i, "\"" + vertices[i].x + "/" + vertices[i].y + "/" + vertices[i].z + "\""); if (i < vertices.Length - 1) { result = result + ",\r\n"; @@ -318,7 +362,7 @@ public class NoiseGenerator Vector3[] vertices = new Vector3[verticeTokens.Count]; JToken current; string[] parts; - for(int i = 0; i < colorTokens.Count;i++) + for (int i = 0; i < colorTokens.Count; i++) { current = colorTokens[i]; parts = current.Value().Split('/'); diff --git a/Assets/Scripts/Testing/NoiseTesting.cs b/Assets/Scripts/Testing/NoiseTesting.cs new file mode 100644 index 0000000..00e63a4 --- /dev/null +++ b/Assets/Scripts/Testing/NoiseTesting.cs @@ -0,0 +1,204 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.InputSystem; + +public class NoiseTesting : MonoBehaviour +{ + System.Random rand = new System.Random(); + Dictionary mapGen; + Vector3 current; + Vector3 next; + public GameObject tilePrefab; + // Start is called before the first frame update + void Start() + { + mapGen = new Dictionary(); + current = new Vector3(0, 0, 0); + mapGen.Add(current, Instantiate(tilePrefab, current, Quaternion.identity)); + applyNormalNoise(mapGen[current], mapGen); + } + + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.Space)) + { + applyNormalNoise(mapGen[new Vector3(0, 0, 0)], mapGen); + } + + if (Input.GetKeyDown(KeyCode.A)) + { + next = current - new Vector3(100, 0, 0); + } + if (Input.GetKeyDown(KeyCode.W)) + { + next = current - new Vector3(0, 0, -100); + } + if (Input.GetKeyDown(KeyCode.D)) + { + next = current - new Vector3(-100, 0, 0); + } + if (Input.GetKeyDown(KeyCode.S)) + { + next = current - new Vector3(0, 0, 100); + } + + if (next != current) + { + current = next; + if (!mapGen.ContainsKey(current)) + { + mapGen.Add(current, Instantiate(tilePrefab, current, Quaternion.identity)); + applyNormalNoise(mapGen[current], mapGen); + } + + } + } + + private void applyNormalNoise(GameObject tile, Dictionary map) + { + //resetMesh(tile); + Mesh mesh = tile.GetComponent().mesh; + Vector3[] vertices = mesh.vertices; + //float[] samples = calculateBasicSamples(tile); + float[] samples = calculateConnectedSamples(tile); + + Color32[] colors; + Color32 low = new Color32(0, 150, 0, 255); + Color32 high = new Color32(0, 110, 20, 255); + string tiletype = ""; + + float lowestValue = 10; + float highestValue = 0; + + for (int i = 0; i < samples.Length; i++) + { + if (lowestValue > samples[i]) + { + lowestValue = samples[i]; + } + if (highestValue < samples[i]) + { + highestValue = samples[i]; + } + } + + float modifier = highestValue - lowestValue; + + colors = new Color32[samples.Length]; + for (int i = 0; i < samples.Length; i++) + { + colors[i] = Color32.Lerp(low, high, (1 / modifier) * (samples[i] - lowestValue)); + } + + for (int i = 0; i < samples.Length; i++) + { + vertices[i].y = samples[i];// * 3; + } + applyMesh(tile, vertices, mesh, colors); + //tile.GetComponent().setType(tiletype); + } + + private void resetMesh(GameObject tile) + { + Mesh mesh = tile.GetComponent().sharedMesh; + Vector3[] vertices = mesh.vertices; + for (int i = 0; i < vertices.Length; i++) + { + vertices[i].y = 0; + } + mesh.vertices = vertices; + mesh.RecalculateBounds(); + mesh.RecalculateNormals(); + tile.GetComponent().sharedMesh = mesh; + } + + private float[] calculateBasicSamples(GameObject tile) + { + Mesh mesh = tile.GetComponent().mesh; + Vector3[] vertices = mesh.vertices; + float[] samples = new float[vertices.Length]; + for (int i = 0; i < vertices.Length; i++) + { + float xCord = vertices[i].x / (vertices.Length - 1) * 10; + float zCord = vertices[i].z / (vertices.Length - 1) * 10; + float sample = Mathf.PerlinNoise(xCord, zCord) - 0.5f * rand.Next(0, 6); + samples[i] = sample; + } + return samples; + } + + private float[] calculateConnectedSamples(GameObject tile) + { + //Working with "next" as index for tile to be generated + //Working with "mapGen" as map Placeholder to check against neighbours + Mesh mesh = tile.GetComponent().mesh; + Vector3[] vertices = mesh.vertices; + float[] samples = Enumerable.Repeat(-100f, vertices.Length).ToArray(); + int sideLength = Mathf.RoundToInt(Mathf.Sqrt(vertices.Length)); + samples = connectSamples(samples, sideLength); + + for (int i = 0; i < vertices.Length; i++) + { + if (samples[i] == -100) + { + float xCord = vertices[i].x / (vertices.Length - 1) * 10; + float zCord = vertices[i].z / (vertices.Length - 1) * 10; + float sample = Mathf.PerlinNoise(xCord, zCord) - 1f * rand.Next(0, 6); + samples[i] = sample; + } + } + return samples; + } + + private void applyMesh(GameObject tile, Vector3[] vertices, Mesh mesh, Color32[] colors) + { + mesh.vertices = vertices; + mesh.RecalculateBounds(); + mesh.RecalculateNormals(); + mesh.colors32 = colors; + tile.GetComponent().sharedMesh = mesh; + } + + private float[] connectSamples(float[] samples, int sideLength) + { + Mesh mesh; + Vector3[] vertices; + + for (int i = 0; i < sideLength; i++) + { + if (mapGen.ContainsKey(next - new Vector3(100, 0, 0))) + { //LINKS + mesh = mapGen[next - new Vector3(100, 0, 0)].GetComponent().mesh; + vertices = mesh.vertices; + samples[sideLength - 1 + sideLength * i] = vertices[sideLength * i].y; + } + + if (mapGen.ContainsKey(next - new Vector3(-100, 0, 0))) + { //RECHTS + mesh = mapGen[next - new Vector3(-100, 0, 0)].GetComponent().mesh; + vertices = mesh.vertices; + samples[sideLength * i] = vertices[sideLength - 1 + sideLength * i].y; + } + + if (mapGen.ContainsKey(next - new Vector3(0, 0, -100))) + { //OBEN + mesh = mapGen[next - new Vector3(0, 0, -100)].GetComponent().mesh; + vertices = mesh.vertices; + samples[i] = vertices[(sideLength * sideLength) - (sideLength-i)].y; + } + + if (mapGen.ContainsKey(next - new Vector3(0, 0, 100))) + { //UNTEN + mesh = mapGen[next - new Vector3(0, 0, 100)].GetComponent().mesh; + vertices = mesh.vertices; + samples[(sideLength * sideLength) - (sideLength-i)] = vertices[i].y; + } + } + + return samples; + } +} diff --git a/Assets/Scripts/Testing/NoiseTesting.cs.meta b/Assets/Scripts/Testing/NoiseTesting.cs.meta new file mode 100644 index 0000000..2639d67 --- /dev/null +++ b/Assets/Scripts/Testing/NoiseTesting.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 21edae6d584d6527bbb87c3393c1274f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Testing/Tile.prefab b/Assets/Scripts/Testing/Tile.prefab new file mode 100644 index 0000000..52d84d6 --- /dev/null +++ b/Assets/Scripts/Testing/Tile.prefab @@ -0,0 +1,228 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1432760222041494230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1418724594657166519} + - component: {fileID: 592371478074520587} + - component: {fileID: 1441453626542042980} + - component: {fileID: 7385324898674005301} + - component: {fileID: 7807969927081444678} + m_Layer: 0 + m_Name: pnlWater + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &1418724594657166519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432760222041494230} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7573435787306895636} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &592371478074520587 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432760222041494230} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1441453626542042980 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432760222041494230} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 52b7d70b1de7c4ce09662b77c14d9fda, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &7385324898674005301 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432760222041494230} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &7807969927081444678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432760222041494230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d2f50a8e0bb841a5aaa90ae55db8849, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7573435787306895624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7573435787306895636} + - component: {fileID: 7573435787306895637} + - component: {fileID: 7573435787306895626} + - component: {fileID: 7602326841346784209} + m_Layer: 0 + m_Name: Tile + m_TagString: Tile + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &7573435787306895636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7573435787306895624} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -109.4, y: 0, z: 0} + m_LocalScale: {x: 10, y: 1, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1418724594657166519} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7573435787306895637 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7573435787306895624} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7573435787306895626 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7573435787306895624} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 8e83d1b6a2b235d4bb5b64e3d386b16c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &7602326841346784209 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7573435787306895624} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Scripts/Testing/Tile.prefab.meta b/Assets/Scripts/Testing/Tile.prefab.meta new file mode 100644 index 0000000..edd7d9b --- /dev/null +++ b/Assets/Scripts/Testing/Tile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a3113b7ce76b2d5c1998c0dadca2acdd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/WorldGenerator.cs b/Assets/Scripts/WorldGenerator.cs index 6d693be..51f30d2 100644 --- a/Assets/Scripts/WorldGenerator.cs +++ b/Assets/Scripts/WorldGenerator.cs @@ -51,7 +51,7 @@ public class WorldGenerator : MonoBehaviour Destroy(tile); } } - player.transform.position = new Vector3(0, 1.5f, 0); + player.transform.position = new Vector3(0, 4f, 0); player.transform.rotation = Quaternion.identity; OnEnable(); this.cityAmount = cityAmount; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 546a1cb..70bb098 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -14,6 +14,9 @@ EditorUserSettings: RecentlyUsedSceneGuid-2: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 + RecentlyUsedSceneGuid-3: + value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d + flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 3eeb1da..780aecf 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -20,327 +20,12 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 970 - m_MinSize: {x: 300, y: 200} + height: 942 + m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 50 + controlID: 21 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1920 - y: 772 - width: 1517 - height: 267 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scripts/Testing - m_Globs: [] - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Scripts/Testing - m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 185} - m_SelectedIDs: d49b0000 - m_LastClickedID: 39892 - m_ExpandedIDs: 0000000024060000600600007406000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 000000002406000074060000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: 14e2feff - m_LastClickedInstanceID: -73196 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f010000000000b25b0000005d0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 335 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 13} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1518 - height: 970 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 51 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 5} - - {fileID: 7} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1518 - height: 682 - m_MinSize: {x: 200, y: 50} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 20 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 306 - height: 682 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 6} - m_Panes: - - {fileID: 6} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1920 - y: 90 - width: 305 - height: 661 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 14e2feff - m_LastClickedID: -73196 - m_ExpandedIDs: 14e2feffb0eafeff - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 306 - y: 0 - width: 1212 - height: 682 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 8} - m_Panes: - - {fileID: 8} - - {fileID: 9} - - {fileID: 10} - - {fileID: 11} - - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -360,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2226 - y: 90 + x: 306 + y: 118 width: 1210 - height: 661 + height: 643 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -664,7 +349,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 48, y: 48} + snapOffset: {x: 48, y: 10} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay @@ -683,9 +368,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -343.32404, y: -231.49773, z: 309.28967} + m_Target: {x: 568.5542, y: -513.7946, z: -341.42746} speed: 2 - m_Value: {x: -343.32404, y: -231.49773, z: 309.28967} + m_Value: {x: -109.399994, y: -0.75, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -731,20 +416,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.21113704, y: 0.47118843, z: -0.117289536, w: -0.8482635} + m_Target: {x: -0.15613088, y: -0.8254589, z: 0.2760914, w: -0.46662202} speed: 2 - m_Value: {x: -0.21114704, y: 0.47121075, z: -0.117295094, w: -0.8483037} + m_Value: {x: -0.1561526, y: -0.82557374, z: 0.2761298, w: -0.46668693} m_Size: - m_Target: 287.742 + m_Target: 458.9204 speed: 2 - m_Value: 287.742 + m_Value: 70.71465 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1.005 - m_SpeedNormalized: 0.49999997 + m_Speed: 0.9452999 + m_SpeedNormalized: 0.46999997 m_SpeedMin: 0.01 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -762,7 +447,176 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &9 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1518 + height: 942 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 22 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 5} + - {fileID: 7} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1518 + height: 664 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 23 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 306 + height: 664 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 6} + m_Panes: + - {fileID: 6} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 118 + width: 305 + height: 643 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: f873ffff6cb8ffffe4f4ffff2cfbffff3461000008640000a2810100b0890100288a0100a28b0100 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 306 + y: 0 + width: 1212 + height: 664 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + - {fileID: 8} + - {fileID: 9} + - {fileID: 10} + - {fileID: 11} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -782,10 +636,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2226 - y: 90 + x: 306 + y: 118 width: 1210 - height: 661 + height: 643 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -806,7 +660,7 @@ MonoBehaviour: m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 2 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 1 @@ -839,28 +693,28 @@ MonoBehaviour: x: 0 y: 21 width: 1210 - height: 640 - m_Scale: {x: 0.5925926, y: 0.5925926} - m_Translation: {x: 605, y: 320} + height: 622 + m_Scale: {x: 0.57592595, y: 0.57592595} + m_Translation: {x: 605, y: 311} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1020.9375 + x: -1050.4823 y: -540 - width: 2041.875 + width: 2100.9646 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.5925926 - m_LastWindowPixelSize: {x: 1210, y: 661} + m_defaultScale: 0.57592595 + m_LastWindowPixelSize: {x: 1210, y: 643} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &10 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1432,7 +1286,7 @@ MonoBehaviour: m_Text: Input (Input Actions) m_Image: {fileID: 0} m_Tooltip: ---- !u!114 &11 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1488,7 +1342,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1522,7 +1376,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1538,17 +1392,163 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 682 + y: 664 width: 1518 - height: 288 + height: 278 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 2} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 2} + - {fileID: 13} - {fileID: 14} m_Selected: 0 m_LastSelected: 1 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 782 + width: 1517 + height: 257 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scripts/Testing + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scripts/Testing + m_LastFoldersGridSize: -1 + m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 295} + m_SelectedIDs: da6c0000 + m_LastClickedID: 27866 + m_ExpandedIDs: 00000000ba6b0000bc6b0000b66c0000bc6c000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000ba6b0000bc6b0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 335 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1569,10 +1569,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 772 + x: 0 + y: 782 width: 1517 - height: 267 + height: 257 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1603,11 +1603,11 @@ MonoBehaviour: x: 1518 y: 0 width: 402 - height: 970 - m_MinSize: {x: 100, y: 200} + height: 942 + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 109 + controlID: 122 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1626,9 +1626,9 @@ MonoBehaviour: x: 0 y: 0 width: 402 - height: 136 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + height: 132 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -1654,10 +1654,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3438 - y: 90 + x: 1518 + y: 118 width: 401 - height: 115 + height: 111 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1684,11 +1684,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 136 + y: 132 width: 402 - height: 834 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + height: 810 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -1714,10 +1714,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3438 - y: 226 + x: 1518 + y: 250 width: 401 - height: 813 + height: 789 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0