From b9aa033c132a3d0503f097101db737f7ff3fa76b Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Sat, 25 Nov 2023 21:47:29 +0100 Subject: [PATCH] Changed rendering of tiles to always show them, changed camera range --- Assets/Prefabs/Tree_1.prefab | 25 ++++++++++++++++++++++--- Assets/Scenes/GameScene.unity | 2 +- Assets/Scripts/NoiseGenerator.cs | 13 +++++++------ Assets/Scripts/PlayerCamera.cs | 1 + Assets/Scripts/Tile.cs | 1 - Assets/Scripts/WorldGenerator.cs | 31 +++---------------------------- 6 files changed, 34 insertions(+), 39 deletions(-) diff --git a/Assets/Prefabs/Tree_1.prefab b/Assets/Prefabs/Tree_1.prefab index 11b653c..4c4ada5 100644 --- a/Assets/Prefabs/Tree_1.prefab +++ b/Assets/Prefabs/Tree_1.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8867824946895199964} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5185012028430240707 MeshFilter: @@ -94,9 +94,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8867824946895199964} 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: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2534964839176971238, guid: da351dd627233e97298b0ed2bc56543f, type: 3} @@ -107,10 +115,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8867824946895199964} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 10 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 07dea20..56baa29 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -21436,7 +21436,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 + far clip plane: 100 field of view: 60 orthographic: 0 orthographic size: 5 diff --git a/Assets/Scripts/NoiseGenerator.cs b/Assets/Scripts/NoiseGenerator.cs index 8deb608..219cf4b 100644 --- a/Assets/Scripts/NoiseGenerator.cs +++ b/Assets/Scripts/NoiseGenerator.cs @@ -9,15 +9,16 @@ using System.Linq; public class NoiseGenerator { System.Random rand = new System.Random(); - public void applyNoise(GameObject tile, string name) + public void applyNoise(GameObject tile, string name, Dictionary map) { - if(name.Length > 0){ + /*if(name.Length > 0){ applyCityNoise(tile); } else{ - applyNormalNoise(tile); - } - + applyNormalNoise(tile, map); + }*/ + applyNormalNoise(tile, map); + } private void applyCityNoise(GameObject tile) @@ -45,7 +46,7 @@ public class NoiseGenerator tile.GetComponent().setType(tiletype); } - private void applyNormalNoise(GameObject tile) + private void applyNormalNoise(GameObject tile, Dictionary map) { //resetMesh(tile); Mesh mesh = tile.GetComponent().mesh; diff --git a/Assets/Scripts/PlayerCamera.cs b/Assets/Scripts/PlayerCamera.cs index 82a6fad..e011144 100644 --- a/Assets/Scripts/PlayerCamera.cs +++ b/Assets/Scripts/PlayerCamera.cs @@ -29,6 +29,7 @@ namespace Assets.Scripts void Update() { transform.position = new Vector3(transform.parent.transform.position.x, transform.position.y, transform.parent.transform.position.z); + } private void FixedUpdate() diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Tile.cs index ea088ed..4191be7 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/Tile.cs @@ -123,7 +123,6 @@ public class Tile : MonoBehaviour bool result = false; if (playerX >= borderEast + 10 || playerX <= borderWest - 10 || playerZ >= borderNorth + 10 || playerZ <= borderSouth - 10) { - changeRenderer(); result = true; } return result; diff --git a/Assets/Scripts/WorldGenerator.cs b/Assets/Scripts/WorldGenerator.cs index b972871..bce9630 100644 --- a/Assets/Scripts/WorldGenerator.cs +++ b/Assets/Scripts/WorldGenerator.cs @@ -70,7 +70,7 @@ public class WorldGenerator : MonoBehaviour void Update() { createTile(player.transform.position.x, player.transform.position.z); - hideTile(player.transform.position.x, player.transform.position.z); + changeCurrentTile(player.transform.position.x, player.transform.position.z); resetPlayer(); } @@ -101,7 +101,7 @@ public class WorldGenerator : MonoBehaviour SteamWorksHandler.getStandardAchievement("CityAchievement"); } } - noise.applyNoise(newTile, name); + noise.applyNoise(newTile, name, tiles); if(name.Length <= 0){ name = tile.name; } @@ -128,7 +128,7 @@ public class WorldGenerator : MonoBehaviour } } - public void hideTile(float playerX, float playerZ) + public void changeCurrentTile(float playerX, float playerZ) { if (currentTile.GetComponent().leftTile(playerX, playerZ)) { @@ -141,30 +141,6 @@ public class WorldGenerator : MonoBehaviour break; } } - updateRenderedTiles(); - } - - if (currentTile.GetComponent().removeConnectedTiles(playerX, playerZ)) - { - updateRenderedTiles(); - } - } - - private void updateRenderedTiles() - { - toRemove = new List(); - foreach (GameObject tile in renderedTiles) - { - if (!tile.Equals(currentTile)) - { - tile.GetComponent().changeRenderer(); - toRemove.Add(tile); - } - } - - foreach (GameObject tile in toRemove) - { - renderedTiles.Remove(tile); } } @@ -240,7 +216,6 @@ public class WorldGenerator : MonoBehaviour currentTile = tiles[current]; Vector3 position = new Vector3(currentTile.transform.position.x, 5, currentTile.transform.position.z); player.transform.SetPositionAndRotation(position, player.transform.rotation); - updateRenderedTiles(); } public int getCityAmount()