Generation integration Part 1

Fix Texture Unit size Added Root tags Fixed NullPointers Todo: - Fix sprite rotation - Fix processing of hallways - Put doors in their own root GameObject
2018-04-22 17:52:20 +02:00 · 2018-04-22 17:52:20 +02:00 · e35c70e002
commit e35c70e002
parent 18c711d2c6
14 changed files with 372 additions and 21 deletions
--- a/Assets/Scenes/CodeDEV.unity
+++ b/Assets/Scenes/CodeDEV.unity
@ -1178,7 +1178,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  gameOverPanel: {fileID: 354516592}
-  healthcontroller: {fileID: 0}
+  healthcontroller: {fileID: 623293249}
 --- !u!4 &1487324258
 Transform:
  m_ObjectHideFlags: 0
@ -1353,3 +1353,4 @@ MonoBehaviour:
  cam: {fileID: 881384367}
  playerPrefab: {fileID: 1679161327080020, guid: 3d1911457c1e44f53b6b4044334db52f,
    type: 2}
+  mapRoot: {fileID: 1624368723}
--- a/Assets/Scripts/GameController.cs
+++ b/Assets/Scripts/GameController.cs
@ -154,9 +154,13 @@ public class GameController : MonoBehaviour {
        dg.Generate();
        GameObject goStart = gp.ProcessRoom(dg.start.tiles);
        start = goStart.AddComponent<Room>();
+        //start.SetDoorsRootObject(new List<Transform>(goStart.GetComponentsInChildren<Transform>()).Find(x => x.tag == "DoorRoot").gameObject);
+        start.Reload();
        start.transform.SetParent(mapRoot.transform);
        GameObject goFinish = gp.ProcessRoom(dg.end.tiles);
        finish = goFinish.AddComponent<Room>();
+        //finish.SetDoorsRootObject(new List<Transform>(goFinish.GetComponentsInChildren<Transform>()).Find(x => x.tag == "DoorRoot").gameObject);
+        finish.Reload();
        finish.transform.SetParent(mapRoot.transform);
        foreach (GenRoom gr in dg.rooms) {
            GameObject groom = gp.ProcessRoom(gr.tiles);
@ -170,7 +174,8 @@ public class GameController : MonoBehaviour {
        start.SetObjective(goal);
        start.OnPlayerEnter(player);
        player = goal.GetPlayer();
-        cam.GetComponent<CameraControl>().SetFollow(player.gameObject);
+        if(player != null)
+            cam.GetComponent<CameraControl>().SetFollow(player.gameObject);
    }

    private void Running() {
--- a/Assets/Scripts/Objectives/StartObjective.cs
+++ b/Assets/Scripts/Objectives/StartObjective.cs
@ -19,7 +19,8 @@ public class StartObjective : Objective {
    /// Handle activation code for a goal.
    /// </summary>
    /// <param name="ply">Player is ignored </param>
-    public override void ActivateGoal(Player player=null) {
+    public override void ActivateGoal(Player player) {
+        Debug.Log(room == null);
        if ( room.GetSpawnpoints().Count > 0 ) {
            GameObject ply = GameObject.Instantiate(playerPrefab);
            ply.transform.position = room.GetSpawnpoints()[0].position;
@ -33,6 +34,7 @@ public class StartObjective : Objective {
    /// </summary>
    /// <returns>Player</returns>
    public Player GetPlayer() {
+        Debug.Log(player == null);
        return player;
    }

--- a/Assets/Scripts/Room.cs
+++ b/Assets/Scripts/Room.cs
@ -22,17 +22,61 @@ public class Room : MonoBehaviour {
    // Use this for initialization
    void Start() {
        doors = new List<Door>();
-        foreach ( Door d in doorsRootObject.GetComponentsInChildren<Door>() ) {
-            doors.Add(d);
-        }
-        Debug.Log("[ROOMS] Doors: " + doors.Count);
-        spawnpoints = new List<Transform>();
-        foreach ( Transform t in spawnpointRootObject.GetComponentsInChildren<Transform>() ) {
-            if ( t.gameObject != spawnpointRootObject ) {
-                spawnpoints.Add(t);
+        if ( doorsRootObject != null ) {
+            foreach ( Door d in doorsRootObject.GetComponentsInChildren<Door>() ) {
+                doors.Add(d);
            }
+            Debug.Log("[ROOMS] Doors: " + doors.Count);
        }
-        Debug.Log("[ROOMS] Spawnpoints: " + spawnpoints.Count);
+        
+        spawnpoints = new List<Transform>();
+        if ( spawnpointRootObject != null ) {
+            foreach ( Transform t in spawnpointRootObject.GetComponentsInChildren<Transform>() ) {
+                if ( t.gameObject != spawnpointRootObject ) {
+                    spawnpoints.Add(t);
+                }
+            }
+            Debug.Log("[ROOMS] Spawnpoints: " + spawnpoints.Count);
+        }
+    }
+
+    /// <summary>
+    /// Reloads the spawnpoints and doors.
+    /// </summary>
+    public void Reload() {
+        doors = new List<Door>();
+        if ( doorsRootObject != null ) {
+            foreach ( Door d in doorsRootObject.GetComponentsInChildren<Door>() ) {
+                doors.Add(d);
+            }
+            Debug.Log("[ROOMS] Doors: " + doors.Count);
+        }
+
+        spawnpoints = new List<Transform>();
+        if ( spawnpointRootObject != null ) {
+            foreach ( Transform t in spawnpointRootObject.GetComponentsInChildren<Transform>() ) {
+                if ( t.gameObject != spawnpointRootObject ) {
+                    spawnpoints.Add(t);
+                }
+            }
+            Debug.Log("[ROOMS] Spawnpoints: " + spawnpoints.Count);
+        }
+    }
+
+    /// <summary>
+    /// Sets the doors root object.
+    /// </summary>
+    /// <param name="go"></param>
+    public void SetDoorsRootObject(GameObject go) {
+        doorsRootObject = go;
+    }
+
+    /// <summary>
+    /// Sets the spawnpoints root object.
+    /// </summary>
+    /// <param name="go"></param>
+    public void SetSpawnPointsRootObject(GameObject go) {
+        spawnpointRootObject = go;
    }

    /// <summary>
--- a/Assets/graphics/textures/Entities/Player/car.png.meta
+++ b/Assets/graphics/textures/Entities/Player/car.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Door/doorC.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Door/doorC.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Door/doorL.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Door/doorL.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Door/doorR.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Door/doorR.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Ground/ground0.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Ground/ground0.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Ground/ground1.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Ground/ground1.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Wall/wallCornerIn.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Wall/wallCornerIn.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Wall/wallCornerOut.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Wall/wallCornerOut.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/Assets/graphics/textures/FixedObjects/Wall/wallSide.png.meta
+++ b/Assets/graphics/textures/FixedObjects/Wall/wallSide.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
@ -67,6 +67,39 @@ TextureImporter:
    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: []
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -6,6 +6,8 @@ TagManager:
  tags:
  - wall
  - door
+  - DoorRoot
+  - SpawnlistRoot
  layers:
  - Default
  - TransparentFX