diff --git a/examples/terrain_gen/game.cpp b/examples/terrain_gen/game.cpp index 0547df85..ff63813d 100644 --- a/examples/terrain_gen/game.cpp +++ b/examples/terrain_gen/game.cpp @@ -481,10 +481,10 @@ BONSAI_API_WORKER_THREAD_CALLBACK() { /* // FBM params */ - /* v3 Period = V3(18000); */ - /* s32 Amplititude = 10000; */ - /* s32 StartingZDepth = 5000; */ - /* u32 Octaves = 6; */ + v3 Period = V3(100000); + s32 Amplititude = 20000; + s32 StartingZDepth = 5000; + u32 Octaves = 7; /* v3 Period = V3(500); */ /* s32 Amplititude = 500; */ @@ -504,10 +504,10 @@ BONSAI_API_WORKER_THREAD_CALLBACK() /* u32 Octaves = 1; */ /* /1* u32 Octaves = 4; *1/ */ - v3 Period = V3(50); - s32 Amplititude = 60; - s32 StartingZDepth = 60; - u32 Octaves = 1; +/* v3 Period = V3(50); */ +/* s32 Amplititude = 60; */ +/* s32 StartingZDepth = 60; */ +/* u32 Octaves = 4; */ /* u32 Octaves = 4; */ diff --git a/examples/terrain_gen/game_constants.h b/examples/terrain_gen/game_constants.h index e16c2a59..5bea3de8 100644 --- a/examples/terrain_gen/game_constants.h +++ b/examples/terrain_gen/game_constants.h @@ -11,14 +11,14 @@ WORLD_CHUNK_DIM = Chunk_Dimension(32, 32, 8); global_variable chunk_dimension /* g_VisibleRegion = Chunk_Dimension(8192, 8192, 8192); */ /* g_VisibleRegion = Chunk_Dimension(4096, 4096, 4096); */ // 26km -/* g_VisibleRegion = Chunk_Dimension(2048, 2048, 2048); // 13.11 km */ +g_VisibleRegion = Chunk_Dimension(2048, 2048, 2048); // 13.11 km /* g_VisibleRegion = Chunk_Dimension(512, 512, 512); // 3.28 km */ /* g_VisibleRegion = Chunk_Dimension(256, 256, 256); */ /* g_VisibleRegion = Chunk_Dimension(128, 128, 128); */ /* g_VisibleRegion = Chunk_Dimension(64, 64, 64); */ /* g_VisibleRegion = Chunk_Dimension(32, 32, 32); */ /* g_VisibleRegion = Chunk_Dimension(16, 16, 16); */ -g_VisibleRegion = Chunk_Dimension(8, 8, 8); +/* g_VisibleRegion = Chunk_Dimension(8, 8, 8); */ /* g_VisibleRegion = Chunk_Dimension(4, 4, 4); */ /* g_VisibleRegion = Chunk_Dimension(2, 2, 2); */ diff --git a/external/bonsai_stdlib b/external/bonsai_stdlib index 3c28f095..119fb6fa 160000 --- a/external/bonsai_stdlib +++ b/external/bonsai_stdlib @@ -1 +1 @@ -Subproject commit 3c28f095059a6be993680c4a9bed53d06c06fbde +Subproject commit 119fb6fa1737121372637a94a933841819f42568 diff --git a/src/engine/terrain.cpp b/src/engine/terrain.cpp index 4a778c0b..93e8b465 100644 --- a/src/engine/terrain.cpp +++ b/src/engine/terrain.cpp @@ -166,8 +166,8 @@ Terrain_FBM2D( world_chunk *Chunk, auto _x1 = U32_8X( xCoords[8], xCoords[9], xCoords[10], xCoords[11], xCoords[12], xCoords[13], xCoords[14], xCoords[15] ); u32 xParamsIndex = (OctaveIndex*2); Assert(xParamsIndex < 15); - xParams[OctaveIndex] = ComputePerlinParameters(U32_8X(WorldBasis.x), _x0, xChunkResolution, U32_8X(u32(InteriorPeriod.x)), PrimeX); - xParams[OctaveIndex+1] = ComputePerlinParameters(U32_8X(WorldBasis.x), _x1, xChunkResolution, U32_8X(u32(InteriorPeriod.x)), PrimeX); + xParams[(OctaveIndex*2)] = ComputePerlinParameters(U32_8X(WorldBasis.x), _x0, xChunkResolution, U32_8X(u32(InteriorPeriod.x)), PrimeX); + xParams[(OctaveIndex*2)+1] = ComputePerlinParameters(U32_8X(WorldBasis.x), _x1, xChunkResolution, U32_8X(u32(InteriorPeriod.x)), PrimeX); InteriorPeriod = Max(V3i(1), InteriorPeriod/2); }