Remove an annoying assertion

scallyw4g · Aug 31, 2024 · bcf989d · bcf989d
1 parent 04e9d6e
commit bcf989d
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 34 deletions.
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:462:0
+// src/engine/world_chunk.h:460:0
 
 struct standing_spot_block
 {

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

diff --git a/generated/for_datatypes_0XxWqGSZ.h b/generated/for_datatypes_0XxWqGSZ.h
@@ -619,14 +619,6 @@ WorkQueueEntryAsyncFunction( render_to_texture_async_params *Params )
 
 
 
-
-
-
-
-
-
-
-
 
 
 

diff --git a/generated/for_datatypes_fkubhsYl.h b/generated/for_datatypes_fkubhsYl.h
@@ -609,14 +609,6 @@ render_to_texture_async_params render_to_texture_async_params;
 
 
 
-
-
-
-
-
-
-
-
 
 
 

diff --git a/generated/for_datatypes_kv3WBTai.h b/generated/for_datatypes_kv3WBTai.h
@@ -609,14 +609,6 @@ type_render_to_texture_async_params,
 
 
 
-
-
-
-
-
-
-
-
 
 
 

diff --git a/generated/generate_stream_compact_standing_spot.h b/generated/generate_stream_compact_standing_spot.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.h:511:0
+// src/engine/world_chunk.h:509:0
 
 link_internal standing_spot_buffer
 Compact(standing_spot_stream *Stream, memory_arena *PermMemory)

diff --git a/generated/generate_stream_compact_v3i.h b/generated/generate_stream_compact_v3i.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:3027:0
+// src/engine/world_chunk.cpp:3025:0
 
 link_internal v3i_buffer
 Compact(v3i_stream *Stream, memory_arena *PermMemory)

diff --git a/generated/generate_stream_standing_spot.h b/generated/generate_stream_standing_spot.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.h:508:0
+// src/engine/world_chunk.h:506:0
 
 struct standing_spot_stream_chunk
 {

diff --git a/generated/maybe_standing_spot.h b/generated/maybe_standing_spot.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.h:459:0
+// src/engine/world_chunk.h:457:0
 
 struct maybe_standing_spot
 {

diff --git a/generated/world_chunk_mesh_functions_untextured_3d_geometry_buffer_v3.h b/generated/world_chunk_mesh_functions_untextured_3d_geometry_buffer_v3.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:2058:0
+// src/engine/world_chunk.cpp:2056:0
 
 link_internal void
 BuildWorldChunkMeshFromMarkedVoxels_Greedy_v3( voxel *Voxels,

diff --git a/generated/world_chunk_mesh_functions_untextured_3d_geometry_buffer_v3_u8.h b/generated/world_chunk_mesh_functions_untextured_3d_geometry_buffer_v3_u8.h
@@ -1,4 +1,4 @@
-// src/engine/world_chunk.cpp:2061:0
+// src/engine/world_chunk.cpp:2059:0
 
 link_internal void
 BuildWorldChunkMeshFromMarkedVoxels_Greedy_v3_u8( voxel *Voxels,

diff --git a/src/engine/bonsai.h b/src/engine/bonsai.h
@@ -150,7 +150,7 @@ SetFlag( u8 *Flags, voxel_flag Flag )
 inline void
 SetFlag( chunk_flag *Flags, chunk_flag Flag )
 {
-  Assert( (*Flags & Flag) == 0);
+  /* Assert( (*Flags & Flag) == 0); */ // NOTE(Jesse): This should probably be in, but it's annoying ..
   *Flags = (chunk_flag)(*Flags | Flag);
   return;
 }

diff --git a/src/engine/editor.cpp b/src/engine/editor.cpp
@@ -1739,7 +1739,8 @@ BrushSettingsForLayeredBrush(engine_resources *Engine, window_layout *BrushSetti
             RebuildWorldChunkMesh(Thread, Chunk, {}, Chunk->Dim, MeshBit_Lod0, TempMesh, Thread->TempMemory);
           }
 
-          FinalizeChunkInitialization(Root_LayeredBrushPreview); // TODO(Jesse): @duplicate_finalize_chunk_init
+          //NOTE(Jesse): Not sure what this was for..
+          /* FinalizeChunkInitialization(Root_LayeredBrushPreview); // TODO(Jesse): @duplicate_finalize_chunk_init */
 
           Editor->RootChunkNeedsNewMesh = False;
           Editor->NextSelectionRegionMin = Editor->MostRecentSelectionRegionMin;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -619,14 +619,6 @@ WorkQueueEntryAsyncFunction( render_to_texture_async_params *Params )














Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -609,14 +609,6 @@ render_to_texture_async_params render_to_texture_async_params;














Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -609,14 +609,6 @@ type_render_to_texture_async_params,














Expand Down