scallyw4g · scallyw4g · Mar 28, 2024 · Apr 2, 2024 · Apr 2, 2024 · Apr 4, 2024
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -10,6 +10,8 @@
 - Tuned some gBuffer texture storage resolution, transparency buffer storage resolution, & turned down default shadow quality
 	This is in an effort to get mid-end cards running at >60fps on 4k
 
+- Fix some assertions due to new memory sizing requirements on world gen chunks
+
 * 1.5.0
 
 - @Shawnecy Chased down a divide by zero in the lighting shader

diff --git a/examples/turn_based/game.cpp b/examples/turn_based/game.cpp
@@ -535,10 +535,10 @@ IceBlockCharges(entity *Player)
   return Result;
 }
 
-link_internal u32
+link_internal u16
 GetColorForAction(player_action Action)
 {
-  u32 Result = 0;
+  u16 Result = 0;
 
   switch (Action)
   {
@@ -965,7 +965,7 @@ BONSAI_API_MAIN_THREAD_CALLBACK()
 
             if (IsWithinRangeForAction(World, Player, ActionCenterP, GameState->ProposedAction))
             {
-              u32 Color = GetColorForAction(GameState->ProposedAction);
+              u16 Color = GetColorForAction(GameState->ProposedAction);
               DrawStandingSpot(&GpuMap->Buffer, Camera, ActionMinP, Color, 0.5f);
 
               if (Input->LMB.Clicked)

diff --git a/external/bonsai_stdlib b/external/bonsai_stdlib
diff --git a/generated/block_array_standing_spot_688853862.h b/generated/block_array_standing_spot_688853862.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.h:475:0
+// src/engine/world_chunk.h:469:0
 
 struct standing_spot_block
 {

diff --git a/generated/block_array_voxel_stack_element_688853862.h b/generated/block_array_voxel_stack_element_688853862.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:4054:0
+// src/engine/world_chunk.cpp:4053:0
 
 struct voxel_stack_element_block
 {

diff --git a/generated/buffer_standing_spot.h b/generated/buffer_standing_spot.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.h:518:0
+// src/engine/world_chunk.h:512:0
 
 struct standing_spot_buffer
 {

diff --git a/generated/do_editor_ui_for_compound_type_graphics.h b/generated/do_editor_ui_for_compound_type_graphics.h
@@ -160,6 +160,18 @@ DoEditorUi(renderer_2d *Ui, window_layout *Window, graphics *Element, cs Name, u
 
 
 
+      DoEditorUi(Ui,
+        Window,
+&Element->ColorPaletteTexture,
+        CSz("ColorPaletteTexture"),
+        Params
+        );
+
+
+
+
+
+
       DoEditorUi(Ui,
         Window,
 &Element->Transparency,

diff --git a/generated/do_editor_ui_for_compound_type_lighting_render_group.h b/generated/do_editor_ui_for_compound_type_lighting_render_group.h
@@ -52,8 +52,8 @@ DoEditorUi(renderer_2d *Ui, window_layout *Window, lighting_render_group *Elemen
 
       DoEditorUi(Ui,
         Window,
-&Element->BloomTextureFBO,
-        CSz("BloomTextureFBO"),
+&Element->LuminanceTex,
+        CSz("LuminanceTex"),
         Params
         );
 
@@ -64,20 +64,8 @@ DoEditorUi(renderer_2d *Ui, window_layout *Window, lighting_render_group *Elemen
 
       DoEditorUi(Ui,
         Window,
-&Element->LightingTex,
-        CSz("LightingTex"),
-        Params
-        );
-
-
-
-
-
-
-      DoEditorUi(Ui,
-        Window,
-&Element->BloomTex,
-        CSz("BloomTex"),
+&Element->Shader,
+        CSz("Shader"),
         Params
         );
 
@@ -88,8 +76,8 @@ DoEditorUi(renderer_2d *Ui, window_layout *Window, lighting_render_group *Elemen
 
       DoEditorUi(Ui,
         Window,
-&Element->Shader,
-        CSz("Shader"),
+&Element->Bloom,
+        CSz("Bloom"),
         Params
         );
       if (DidToggle) { CLOSE_INDENT_FOR_TOGGLEABLE_REGION(); }

diff --git a/generated/do_editor_ui_for_compound_type_vertex_material.h b/generated/do_editor_ui_for_compound_type_vertex_material.h
@@ -28,16 +28,17 @@ DoEditorUi(renderer_2d *Ui, window_layout *Window, vertex_material *Element, cs
       if (DidToggle) { OPEN_INDENT_FOR_TOGGLEABLE_REGION(); }
       DoEditorUi(Ui,
         Window,
-&Element->Color,
-        CSz("Color"),
+&Element->ColorIndex,
+        CSz("ColorIndex"),
         Params
         );
 
 
 
 
 
-
+      PushNewRow(Ui);
+
       DoEditorUi(Ui,
         Window,
 &Element->Transparency,

diff --git a/generated/flood_fill_iteration_pattern_199741702_161749140_632272777.h b/generated/flood_fill_iteration_pattern_199741702_161749140_632272777.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:4367:0
+// src/engine/world_chunk.cpp:4366:0
 
 random_series ColorEntropy = {4654376543246};
 

diff --git a/generated/flood_fill_iteration_pattern_275071431_101859599_0.h b/generated/flood_fill_iteration_pattern_275071431_101859599_0.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:4607:0
+// src/engine/world_chunk.cpp:4606:0
 
 random_series ColorEntropy = {4654376543246};
 

diff --git a/generated/flood_fill_iteration_pattern_275071431_785723886_0.h b/generated/flood_fill_iteration_pattern_275071431_785723886_0.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:4591:0
+// src/engine/world_chunk.cpp:4590:0
 
 random_series ColorEntropy = {4654376543246};
 

diff --git a/generated/flood_fill_iteration_pattern_846291950_267608728_0.h b/generated/flood_fill_iteration_pattern_846291950_267608728_0.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:4471:0
+// src/engine/world_chunk.cpp:4470:0
 
 random_series ColorEntropy = {4654376543246};
 

diff --git a/generated/gen_common_vector_v2.h b/generated/gen_common_vector_v2.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:742:0
+// external/bonsai_stdlib/src/vector.h:737:0
 
 inline r32
 LengthSq( v2 Vec )

diff --git a/generated/gen_common_vector_v3.h b/generated/gen_common_vector_v3.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:745:0
+// external/bonsai_stdlib/src/vector.h:740:0
 
 inline r32
 LengthSq( v3 Vec )

diff --git a/generated/gen_common_vector_v3i.h b/generated/gen_common_vector_v3i.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:748:0
+// external/bonsai_stdlib/src/vector.h:743:0
 
 inline s32
 LengthSq( v3i Vec )

diff --git a/generated/gen_constructor_vertex_material.h b/generated/gen_constructor_vertex_material.h
@@ -1,10 +1,10 @@
-// external/bonsai_stdlib/src/mesh.h:10:0
+// external/bonsai_stdlib/src/mesh.h:35:0
 
 link_internal vertex_material
-VertexMaterial( v3 Color , f32 Transparency , f32 Emission  )
+VertexMaterial( u16 ColorIndex , u8 Transparency , u8 Emission  )
 {
   vertex_material Reuslt = {
-    .Color = Color,
+    .ColorIndex = ColorIndex,
     .Transparency = Transparency,
     .Emission = Emission
   };

diff --git a/generated/gen_constructor_voxel_stack_element.h b/generated/gen_constructor_voxel_stack_element.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:4051:0
+// src/engine/world_chunk.cpp:4050:0
 
 link_internal voxel_stack_element
 VoxelStackElement( v3i VoxSimP , voxel_rule_direction Dir  )

diff --git a/generated/gen_hetero_vector_operators_v2_v2i.h b/generated/gen_hetero_vector_operators_v2_v2i.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:215:0
+// external/bonsai_stdlib/src/vector.h:213:0
 
 inline v2
 operator+( v2 P1, v2i P2 )

diff --git a/generated/gen_hetero_vector_operators_v2i_v2.h b/generated/gen_hetero_vector_operators_v2i_v2.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:218:0
+// external/bonsai_stdlib/src/vector.h:216:0
 
 inline v2i
 operator+( v2i P1, v2 P2 )

diff --git a/generated/gen_hetero_vector_operators_v3_v3i.h b/generated/gen_hetero_vector_operators_v3_v3i.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:221:0
+// external/bonsai_stdlib/src/vector.h:219:0
 
 inline v3
 operator+( v3 P1, v3i P2 )

diff --git a/generated/gen_hetero_vector_operators_v3i_v3.h b/generated/gen_hetero_vector_operators_v3i_v3.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:224:0
+// external/bonsai_stdlib/src/vector.h:222:0
 
 inline v3i
 operator+( v3i P1, v3 P2 )

diff --git a/generated/gen_lerp_f32.h b/generated/gen_lerp_f32.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:722:0
+// external/bonsai_stdlib/src/maff.h:10:0
 
 inline f32
 Lerp(r32 t, f32 P1, f32 P2)

diff --git a/generated/gen_lerp_v2.h b/generated/gen_lerp_v2.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:725:0
+// external/bonsai_stdlib/src/vector.h:720:0
 
 inline v2
 Lerp(r32 t, v2 P1, v2 P2)

diff --git a/generated/gen_lerp_v3.h b/generated/gen_lerp_v3.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/vector.h:728:0
+// external/bonsai_stdlib/src/vector.h:723:0
 
 inline v3
 Lerp(r32 t, v3 P1, v3 P2)

diff --git a/generated/gen_map_value_to_range_r32.h b/generated/gen_map_value_to_range_r32.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/random.h:212:0
+// external/bonsai_stdlib/src/random.h:203:0
 
 link_internal r32
 MapValueToRange( r32 LowestPossibleValue, r32 Value, r32 HighestPossibleValue)

diff --git a/generated/gen_map_value_to_range_s32.h b/generated/gen_map_value_to_range_s32.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/random.h:218:0
+// external/bonsai_stdlib/src/random.h:209:0
 
 link_internal s32
 MapValueToRange( s32 LowestPossibleValue, r32 Value, s32 HighestPossibleValue)

diff --git a/generated/gen_map_value_to_range_u32.h b/generated/gen_map_value_to_range_u32.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/random.h:215:0
+// external/bonsai_stdlib/src/random.h:206:0
 
 link_internal u32
 MapValueToRange( u32 LowestPossibleValue, r32 Value, u32 HighestPossibleValue)

diff --git a/generated/gen_random_between_r32.h b/generated/gen_random_between_r32.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/random.h:238:0
+// external/bonsai_stdlib/src/random.h:229:0
 
 link_internal r32
 RandomBetween( r32 LowestPossibleValue, random_series *Entropy, r32 HighestPossibleValue)

diff --git a/generated/gen_random_between_s32.h b/generated/gen_random_between_s32.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/random.h:244:0
+// external/bonsai_stdlib/src/random.h:235:0
 
 link_internal s32
 RandomBetween( s32 LowestPossibleValue, random_series *Entropy, s32 HighestPossibleValue)

diff --git a/generated/gen_random_between_u32.h b/generated/gen_random_between_u32.h
@@ -1,4 +1,4 @@
-// external/bonsai_stdlib/src/random.h:241:0
+// external/bonsai_stdlib/src/random.h:232:0
 
 link_internal u32
 RandomBetween( u32 LowestPossibleValue, random_series *Entropy, u32 HighestPossibleValue)

diff --git a/generated/gen_shader_uniform_push_camera.h b/generated/gen_shader_uniform_push_camera.h
@@ -17,3 +17,17 @@ GetUniform(memory_arena *Mem, shader *Shader, camera *Value, const char *Name)
   return Uniform;
 }
 
+shader_uniform
+ShaderUniform(shader *Shader, camera *Value, const char *Name)
+{
+  shader_uniform Uniform = {};
+
+  Uniform.Type = ShaderUniform_Camera;
+  Uniform.Camera = Value;
+  Uniform.Name = Name;
+
+  Uniform.ID = GetShaderUniform(Shader, Name);
+
+  return Uniform;
+}
+
diff --git a/generated/gen_shader_uniform_push_light.h b/generated/gen_shader_uniform_push_light.h
@@ -17,3 +17,17 @@ GetUniform(memory_arena *Mem, shader *Shader, light *Value, const char *Name)
   return Uniform;
 }
 
+shader_uniform
+ShaderUniform(shader *Shader, light *Value, const char *Name)
+{
+  shader_uniform Uniform = {};
+
+  Uniform.Type = ShaderUniform_Light;
+  Uniform.Light = Value;
+  Uniform.Name = Name;
+
+  Uniform.ID = GetShaderUniform(Shader, Name);
+
+  return Uniform;
+}
+
diff --git a/generated/gen_shader_uniform_push_m4.h b/generated/gen_shader_uniform_push_m4.h
@@ -17,3 +17,17 @@ GetUniform(memory_arena *Mem, shader *Shader, m4 *Value, const char *Name)
   return Uniform;
 }
 
+shader_uniform
+ShaderUniform(shader *Shader, m4 *Value, const char *Name)
+{
+  shader_uniform Uniform = {};
+
+  Uniform.Type = ShaderUniform_M4;
+  Uniform.M4 = Value;
+  Uniform.Name = Name;
+
+  Uniform.ID = GetShaderUniform(Shader, Name);
+
+  return Uniform;
+}
+
diff --git a/generated/gen_shader_uniform_push_r32.h b/generated/gen_shader_uniform_push_r32.h
@@ -17,3 +17,17 @@ GetUniform(memory_arena *Mem, shader *Shader, r32 *Value, const char *Name)
   return Uniform;
 }
 
+shader_uniform
+ShaderUniform(shader *Shader, r32 *Value, const char *Name)
+{
+  shader_uniform Uniform = {};
+
+  Uniform.Type = ShaderUniform_R32;
+  Uniform.R32 = Value;
+  Uniform.Name = Name;
+
+  Uniform.ID = GetShaderUniform(Shader, Name);
+
+  return Uniform;
+}
+
diff --git a/generated/gen_shader_uniform_push_s32.h b/generated/gen_shader_uniform_push_s32.h
@@ -17,3 +17,17 @@ GetUniform(memory_arena *Mem, shader *Shader, s32 *Value, const char *Name)
   return Uniform;
 }
 
+shader_uniform
+ShaderUniform(shader *Shader, s32 *Value, const char *Name)
+{
+  shader_uniform Uniform = {};
+
+  Uniform.Type = ShaderUniform_S32;
+  Uniform.S32 = Value;
+  Uniform.Name = Name;
+
+  Uniform.ID = GetShaderUniform(Shader, Name);
+
+  return Uniform;
+}
+
diff --git a/generated/gen_shader_uniform_push_texture.h b/generated/gen_shader_uniform_push_texture.h
@@ -17,3 +17,17 @@ GetUniform(memory_arena *Mem, shader *Shader, texture *Value, const char *Name)
   return Uniform;
 }
 
+shader_uniform
+ShaderUniform(shader *Shader, texture *Value, const char *Name)
+{
+  shader_uniform Uniform = {};
+
+  Uniform.Type = ShaderUniform_Texture;
+  Uniform.Texture = Value;
+  Uniform.Name = Name;
+
+  Uniform.ID = GetShaderUniform(Shader, Name);
+
+  return Uniform;
+}
+