Changed rendering of tiles to always show them, changed camera range
This commit is contained in:
@@ -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<Vector3, GameObject> 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<Tile>().setType(tiletype);
|
||||
}
|
||||
|
||||
private void applyNormalNoise(GameObject tile)
|
||||
private void applyNormalNoise(GameObject tile, Dictionary<Vector3, GameObject> map)
|
||||
{
|
||||
//resetMesh(tile);
|
||||
Mesh mesh = tile.GetComponent<MeshFilter>().mesh;
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<Tile>().leftTile(playerX, playerZ))
|
||||
{
|
||||
@@ -141,30 +141,6 @@ public class WorldGenerator : MonoBehaviour
|
||||
break;
|
||||
}
|
||||
}
|
||||
updateRenderedTiles();
|
||||
}
|
||||
|
||||
if (currentTile.GetComponent<Tile>().removeConnectedTiles(playerX, playerZ))
|
||||
{
|
||||
updateRenderedTiles();
|
||||
}
|
||||
}
|
||||
|
||||
private void updateRenderedTiles()
|
||||
{
|
||||
toRemove = new List<GameObject>();
|
||||
foreach (GameObject tile in renderedTiles)
|
||||
{
|
||||
if (!tile.Equals(currentTile))
|
||||
{
|
||||
tile.GetComponent<Tile>().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()
|
||||
|
||||
Reference in New Issue
Block a user