scallyw4g · scallyw4g · Sep 10, 2024 · Sep 10, 2024 · Sep 11, 2024 · Sep 11, 2024
diff --git a/examples/blank_project/game.cpp b/examples/blank_project/game.cpp
@@ -68,7 +68,7 @@ BONSAI_API_MAIN_THREAD_INIT_CALLBACK()
   world_position WorldCenter = {};
   canonical_position CameraTargetP = {};
 
-  StandardCamera(Graphics->Camera, 10000.0f, 1000.0f);
+  StandardCamera(Graphics->Camera, 30000.0f, 1000.0f);
 
   AllocateWorld(World, WorldCenter, WORLD_CHUNK_DIM, g_VisibleRegion);
 

diff --git a/examples/blank_project/game_constants.h b/examples/blank_project/game_constants.h
@@ -7,7 +7,13 @@ global_variable chunk_dimension
 WORLD_CHUNK_DIM = Chunk_Dimension(32, 32, 8);
 #else
 global_variable chunk_dimension
-g_VisibleRegion = Chunk_Dimension(8, 8, 4);
+/* g_VisibleRegion = Chunk_Dimension(8, 8, 8); */
+/* g_VisibleRegion = Chunk_Dimension(16, 16, 16); */
+/* g_VisibleRegion = Chunk_Dimension(32, 32, 32); */
+/* g_VisibleRegion = Chunk_Dimension(64, 64, 64); */
+/* g_VisibleRegion = Chunk_Dimension(128, 128, 128); */ 
+g_VisibleRegion = Chunk_Dimension(256, 256, 256); // 1.63km
+/* g_VisibleRegion = Chunk_Dimension(1024, 1024, 1024); */
 
 global_variable chunk_dimension
 WORLD_CHUNK_DIM = Chunk_Dimension(64, 64, 64);

diff --git a/examples/terrain_gen/game.cpp b/examples/terrain_gen/game.cpp
@@ -5,6 +5,38 @@
 #include "game_constants.h"
 #include "game_types.h"
 
+link_internal u32
+Terrain_Debug( world_chunk *Chunk,
+                       v3i  NoiseBasis,
+                      void *NoiseParams,
+                      void *UserData )
+{
+  UNPACK_NOISE_PARAMS(NoiseParams);
+
+  u32 Result = 0;
+
+  auto AbsX = Abs(Chunk->WorldP.x);
+  auto AbsY = Abs(Chunk->WorldP.y);
+
+  for ( s32 z = 0; z < Dim.z; ++ z)
+  {
+    for ( s32 y = 0; y < Dim.y; ++ y)
+    {
+      for ( s32 x = 0; x < Dim.x; ++ x)
+      {
+        if (x == 2 && y == 2 && z == 2)
+        {
+          s32 Index = GetIndex(Voxel_Position(x,y,z), Dim);
+          SetOccupancyBit(Chunk, Index, VoxelOccupancy_Filled);
+          Chunk->Voxels[Index].Color = RGBtoPackedHSV(RGBColor);
+          ++Result;
+        }
+      }
+    }
+  }
+
+  return Result;;
+}
 link_internal u32
 Terrain_Checkerboard( world_chunk *Chunk,
                               v3i  NoiseBasis,
@@ -32,7 +64,8 @@ Terrain_Checkerboard( world_chunk *Chunk,
         if (WorldZ < zMin)
         {
           s32 Index = GetIndex(Voxel_Position(x,y,z), Dim);
-          Chunk->Voxels[Index].Flags = Voxel_Filled;
+          /* Chunk->Voxels[Index].Flags = Voxel_Filled; */
+          SetOccupancyBit(Chunk, Index, VoxelOccupancy_Filled);
           Chunk->Voxels[Index].Color = RGBtoPackedHSV(RGBColor);
           ++Result;
         }
@@ -70,8 +103,9 @@ GrassyIslandTerrain( world_chunk *Chunk,
       {
         s64 WorldX = x - SrcToDest.x + (WorldChunkDim.x*Chunk->WorldP.x);
         s32 VoxIndex = GetIndex(Voxel_Position(x,y,z), Dim);
-        Chunk->Voxels[VoxIndex].Flags = Voxel_Empty;
-        Assert( NotSet(&Chunk->Voxels[VoxIndex], Voxel_Filled) );
+        NotImplemented;
+        /* Chunk->Voxels[VoxIndex].Flags = Voxel_Empty; */
+        /* Assert( NotSet(&Chunk->Voxels[VoxIndex], Voxel_Filled) ); */
 
         r32 NoiseValue = 0.f;
         for (u32 OctaveIndex = 0; OctaveIndex < OctaveCount; ++OctaveIndex)
@@ -223,23 +257,14 @@ GrassyIslandTerrain( world_chunk *Chunk,
         }
 #endif
 
-        SetFlag(&Chunk->Voxels[VoxIndex], (voxel_flag)(Voxel_Filled*NoiseChoice));
+        /* SetFlag(&Chunk->Voxels[VoxIndex], (voxel_flag)(Voxel_Filled*NoiseChoice)); */
+        SetOccupancyBit(Chunk, VoxIndex, s32(NoiseChoice));
         Chunk->Voxels[VoxIndex].Color = RGBtoPackedHSV(ThisColor)*u16(NoiseChoice);
         Chunk->Voxels[VoxIndex].Transparency = ThisTransparency;
         ChunkSum += NoiseChoice;
 
-
-
-        Assert( (Chunk->Voxels[VoxIndex].Flags&VoxelFaceMask) == 0);
-
-        if (NoiseChoice)
-        {
-          Assert( IsSet(&Chunk->Voxels[VoxIndex], Voxel_Filled) );
-        }
-        else
-        {
-          Assert( NotSet(&Chunk->Voxels[VoxIndex], Voxel_Filled) );
-        }
+        NotImplemented;
+        /* Assert( (Chunk->Voxels[VoxIndex].Flags&VoxelFaceMask) == 0); */
       }
     }
   }
@@ -275,8 +300,8 @@ WarpedTerrain( world_chunk *Chunk,
       {
         s64 WorldX = x - SrcToDest.x + (WorldChunkDim.x*Chunk->WorldP.x);
         s32 VoxIndex = GetIndex(Voxel_Position(x,y,z), Dim);
-        Chunk->Voxels[VoxIndex].Flags = Voxel_Empty;
-        Assert( NotSet(&Chunk->Voxels[VoxIndex], Voxel_Filled) );
+        NotImplemented;
+        /* Chunk->Voxels[VoxIndex].Flags = Voxel_Empty; */
 
         r32 NoiseValue = 0.f;
         for (u32 OctaveIndex = 0; OctaveIndex < OctaveCount; ++OctaveIndex)
@@ -323,20 +348,13 @@ WarpedTerrain( world_chunk *Chunk,
         }
 #endif
 
-        SetFlag(&Chunk->Voxels[VoxIndex], (voxel_flag)(Voxel_Filled*NoiseChoice));
+        /* SetFlag(&Chunk->Voxels[VoxIndex], (voxel_flag)(Voxel_Filled*NoiseChoice)); */
+        SetOccupancyBit(Chunk, VoxIndex, s32(NoiseChoice));
         Chunk->Voxels[VoxIndex].Color = RGBtoPackedHSV(ThisColor)*u16(NoiseChoice);
         ChunkSum += NoiseChoice;
 
-        Assert( (Chunk->Voxels[VoxIndex].Flags&VoxelFaceMask) == 0);
-
-        if (NoiseChoice)
-        {
-          Assert( IsSet(&Chunk->Voxels[VoxIndex], Voxel_Filled) );
-        }
-        else
-        {
-          Assert( NotSet(&Chunk->Voxels[VoxIndex], Voxel_Filled) );
-        }
+        NotImplemented;
+        /* Assert( (Chunk->Voxels[VoxIndex].Flags&VoxelFaceMask) == 0); */
       }
     }
   }
@@ -370,7 +388,8 @@ BONSAI_API_WORKER_THREAD_CALLBACK()
       {
         // NOTE(Jesse): This is an optimization; the engine marks chunks that
         // have moved outside of the visible region as garbage.
-        Chunk->Flags = Chunk_Uninitialized;
+        NotImplemented;
+        /* Chunk->Flags = Chunk_Uninitialized; */
       }
       else
       {
@@ -381,6 +400,15 @@ BONSAI_API_WORKER_THREAD_CALLBACK()
         /* Info("%S", ToString(GenType)); */
         switch (GenType)
         {
+          case TerrainGenType_Debug:
+          {
+            // Flat Params
+            v3 Period = {};
+            s32 Amplititude = {};
+            s32 StartingZDepth = {};
+            v3 Color = RGB_GRASS_GREEN;
+            InitializeChunkWithNoise( Terrain_Debug, Thread, Chunk, Chunk->Dim, 0, Period, Amplititude, StartingZDepth, Color, Ignored, ChunkInitFlag_Noop, 0);
+          } break;
           case TerrainGenType_Flat:
           {
             // Flat Params
@@ -394,11 +422,11 @@ BONSAI_API_WORKER_THREAD_CALLBACK()
           case TerrainGenType_SinCos:
           {
             // Bumpy Sin(x)+Cos(y) noise.  Useful for visualizing the polylines/splines mapping noise values to their final values.
-            v3 Period = V3(100);
-            s32 Amplititude = 250;
+            v3 Period = V3(20);
+            s32 Amplititude = 70;
             /* s32 Period = 100; */
             /* s32 Amplititude = 2500; */
-            s32 StartingZDepth = -1;
+            s32 StartingZDepth = 15;
             chunk_init_flags InitFlags = ChunkInitFlag_Noop;
             v3 Color = RGB_GRASS_GREEN;
             InitializeChunkWithNoise( Terrain_SinCos, Thread, Chunk, Chunk->Dim, 0, Period, Amplititude, StartingZDepth, Color, Ignored, InitFlags, 0);
@@ -451,11 +479,40 @@ BONSAI_API_WORKER_THREAD_CALLBACK()
 
           case TerrainGenType_FBM2D:
           {
-            // FBM params
-            v3 Period = V3(300);
-            s32 Amplititude = 220;
-            s32 StartingZDepth = -200;
-            u32 Octaves = 4;
+            /* // FBM params */
+
+            // 5km features
+            /* v3 Period = V3(500'000); */
+            /* s32 Amplititude = 80'000; */
+            /* s32 StartingZDepth = 20000; */
+            /* u32 Octaves = 9; */
+
+            // 2km features
+            /* v3 Period = V3(200'000); */
+            /* // 600m high */
+            /* s32 Amplititude = 60'000; */
+            /* s32 StartingZDepth = 60000; */
+            /* u32 Octaves = 7; */
+
+            /* v3 Period = V3(5000); */
+            /* s32 Amplititude = 1500; */
+            /* s32 StartingZDepth = 1600; */
+            /* u32 Octaves = 9; */
+
+            v3 Period = V3(2500);
+            s32 Amplititude = 1500;
+            s32 StartingZDepth = 1600;
+            u32 Octaves = 9;
+            /* u32 Octaves = 4; */
+            /* u32 Octaves = 1; */
+
+            /* v3 Period = V3(50); */
+            /* s32 Amplititude = 60; */
+            /* s32 StartingZDepth = 6000; */
+            /* u32 Octaves = 1; */
+            /* u32 Octaves = 4; */
+
+
             /* chunk_init_flags InitFlags = ChunkInitFlag_ComputeStandingSpots; */
             chunk_init_flags InitFlags = ChunkInitFlag_Noop;
             v3 Color = RGB_GRASS_GREEN;
@@ -558,7 +615,7 @@ BONSAI_API_WORKER_THREAD_CALLBACK()
             /* chunk_init_flags InitFlags = ChunkInitFlag_GenMipMapLODs; */
             chunk_init_flags InitFlags = ChunkInitFlag_Noop;
             v3 Color = RGB_GRASS_GREEN;
-            InitializeChunkWithNoise( GrassyTerracedTerrain4, Thread, Chunk, Chunk->Dim, 0, Period, Amplititude, StartingZDepth, Color, MeshBit_Lod0, InitFlags, (void*)&OctaveBuf);
+            /* InitializeChunkWithNoise( GrassyTerracedTerrain4, Thread, Chunk, Chunk->Dim, 0, Period, Amplititude, StartingZDepth, Color, MeshBit_Lod0, InitFlags, (void*)&OctaveBuf); */
           } break;
 
 
@@ -567,7 +624,7 @@ BONSAI_API_WORKER_THREAD_CALLBACK()
             // Custom FBM noise example generating slightly-more-complex game-world-like terrain
             v3 Period = V3(0); // Ignored
             s32 Amplititude = 0; // Ignored
-            s32 StartingZDepth = -100;
+            s32 StartingZDepth = 100;
             u32 OctaveCount = 1;
 
             octave_buffer OctaveBuf = { OctaveCount, {} };
@@ -691,8 +748,6 @@ BONSAI_API_WORKER_THREAD_CALLBACK()
 
       }
 
-      FinalizeChunkInitialization(Chunk);
-      UnSetFlag(&Chunk->Flags, Chunk_Queued);
     } break;
   }
 
@@ -705,18 +760,24 @@ BONSAI_API_MAIN_THREAD_INIT_CALLBACK()
 
   Global_AssetPrefixPath = CSz("examples/terrain_gen/assets");
 
-  world_position WorldCenter = {};
+  /* world_position WorldCenter = V3i(s32_MAX-1000); */
+  world_position WorldCenter = V3i(100, 100, 0);
   canonical_position CameraTargetP = {};
 
-  StandardCamera(Graphics->Camera, 10000.0f, 5000.0f);
+  f32 DistanceFromTarget = Length(g_VisibleRegion/2.f);
+  f32 FarClip = 150000.f;
+  StandardCamera(Graphics->Camera, FarClip, DistanceFromTarget);
 
   AllocateWorld(World, WorldCenter, WORLD_CHUNK_DIM, g_VisibleRegion);
 
   GameState = Allocate(game_state, Resources->GameMemory, 1);
 
   /* GameState->TerrainGenType = TerrainGenType_GrassyTerracedTerrain; */
 
-  GameState->TerrainGenType = TerrainGenType_SinCos;
+  /* GameState->TerrainGenType = TerrainGenType_Debug; */
+  /* GameState->TerrainGenType = TerrainGenType_SinCos; */
+  /* GameState->TerrainGenType = TerrainGenType_TerracedTerrain; */
+  GameState->TerrainGenType = TerrainGenType_FBM2D;
   /* GameState->TerrainGenType = TerrainGenType_GrassyTerracedTerrain4; */
   /* GameState->TerrainGenType = TerrainGenType_Voronoi; */
   /* World->Center = V3i(-22, 101, 1); */
@@ -727,9 +788,13 @@ BONSAI_API_MAIN_THREAD_INIT_CALLBACK()
   /* CameraGhost->P.WorldP = V3i(-25, -75, 2); */ 
   /* CameraGhost->P.WorldP = V3i(-5, -121, 2); */ 
 
-  CameraGhost->P.WorldP = V3i(330, -87, 2); 
+  /* CameraGhost->P.WorldP = V3i(330, -87, 2); */ 
   /* CameraGhost->P.WorldP = V3i(33, -87, 2); */ 
   /* CameraGhost->P.WorldP = V3i(5, -73, 2); */ 
+  /* CameraGhost->P.WorldP = V3i(1000, 1000, 100); */ 
+  /* CameraGhost->P.WorldP = WorldCenter; */
+  /* CameraGhost->P.WorldP = WorldCenter + g_VisibleRegion/2; */
+  CameraGhost->P.WorldP = g_VisibleRegion/2;
   CameraGhost->Behavior = entity_behavior_flags(CameraGhost->Behavior|EntityBehaviorFlags_DefatulCameraGhostBehavior|EntityBehaviorFlags_WorldCenter);
 
   SpawnEntity(CameraGhost);

diff --git a/examples/terrain_gen/game_constants.h b/examples/terrain_gen/game_constants.h
@@ -9,39 +9,23 @@ WORLD_CHUNK_DIM = Chunk_Dimension(32, 32, 8);
 #else
 
 global_variable chunk_dimension
-/* g_VisibleRegion = Chunk_Dimension(120, 120, 6); */
-/* g_VisibleRegion = Chunk_Dimension(64, 64, 16); */
-/* g_VisibleRegion = Chunk_Dimension(80, 80, 8); */
-/* g_VisibleRegion = Chunk_Dimension(64, 64, 8); */
-/* g_VisibleRegion = Chunk_Dimension(64, 64, 6); */
-/* g_VisibleRegion = Chunk_Dimension(32, 32, 16); */
-/* g_VisibleRegion = Chunk_Dimension(32, 32, 10); */
-/* g_VisibleRegion = Chunk_Dimension(32, 32, 8); */
-/* g_VisibleRegion = Chunk_Dimension(32, 32, 6); */
-/* g_VisibleRegion = Chunk_Dimension(32, 32, 4); */
-/* g_VisibleRegion = Chunk_Dimension(24, 24, 4); */
-/* g_VisibleRegion = Chunk_Dimension(24, 24, 6); */
-g_VisibleRegion = Chunk_Dimension(24, 24, 8);
-/* g_VisibleRegion = Chunk_Dimension(16, 16, 8); */
-/* g_VisibleRegion = Chunk_Dimension(16, 16, 6); */
-/* g_VisibleRegion = Chunk_Dimension(10, 10, 10); */
-/* g_VisibleRegion = Chunk_Dimension(8, 8, 6); */
-
-
-/* global_variable chunk_dimension */
-/* WORLD_CHUNK_DIM = Chunk_Dimension(16, 16, 16); */
-
-/* global_variable chunk_dimension */
-/* WORLD_CHUNK_DIM = Chunk_Dimension(16, 16, 16); */
-
-/* global_variable chunk_dimension */
-/* WORLD_CHUNK_DIM = Chunk_Dimension(28, 28, 28); */
-
-/* global_variable chunk_dimension */
-/* WORLD_CHUNK_DIM = Chunk_Dimension(32, 32, 32); */
-
-/* global_variable chunk_dimension */
-/* WORLD_CHUNK_DIM = Chunk_Dimension(64, 64, 64); */
+/* g_VisibleRegion = Chunk_Dimension(8192*32, 8192*32, 8192*32); // 1677km */
+/* g_VisibleRegion = Chunk_Dimension(8192*8, 8192*8, 8192*8); // 416km */
+/* g_VisibleRegion = Chunk_Dimension(8192*4, 8192*4, 8192*4); // 208km */
+/* g_VisibleRegion = Chunk_Dimension(8192*2, 8192*2, 8192*2); // 104km */
+/* g_VisibleRegion = Chunk_Dimension(8192, 8192, 8192); // 52km */
+/* g_VisibleRegion = Chunk_Dimension(4096, 4096, 4096); // 26km */
+/* 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(4, 4, 4); */
+/* g_VisibleRegion = Chunk_Dimension(2, 2, 2); */
+
 
 
 global_variable chunk_dimension

diff --git a/examples/terrain_gen/game_types.h b/examples/terrain_gen/game_types.h
@@ -18,6 +18,8 @@ enum terrain_gen_type
   TerrainGenType_GrassyIsland               = (1 << 13),
   TerrainGenType_Hoodoo                     = (1 << 14),
   TerrainGenType_Warped                     = (1 << 15),
+
+  TerrainGenType_Debug                      = (1 << 16),
 };
 
 poof(radio_button_group_for_bitfield_enum(terrain_gen_type))

diff --git a/examples/transparency/remedy_repro.rdbg b/examples/transparency/remedy_repro.rdbg
diff --git a/external/bonsai_debug b/external/bonsai_debug
diff --git a/external/bonsai_stdlib b/external/bonsai_stdlib
diff --git a/generated/anonymous_function_ui_render_command_RuTTrHiW.h b/generated/anonymous_function_ui_render_command_RuTTrHiW.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/ui/ui.cpp:2311:0
+// external/bonsai_stdlib/src/ui/ui.cpp:2317:0
 
 case type_ui_render_command_window_start:
 {

diff --git a/generated/anonymous_input_5Nt8cwGP.h b/generated/anonymous_input_5Nt8cwGP.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/platform/win32/win32_platform.cpp:411:0
+// external/bonsai_stdlib/src/platform/win32/win32_platform.cpp:410:0
 
 BindKeyupToInput(VK_RETURN, Enter);
 

diff --git a/generated/anonymous_input_Lwen2qoF.h b/generated/anonymous_input_Lwen2qoF.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/ui/ui.cpp:3279:0
+// external/bonsai_stdlib/src/ui/ui.cpp:3291:0
 
 if (Input->Dot.Clicked)
 {
+5 −109		src/api.h
+9 −4		src/debug_data_system.cpp
+6 −1		src/debug_render_system.cpp
+1 −0		src/platform/win32_etw.cpp
+0 −8		src/public.h
+2 −0		bonsai_stdlib.cpp
+18 −39		bonsai_stdlib.h
+5 −0		scripts/setup_for_cxx.sh
+3 −0		src/assert.h
+156 −0		src/avx2_v3.h
+1 −1		src/bit_tricks.h
+24 −22		src/c_parser.cpp
+4 −5		src/c_parser.h
+9 −4		src/colors.h
+5 −2		src/counted_string.cpp
+3 −2		src/counted_string.h
+22 −2		src/file.cpp
+228 −211		src/gl.cpp
+66 −0		src/gl.h
+2 −2		src/iterators.h
+23 −11		src/maff.h
+16 −17		src/memory_arena.cpp
+12 −12		src/memory_arena.h
+2 −1		src/noise.h
+403 −0		src/perlin.cpp
+359 −171		src/perlin.h
+10 −10		src/platform/win32/win32_platform.cpp
+66 −18		src/poof_functions.h
+16 −25		src/rect.h
+73 −11		src/shader.cpp
+13 −4		src/shader.h
+456 −0		src/simd_avx2.h
+179 −0		src/simd_sse.h
+1 −0		src/texture.cpp
+3 −1		src/texture.h
+3 −1		src/thread.cpp
+0 −2		src/ui/interactable.h
+45 −33		src/ui/ui.cpp
+1 −1		src/ui/ui.h
+35 −8		src/vector.h