preparing to solve a nasty merge conflict.

This commit is contained in:
nexovec 2022-01-29 20:28:42 +01:00
parent 0438bfe7c6
commit 8ee6b445df

View File

@ -19,7 +19,7 @@ public class ProceduralGeneration : MonoBehaviour
this.spawnedLevelBlocks.Add(lastBlock); this.spawnedLevelBlocks.Add(lastBlock);
} }
List<GameObject> drawLoop(GameObject lastObject, GameObject objToSpawn) List<GameObject> spawnSpiralOfPlatforms(GameObject lastObject, GameObject objToSpawn)
{ {
// configuration: // configuration:
float horizontalDistancePerPlatform = 0.5f; float horizontalDistancePerPlatform = 0.5f;
@ -116,7 +116,7 @@ public class ProceduralGeneration : MonoBehaviour
} }
else else
{ {
List<GameObject> instantiatedGameObjectLists = this.drawLoop(lastBlock, levelBlocks[0]); List<GameObject> instantiatedGameObjectLists = this.spawnSpiralOfPlatforms(lastBlock, levelBlocks[0]);
foreach (var spavnedBlock in instantiatedGameObjectLists) foreach (var spavnedBlock in instantiatedGameObjectLists)
{ {
this.spawnedLevelBlocks.Add(spavnedBlock); this.spawnedLevelBlocks.Add(spavnedBlock);