From 4f24f39611e127675b77dfc6e148149cba2f150e Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 01:32:20 +0200 Subject: [PATCH 01/10] Paint ground below wall/rock --- Assets/Scripts/Generation/GenerationProcessor.cs | 8 ++++---- Assets/graphics/textures/car.meta | 8 ++++++++ Assets/graphics/textures/tmp.meta | 8 ++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 Assets/graphics/textures/car.meta create mode 100644 Assets/graphics/textures/tmp.meta diff --git a/Assets/Scripts/Generation/GenerationProcessor.cs b/Assets/Scripts/Generation/GenerationProcessor.cs index e1ed890..1ed9cf7 100644 --- a/Assets/Scripts/Generation/GenerationProcessor.cs +++ b/Assets/Scripts/Generation/GenerationProcessor.cs @@ -70,16 +70,16 @@ public class GenerationProcessor { break; } - CreateGOFromType(v, rotation, type, root); + CreateGOFromType(v, rotation, tiles[v].type, type, root); } return root; } - private GameObject CreateGOFromType(Vector2 v, int rotation, ExtendedTileType t, GameObject root) { + private GameObject CreateGOFromType(Vector2 v, int rotation, Room.TileType type, ExtendedTileType t, GameObject root) { GameObject tmp = null; - //if (t == ExtendedTileType.BorderInner || t == ExtendedTileType.BorderOuter || t == ExtendedTileType.BorderInner) - // CreateGOFromType(v, rotation, ExtendedTileType.Ground, root); + if (type == Room.TileType.ROCK || type == Room.TileType.WALL) + CreateGOFromType(v, 0, Room.TileType.GROUND, ExtendedTileType.Ground, root); if ( prefabs.ContainsKey(t) && root != null ) { tmp = Object.Instantiate(prefabs[t], root.transform); tmp.transform.position = v; diff --git a/Assets/graphics/textures/car.meta b/Assets/graphics/textures/car.meta new file mode 100644 index 0000000..8504594 --- /dev/null +++ b/Assets/graphics/textures/car.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ec323b9157704d00a3409f8ea6e46b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/textures/tmp.meta b/Assets/graphics/textures/tmp.meta new file mode 100644 index 0000000..7ebab68 --- /dev/null +++ b/Assets/graphics/textures/tmp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df6e7833427b5497b92308fb6f54e552 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From bf3ec6620ee53ba1b9d4752cba8e0d7a9c22d94b Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 01:54:04 +0200 Subject: [PATCH 02/10] Player spawnpoint --- Assets/Scripts/Generation/DungeonGenerator.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/Scripts/Generation/DungeonGenerator.cs b/Assets/Scripts/Generation/DungeonGenerator.cs index 17eac4d..3ac62ac 100644 --- a/Assets/Scripts/Generation/DungeonGenerator.cs +++ b/Assets/Scripts/Generation/DungeonGenerator.cs @@ -202,6 +202,8 @@ public class DungeonGenerator { GenerateInterior(r); } + start.spawnpoints.Add(start.GetCenter()); + foreach (Vector2Int v in allDoors) { foreach (GenRoom r in rooms) { for (int x = -TUNNEL_THICKNESS; x < TUNNEL_THICKNESS; x++) From e7fd24f69487632b6d8361ca7b8331530b66d404 Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 13:28:36 +0200 Subject: [PATCH 03/10] Fix merge --- Assets/Scripts/Generation/GenerationProcessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Generation/GenerationProcessor.cs b/Assets/Scripts/Generation/GenerationProcessor.cs index 5c28138..5cf81a1 100644 --- a/Assets/Scripts/Generation/GenerationProcessor.cs +++ b/Assets/Scripts/Generation/GenerationProcessor.cs @@ -33,7 +33,7 @@ public class GenerationProcessor { type = getCorrectRockType(tiles, v); break; } - CreateGOFromType(v, rotation, type, root); + CreateGOFromType(v, rotation, tiles[v].type, type, root); } return root; } From 79d4fe7ba529209cd9c91e91131c9cd90f30f204 Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 14:12:06 +0200 Subject: [PATCH 04/10] Camera movement --- Assets/Scripts/CameraControl.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/CameraControl.cs b/Assets/Scripts/CameraControl.cs index 811ec68..2bc2d87 100644 --- a/Assets/Scripts/CameraControl.cs +++ b/Assets/Scripts/CameraControl.cs @@ -7,26 +7,27 @@ public class CameraControl : MonoBehaviour { [SerializeField] private GameObject followThis; - private Vector3 offset; - void Start() { + Camera.main.orthographicSize = 6; if ( followThis == null ) return; - offset = transform.position - followThis.transform.position; } void LateUpdate() { if ( followThis == null ) return; - var target = followThis.transform.position; // + offset; + var target = followThis.transform.position; var targetVec = target - transform.position; - targetVec.Scale(new Vector3(0.05f, 0.05f, 0)); - + targetVec.z = 0; + Camera.main.orthographicSize = 6 + targetVec.sqrMagnitude * 10; transform.position = transform.position + targetVec; + targetVec.Scale(new Vector3(0.05f, 0.05f, 0)); } public void SetFollow(GameObject g) { followThis = g; - offset = transform.position - followThis.transform.position; + var diff = (transform.position - followThis.transform.position); + diff.Scale(new Vector3(1f, 1f, 0f)); + transform.position = transform.position - diff + (Vector3) (Random.insideUnitCircle) * Random.value * 5f; } } \ No newline at end of file From ad4ebd46d34ee3ab9754de3f314e2046c0b4dafe Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 14:25:21 +0200 Subject: [PATCH 05/10] Camera zoom --- Assets/Scripts/CameraControl.cs | 6 ++---- Assets/Scripts/PlayerMovement.cs | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/CameraControl.cs b/Assets/Scripts/CameraControl.cs index 2bc2d87..a36dc31 100644 --- a/Assets/Scripts/CameraControl.cs +++ b/Assets/Scripts/CameraControl.cs @@ -8,7 +8,7 @@ public class CameraControl : MonoBehaviour { private GameObject followThis; void Start() { - Camera.main.orthographicSize = 6; + Camera.main.orthographicSize = 5; if ( followThis == null ) return; } @@ -18,10 +18,8 @@ public class CameraControl : MonoBehaviour { return; var target = followThis.transform.position; var targetVec = target - transform.position; - targetVec.z = 0; - Camera.main.orthographicSize = 6 + targetVec.sqrMagnitude * 10; + targetVec.Scale(new Vector3(0.05f, 0.05f, 0)); transform.position = transform.position + targetVec; - targetVec.Scale(new Vector3(0.05f, 0.05f, 0)); } public void SetFollow(GameObject g) { diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 9bf3273..34e3402 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -32,6 +32,7 @@ public class PlayerMovement : MonoBehaviour { return; Vector3 speedVec = new Vector3(rb.velocity.x, rb.velocity.y, 0); + Camera.main.orthographicSize = Camera.main.orthographicSize * 0.95f + (5 + 4f/6f * (speedVec.magnitude)) * 0.05f; float speed = speedVec.magnitude; { // Forward From f93a301c23ed502520674de3e1f7d2b7af308ee4 Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Mon, 23 Apr 2018 14:33:27 +0200 Subject: [PATCH 06/10] =?UTF-8?q?T=C3=BCren=20werden=20Korrekt=20angezeigt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tiles/{door.prefab => doorInner.prefab} | 14 +- ...door.prefab.meta => doorInner.prefab.meta} | 0 Assets/Prefabs/Tiles/doorOuter.prefab | 152 +++++++++++++ .../Tiles/doorOuter.prefab.meta} | 6 +- Assets/Scenes/CodeDEV.unity | 3 +- Assets/Scripts/GameController.cs | 9 +- .../Scripts/Generation/GenerationProcessor.cs | 204 ++++++++++-------- .../Door/{doorC.png => doorInner.png} | Bin .../{doorC.png.meta => doorInner.png.meta} | 26 +-- .../Door/{doorL.png => doorOuter.png} | Bin .../{doorL.png.meta => doorOuter.png.meta} | 26 +-- .../textures/FixedObjects/Door/doorR.png | Bin 8976 -> 0 bytes .../textures/FixedObjects/Door/doorR.png.meta | 117 ---------- 13 files changed, 293 insertions(+), 264 deletions(-) rename Assets/Prefabs/Tiles/{door.prefab => doorInner.prefab} (94%) rename Assets/Prefabs/Tiles/{door.prefab.meta => doorInner.prefab.meta} (100%) create mode 100644 Assets/Prefabs/Tiles/doorOuter.prefab rename Assets/{graphics/textures/tmp.meta => Prefabs/Tiles/doorOuter.prefab.meta} (52%) rename Assets/graphics/textures/FixedObjects/Door/{doorC.png => doorInner.png} (100%) rename Assets/graphics/textures/FixedObjects/Door/{doorC.png.meta => doorInner.png.meta} (76%) rename Assets/graphics/textures/FixedObjects/Door/{doorL.png => doorOuter.png} (100%) rename Assets/graphics/textures/FixedObjects/Door/{doorL.png.meta => doorOuter.png.meta} (76%) delete mode 100644 Assets/graphics/textures/FixedObjects/Door/doorR.png delete mode 100644 Assets/graphics/textures/FixedObjects/Door/doorR.png.meta diff --git a/Assets/Prefabs/Tiles/door.prefab b/Assets/Prefabs/Tiles/doorInner.prefab similarity index 94% rename from Assets/Prefabs/Tiles/door.prefab rename to Assets/Prefabs/Tiles/doorInner.prefab index 05a2590..3f3640d 100644 --- a/Assets/Prefabs/Tiles/door.prefab +++ b/Assets/Prefabs/Tiles/doorInner.prefab @@ -24,7 +24,7 @@ GameObject: - component: {fileID: 114053119853995034} - component: {fileID: 61243635969098510} m_Layer: 0 - m_Name: door + m_Name: doorInner m_TagString: door m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -59,8 +59,8 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} + oldSize: {x: 10, y: 10} + newSize: {x: 10, y: 10} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -84,8 +84,8 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} + oldSize: {x: 10, y: 10} + newSize: {x: 10, y: 10} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 @@ -140,12 +140,12 @@ SpriteRenderer: m_SortingLayerID: 1310459315 m_SortingLayer: -1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 6e7545b35610da243b692db13fb3c380, type: 3} + m_Sprite: {fileID: 21300000, guid: c859997db2d488d42a8189791f73e0fb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 10, y: 10} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Prefabs/Tiles/door.prefab.meta b/Assets/Prefabs/Tiles/doorInner.prefab.meta similarity index 100% rename from Assets/Prefabs/Tiles/door.prefab.meta rename to Assets/Prefabs/Tiles/doorInner.prefab.meta diff --git a/Assets/Prefabs/Tiles/doorOuter.prefab b/Assets/Prefabs/Tiles/doorOuter.prefab new file mode 100644 index 0000000..411185a --- /dev/null +++ b/Assets/Prefabs/Tiles/doorOuter.prefab @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1575370008060226} + m_IsPrefabParent: 1 +--- !u!1 &1575370008060226 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4538083943145114} + - component: {fileID: 212928732135609004} + - component: {fileID: 61252126965124090} + - component: {fileID: 114203808595097248} + - component: {fileID: 61597103562615806} + m_Layer: 0 + m_Name: doorOuter + m_TagString: door + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4538083943145114 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1575370008060226} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &61252126965124090 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1575370008060226} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10, y: 10} + newSize: {x: 10, y: 10} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!61 &61597103562615806 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1575370008060226} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10, y: 10} + newSize: {x: 10, y: 10} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &114203808595097248 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1575370008060226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b8cc30ac6e59724bba6536a17fbf027, type: 3} + m_Name: + m_EditorClassIdentifier: + parent: {fileID: 0} +--- !u!212 &212928732135609004 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1575370008060226} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1310459315 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d9380a46a795012449f336288fbd1854, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10, y: 10} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/Assets/graphics/textures/tmp.meta b/Assets/Prefabs/Tiles/doorOuter.prefab.meta similarity index 52% rename from Assets/graphics/textures/tmp.meta rename to Assets/Prefabs/Tiles/doorOuter.prefab.meta index 7ebab68..2cf0e01 100644 --- a/Assets/graphics/textures/tmp.meta +++ b/Assets/Prefabs/Tiles/doorOuter.prefab.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: df6e7833427b5497b92308fb6f54e552 -folderAsset: yes -DefaultImporter: +guid: 70bf9bb227285e74383db2dc84cc6c50 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 45a2f30..995a53e 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -1246,7 +1246,8 @@ MonoBehaviour: BorderSingle: {fileID: 1277252496101342, guid: ed9537580662f6046a1514a4c5bfdd98, type: 2} Ground: {fileID: 1487413182883822, guid: bc8a58beb0459094483211a5c7933959, type: 2} - Door: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2} + DoorInner: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2} + DoorOuter: {fileID: 1575370008060226, guid: 70bf9bb227285e74383db2dc84cc6c50, type: 2} Rock: {fileID: 1373919933116942, guid: 5f26192f79d542e49ad24fadc39f5654, type: 2} RockL: {fileID: 1411303269485816, guid: 92068b1ee4568d045b60c249ba57c186, type: 2} RockU: {fileID: 1990883489100502, guid: c44f475306efef3438b85a84f91fcf81, type: 2} diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 109fe63..6332d2d 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -20,7 +20,9 @@ public class GameController : MonoBehaviour { [SerializeField] GameObject Ground; [SerializeField] - GameObject Door; + GameObject DoorInner; + [SerializeField] + GameObject DoorOuter; [SerializeField] GameObject Rock; [SerializeField] @@ -106,7 +108,8 @@ public class GameController : MonoBehaviour { genPrefabs.Add(GenerationProcessor.ExtendedTileType.RockURD, RockURD); genPrefabs.Add(GenerationProcessor.ExtendedTileType.RockLRD, RockLRD); genPrefabs.Add(GenerationProcessor.ExtendedTileType.Ground, Ground); - genPrefabs.Add(GenerationProcessor.ExtendedTileType.Door, Door); + genPrefabs.Add(GenerationProcessor.ExtendedTileType.DoorInner, DoorInner); + genPrefabs.Add(GenerationProcessor.ExtendedTileType.DoorOuter, DoorOuter); } // Update is called once per frame @@ -154,7 +157,7 @@ public class GameController : MonoBehaviour { GenerationProcessor gp = new GenerationProcessor(genPrefabs); dg.Generate(); - // Start room + // Start room GameObject goStart = gp.ProcessRoom(dg.start.tiles); goStart.name = "Start"; List lt = new List(goStart.GetComponentsInChildren()); diff --git a/Assets/Scripts/Generation/GenerationProcessor.cs b/Assets/Scripts/Generation/GenerationProcessor.cs index 5cf81a1..edf7508 100644 --- a/Assets/Scripts/Generation/GenerationProcessor.cs +++ b/Assets/Scripts/Generation/GenerationProcessor.cs @@ -3,83 +3,84 @@ using System.Collections.Generic; using UnityEngine; public class GenerationProcessor { - public enum ExtendedTileType { - BorderOuter, BorderInner, BorderSingle, Ground, Door, Rock, RockL, RockU, RockR, RockD, RockLU, RockLR, RockLD, RockUR, RockUD, RockRD, RockLURD, RockLUD, RockLUR, RockURD, RockLRD - } - Dictionary prefabs; - public GenerationProcessor(Dictionary prefabs) { - this.prefabs = prefabs; - } + public enum ExtendedTileType { + BorderOuter, BorderInner, BorderSingle, Ground, DoorInner, DoorOuter, Rock, RockL, RockU, RockR, RockD, RockLU, RockLR, RockLD, RockUR, RockUD, RockRD, RockLURD, RockLUD, RockLUR, RockURD, RockLRD + } + Dictionary prefabs; + public GenerationProcessor(Dictionary prefabs) { + this.prefabs = prefabs; + } - public GameObject ProcessRoom(Dictionary tiles) { - GameObject root = new GameObject { - name = "Room" - }; - foreach ( Vector2Int v in tiles.Keys ) { - ExtendedTileType type = ExtendedTileType.Ground; - int rotation = 0; - switch ( tiles[v].type ) { - case Room.TileType.WALL: - type = getCorrectWallType(tiles, v); - rotation = getCorrectWallRotation(type, tiles[v].position); - break; - case Room.TileType.GROUND: - type = ExtendedTileType.Ground; - break; - case Room.TileType.DOOR: - type = ExtendedTileType.Door; - break; - case Room.TileType.ROCK: - type = getCorrectRockType(tiles, v); - break; - } - CreateGOFromType(v, rotation, tiles[v].type, type, root); + public GameObject ProcessRoom(Dictionary tiles) { + GameObject root = new GameObject { + name = "Room" + }; + foreach ( Vector2Int v in tiles.Keys ) { + ExtendedTileType type = ExtendedTileType.Ground; + int rotation = 0; + switch ( tiles[v].type ) { + case Room.TileType.WALL: + type = GetCorrectWallType(tiles, v); + rotation = GetCorrectWallRotation(type, tiles[v].position); + break; + case Room.TileType.GROUND: + type = ExtendedTileType.Ground; + break; + case Room.TileType.DOOR: + type = GetCorrectDoorType(tiles, v); + rotation = GetCorrectDoorRotation(type, tiles, v); + break; + case Room.TileType.ROCK: + type = GetCorrectRockType(tiles, v); + break; } - return root; + CreateGOFromType(v, rotation, tiles[v].type, type, root); } + return root; + } - private GameObject CreateGOFromType(Vector2 v, int rotation, Room.TileType type, ExtendedTileType t, GameObject root) { - GameObject tmp = null; - if (type == Room.TileType.ROCK || type == Room.TileType.WALL) - CreateGOFromType(v, 0, Room.TileType.GROUND, ExtendedTileType.Ground, root); - if ( prefabs.ContainsKey(t) && root != null ) { - tmp = Object.Instantiate(prefabs[t], root.transform); - tmp.transform.position = v; - tmp.transform.Rotate(new Vector3(0, 0, rotation)); - } - return tmp; + private GameObject CreateGOFromType(Vector2 v, int rotation, Room.TileType type, ExtendedTileType t, GameObject root) { + GameObject tmp = null; + if (type != Room.TileType.GROUND) + CreateGOFromType(v, 0, Room.TileType.GROUND, ExtendedTileType.Ground, root); + if ( prefabs.ContainsKey(t) && root != null ) { + tmp = Object.Instantiate(prefabs[t], root.transform); + tmp.transform.position = v; + tmp.transform.Rotate(new Vector3(0, 0, rotation)); } + return tmp; + } - private int CountSpecificNeighbours(Dictionary tiles, Vector2Int position, Room.TileType type) { - int counter = 0; - Vector2Int toCheck = position + new Vector2Int(0, -1); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) - counter++; - toCheck = position + new Vector2Int(-1, 0); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) - counter++; - toCheck = position + new Vector2Int(0, 1); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) - counter++; - toCheck = position + new Vector2Int(1, 0); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) - counter++; - return counter; - } + private int CountSpecificNeighbours(Dictionary tiles, Vector2Int position, Room.TileType type) { + int counter = 0; + Vector2Int toCheck = position + new Vector2Int(0, -1); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) + counter++; + toCheck = position + new Vector2Int(-1, 0); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) + counter++; + toCheck = position + new Vector2Int(0, 1); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) + counter++; + toCheck = position + new Vector2Int(1, 0); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == type) + counter++; + return counter; + } - private ExtendedTileType getCorrectWallType(Dictionary tiles, Vector2Int position){ - int groundNumber = CountSpecificNeighbours(tiles, position, Room.TileType.GROUND) + CountSpecificNeighbours(tiles, position, Room.TileType.ROCK); - switch(groundNumber){ - case 0: - return ExtendedTileType.BorderInner; - case 2: - return ExtendedTileType.BorderOuter; - default: - return ExtendedTileType.BorderSingle; - } - } + private ExtendedTileType GetCorrectWallType(Dictionary tiles, Vector2Int position){ + int groundNumber = CountSpecificNeighbours(tiles, position, Room.TileType.GROUND) + CountSpecificNeighbours(tiles, position, Room.TileType.ROCK); + switch(groundNumber){ + case 0: + return ExtendedTileType.BorderInner; + case 2: + return ExtendedTileType.BorderOuter; + default: + return ExtendedTileType.BorderSingle; + } + } - private int getCorrectWallRotation(ExtendedTileType type, GenTile.Position position) { + private int GetCorrectWallRotation(ExtendedTileType type, GenTile.Position position) { int rotation = 0; switch (type) { case ExtendedTileType.BorderSingle: @@ -113,24 +114,24 @@ public class GenerationProcessor { rotation = 180; break; } - break; - } - return rotation; + break; + } + return rotation; } - private ExtendedTileType getCorrectRockType(Dictionary tiles, Vector2Int position) { + private ExtendedTileType GetCorrectRockType(Dictionary tiles, Vector2Int position) { int meta = 0; - Vector2Int toCheck = position + new Vector2Int(0, -1); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) - meta += 1; - toCheck = position + new Vector2Int(-1, 0); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) - meta += 2; - toCheck = position + new Vector2Int(0, 1); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) - meta += 4; - toCheck = position + new Vector2Int(1, 0); - if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) + Vector2Int toCheck = position + new Vector2Int(0, -1); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) + meta += 1; + toCheck = position + new Vector2Int(-1, 0); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) + meta += 2; + toCheck = position + new Vector2Int(0, 1); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) + meta += 4; + toCheck = position + new Vector2Int(1, 0); + if (tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.ROCK) meta += 8; switch(meta) { @@ -167,5 +168,38 @@ public class GenerationProcessor { default: return ExtendedTileType.Rock; } - } + } + + private ExtendedTileType GetCorrectDoorType(Dictionary tiles, Vector2Int position) { + int neighbourDoors = CountSpecificNeighbours(tiles, position, Room.TileType.DOOR); + switch(neighbourDoors) { + case 1: + return ExtendedTileType.DoorOuter; + default: + return ExtendedTileType.DoorInner; + } + } + + private int GetCorrectDoorRotation(ExtendedTileType type, Dictionary tiles, Vector2Int position) { + switch(type) { + case ExtendedTileType.DoorOuter: + Vector2Int toCheck = position + new Vector2Int(0, -1); + if(tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.DOOR) + return 270; + toCheck = position + new Vector2Int(-1, 0); + if(tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.DOOR) + return 180; + toCheck = position + new Vector2Int(0, 1); + if(tiles.ContainsKey(toCheck) && tiles[toCheck].type == Room.TileType.DOOR) + return 90; + toCheck = position + new Vector2Int(1, 0); + return 0; + break; + case ExtendedTileType.DoorInner: + Vector2Int toCheckD = position + new Vector2Int(0, -1); + if(tiles.ContainsKey(toCheckD) && tiles[toCheckD].type == Room.TileType.DOOR) + return 90; + return 0; + } + } } diff --git a/Assets/graphics/textures/FixedObjects/Door/doorC.png b/Assets/graphics/textures/FixedObjects/Door/doorInner.png similarity index 100% rename from Assets/graphics/textures/FixedObjects/Door/doorC.png rename to Assets/graphics/textures/FixedObjects/Door/doorInner.png diff --git a/Assets/graphics/textures/FixedObjects/Door/doorC.png.meta b/Assets/graphics/textures/FixedObjects/Door/doorInner.png.meta similarity index 76% rename from Assets/graphics/textures/FixedObjects/Door/doorC.png.meta rename to Assets/graphics/textures/FixedObjects/Door/doorInner.png.meta index 5999ff2..d4d94e0 100644 --- a/Assets/graphics/textures/FixedObjects/Door/doorC.png.meta +++ b/Assets/graphics/textures/FixedObjects/Door/doorInner.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d069c80c6e533b540be700fbf87df23a +guid: c859997db2d488d42a8189791f73e0fb TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -78,35 +78,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 9dcafc29ebb3b30459aef9428afc15cf + spriteID: b61e83ad89dcc8c48a89222222467c15 vertices: [] indices: edges: [] diff --git a/Assets/graphics/textures/FixedObjects/Door/doorL.png b/Assets/graphics/textures/FixedObjects/Door/doorOuter.png similarity index 100% rename from Assets/graphics/textures/FixedObjects/Door/doorL.png rename to Assets/graphics/textures/FixedObjects/Door/doorOuter.png diff --git a/Assets/graphics/textures/FixedObjects/Door/doorL.png.meta b/Assets/graphics/textures/FixedObjects/Door/doorOuter.png.meta similarity index 76% rename from Assets/graphics/textures/FixedObjects/Door/doorL.png.meta rename to Assets/graphics/textures/FixedObjects/Door/doorOuter.png.meta index f383f28..b522d10 100644 --- a/Assets/graphics/textures/FixedObjects/Door/doorL.png.meta +++ b/Assets/graphics/textures/FixedObjects/Door/doorOuter.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d303be62c3d4aa4191ed4771deb21f7 +guid: d9380a46a795012449f336288fbd1854 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -78,35 +78,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: ec5219b6a944ba04fad7d8c63457efef + spriteID: a2e2a57d1f17801488b7f9cb7ae4eef9 vertices: [] indices: edges: [] diff --git a/Assets/graphics/textures/FixedObjects/Door/doorR.png b/Assets/graphics/textures/FixedObjects/Door/doorR.png deleted file mode 100644 index d4185fb5d542d70288f2b8840e1737474f32728b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8976 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 LdEK40j^F(cNa&IK diff --git a/Assets/graphics/textures/FixedObjects/Door/doorR.png.meta b/Assets/graphics/textures/FixedObjects/Door/doorR.png.meta deleted file mode 100644 index 0f7d2e6..0000000 --- a/Assets/graphics/textures/FixedObjects/Door/doorR.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 6e7545b35610da243b692db13fb3c380 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 5 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 1000 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 3acde526598c49d48a37036db484d91d - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: From 1f1e62500b67683dfed621757b8f58a85096245a Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 14:36:00 +0200 Subject: [PATCH 07/10] Meta things --- Assets/Scenes/CodeDEV.unity | 5 ++--- Assets/graphics/textures/tmp.meta | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 Assets/graphics/textures/tmp.meta diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 995a53e..be583c5 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -840,7 +840,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 64.16286 + value: 63.233368 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} @@ -1246,8 +1246,7 @@ MonoBehaviour: BorderSingle: {fileID: 1277252496101342, guid: ed9537580662f6046a1514a4c5bfdd98, type: 2} Ground: {fileID: 1487413182883822, guid: bc8a58beb0459094483211a5c7933959, type: 2} - DoorInner: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2} - DoorOuter: {fileID: 1575370008060226, guid: 70bf9bb227285e74383db2dc84cc6c50, type: 2} + Door: {fileID: 0} Rock: {fileID: 1373919933116942, guid: 5f26192f79d542e49ad24fadc39f5654, type: 2} RockL: {fileID: 1411303269485816, guid: 92068b1ee4568d045b60c249ba57c186, type: 2} RockU: {fileID: 1990883489100502, guid: c44f475306efef3438b85a84f91fcf81, type: 2} diff --git a/Assets/graphics/textures/tmp.meta b/Assets/graphics/textures/tmp.meta new file mode 100644 index 0000000..7ebab68 --- /dev/null +++ b/Assets/graphics/textures/tmp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df6e7833427b5497b92308fb6f54e552 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 4e60f29253859a341226e0f7d835a4f956936177 Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Mon, 23 Apr 2018 14:37:37 +0200 Subject: [PATCH 08/10] Fix --- Assets/Scripts/Generation/GenerationProcessor.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Scripts/Generation/GenerationProcessor.cs b/Assets/Scripts/Generation/GenerationProcessor.cs index edf7508..1654080 100644 --- a/Assets/Scripts/Generation/GenerationProcessor.cs +++ b/Assets/Scripts/Generation/GenerationProcessor.cs @@ -201,5 +201,6 @@ public class GenerationProcessor { return 90; return 0; } + return 0; } } From 2f7bd05705eaf57f3952978650e10ca921b13c93 Mon Sep 17 00:00:00 2001 From: Triceraptodactyl Date: Mon, 23 Apr 2018 14:39:10 +0200 Subject: [PATCH 09/10] References set --- Assets/Scenes/CodeDEV.unity | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index be583c5..89da0f4 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -840,7 +840,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 63.233368 + value: 65.979645 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} @@ -1246,7 +1246,8 @@ MonoBehaviour: BorderSingle: {fileID: 1277252496101342, guid: ed9537580662f6046a1514a4c5bfdd98, type: 2} Ground: {fileID: 1487413182883822, guid: bc8a58beb0459094483211a5c7933959, type: 2} - Door: {fileID: 0} + DoorInner: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2} + DoorOuter: {fileID: 1575370008060226, guid: 70bf9bb227285e74383db2dc84cc6c50, type: 2} Rock: {fileID: 1373919933116942, guid: 5f26192f79d542e49ad24fadc39f5654, type: 2} RockL: {fileID: 1411303269485816, guid: 92068b1ee4568d045b60c249ba57c186, type: 2} RockU: {fileID: 1990883489100502, guid: c44f475306efef3438b85a84f91fcf81, type: 2} From c8fabe1b319d32c7df7727fdaaf72f52ae36e64f Mon Sep 17 00:00:00 2001 From: Piegames <14054505+piegamesde@users.noreply.github.com> Date: Mon, 23 Apr 2018 14:53:21 +0200 Subject: [PATCH 10/10] Still meta textures --- Assets/graphics/textures/car.meta | 8 ++++++++ Assets/graphics/textures/tmp.meta | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 Assets/graphics/textures/car.meta create mode 100644 Assets/graphics/textures/tmp.meta diff --git a/Assets/graphics/textures/car.meta b/Assets/graphics/textures/car.meta new file mode 100644 index 0000000..8504594 --- /dev/null +++ b/Assets/graphics/textures/car.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ec323b9157704d00a3409f8ea6e46b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/graphics/textures/tmp.meta b/Assets/graphics/textures/tmp.meta new file mode 100644 index 0000000..7ebab68 --- /dev/null +++ b/Assets/graphics/textures/tmp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df6e7833427b5497b92308fb6f54e552 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: