Merge pull request #76 from scallyw4g/develop

Develop
scallyw4g · Sep 7, 2024 · 559655a · 559655a
2 parents ca9aeb7 + 80d159b
commit 559655a
Show file tree

Hide file tree

Showing 183 changed files with 1,132 additions and 618 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,11 +1,15 @@
 * 1.6.2
 
+* Change "SeedBrushWithSelection" to work with destructive brushes
+
 * Fix a race condition sometimes causing the main thread to unlock before the render thread had completed
 
 * Fix some edge cases with negatively offset brushes and small selection regions
 
 * Fix v3_u8 normal data being incorrectly encoded on negative edge
 
+* Fix a frame of lag when changing the selection region with a brush active
+
 * 1.6.1
 
 - Change untextured_3d_geometry_buffer to have a `data_type Type`

diff --git a/external/bonsai_stdlib b/external/bonsai_stdlib
diff --git a/generated/are_equal_brush_settings.h b/generated/are_equal_brush_settings.h
@@ -1,4 +1,4 @@
-// src/engine/editor.h:903:0
+// src/engine/editor.h:885:0
 
 link_internal b32
 AreEqual(brush_settings *Thing1, brush_settings *Thing2)

diff --git a/generated/are_equal_perlin_noise_params.h b/generated/are_equal_perlin_noise_params.h
@@ -1,4 +1,4 @@
-// src/engine/editor.h:669:0
+// src/engine/editor.h:657:0
 
 link_internal b32
 AreEqual(perlin_noise_params *Thing1, perlin_noise_params *Thing2)

diff --git a/generated/asyncify_render_function_c_DrawLod.h b/generated/asyncify_render_function_c_DrawLod.h
@@ -1,4 +1,4 @@
-// src/engine/work_queue.h:362:0
+// src/engine/work_queue.h:363:0
 
 link_internal void
 DrawLod_Async(work_queue *Queue,engine_resources *Engine ,shader *Shader ,lod_element_buffer *Meshes ,r32 DistanceSquared ,v3 Basis ,Quaternion Rotation ,v3 Scale )

diff --git a/generated/asyncify_render_function_c_RenderToTexture.h b/generated/asyncify_render_function_c_RenderToTexture.h
@@ -1,4 +1,4 @@
-// src/engine/work_queue.h:359:0
+// src/engine/work_queue.h:360:0
 
 link_internal void
 RenderToTexture_Async(work_queue *Queue,engine_resources *Engine ,asset_thumbnail *Thumb ,lod_element_buffer *Meshes ,v3 Offset ,camera *Camera )

diff --git a/generated/asyncify_render_function_h_DrawLod.h b/generated/asyncify_render_function_h_DrawLod.h
@@ -1,4 +1,4 @@
-// src/engine/work_queue.h:239:0
+// src/engine/work_queue.h:240:0
 
 struct draw_lod_async_params poof(@async_function_params)
 {

diff --git a/generated/asyncify_render_function_h_RenderToTexture.h b/generated/asyncify_render_function_h_RenderToTexture.h
@@ -1,4 +1,4 @@
-// src/engine/work_queue.h:236:0
+// src/engine/work_queue.h:237:0
 
 struct render_to_texture_async_params poof(@async_function_params)
 {

diff --git a/generated/block_array_c_asset_thumbnail_688856411.h b/generated/block_array_c_asset_thumbnail_688856411.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:102:0
+// src/engine/editor.cpp:80:0
 
 
 link_internal asset_thumbnail_block*

diff --git a/generated/d_union_constructors_work_queue_entry.h b/generated/d_union_constructors_work_queue_entry.h
@@ -1,4 +1,4 @@
-// src/engine/work_queue.h:324:0
+// src/engine/work_queue.h:325:0
 
 
 link_internal work_queue_entry

diff --git a/generated/d_union_work_queue_entry.h b/generated/d_union_work_queue_entry.h
@@ -1,4 +1,4 @@
-// src/engine/work_queue.h:296:0
+// src/engine/work_queue.h:297:0
 
 enum work_queue_entry_type
 {

diff --git a/generated/default_marshal_brush_settings_0.h b/generated/default_marshal_brush_settings_0.h
@@ -1,4 +1,4 @@
-// src/engine/editor.h:961:0
+// src/engine/editor.h:943:0
 
 Live->Type = Stored->Type;
 

diff --git a/generated/default_marshal_brush_settings_1.h b/generated/default_marshal_brush_settings_1.h
@@ -1,4 +1,4 @@
-// src/engine/editor.h:954:0
+// src/engine/editor.h:936:0
 
 Live->Type = Stored->Type;
 

diff --git a/generated/default_marshal_layered_brush_editor_0.h b/generated/default_marshal_layered_brush_editor_0.h
@@ -1,4 +1,4 @@
-// src/engine/editor.h:1027:0
+// src/engine/editor.h:1041:0
 
 Live->LayerCount = Stored->LayerCount;
 

diff --git a/generated/default_marshal_layered_brush_editor_1.h b/generated/default_marshal_layered_brush_editor_1.h
@@ -1,4 +1,4 @@
-// src/engine/editor.h:1020:0
+// src/engine/editor.h:1034:0
 
 RangeIterator(Index, (256))
 {

diff --git a/generated/default_marshal_layered_brush_editor_2.h b/generated/default_marshal_layered_brush_editor_2.h
@@ -0,0 +1,19 @@
+// src/engine/editor.h:1027:0
+
+Live->LayerCount = Stored->LayerCount;
+
+
+RangeIterator(Index, 16)
+{
+  Live->Layers[Index] = Stored->Layers[Index];
+}
+
+
+Live->SeedBrushWithSelection = Stored->SeedBrushWithSelection;
+
+
+Live->BrushFollowsCursor = Stored->BrushFollowsCursor;
+
+
+
+
diff --git a/generated/default_marshal_noise_layer_0.h b/generated/default_marshal_noise_layer_0.h
@@ -1,4 +1,4 @@
-// src/engine/editor.h:860:0
+// src/engine/editor.h:842:0
 
 Live->Type = Stored->Type;
 

diff --git a/generated/do_editor_ui_for_compound_type_animation.h b/generated/do_editor_ui_for_compound_type_animation.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:238:0
+// src/engine/editor.cpp:216:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, animation *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_asset.h b/generated/do_editor_ui_for_compound_type_asset.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:335:0
+// src/engine/editor.cpp:313:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, asset *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_asset_id.h b/generated/do_editor_ui_for_compound_type_asset_id.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:327:0
+// src/engine/editor.cpp:305:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, asset_id *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_asset_thumbnail.h b/generated/do_editor_ui_for_compound_type_asset_thumbnail.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:357:0
+// src/engine/editor.cpp:335:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, asset_thumbnail *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_bonsai_futex.h b/generated/do_editor_ui_for_compound_type_bonsai_futex.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:244:0
+// src/engine/editor.cpp:222:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, bonsai_futex *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_bonsai_stdlib.h b/generated/do_editor_ui_for_compound_type_bonsai_stdlib.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:175:0
+// src/engine/editor.cpp:153:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, bonsai_stdlib *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_brush_layer.h b/generated/do_editor_ui_for_compound_type_brush_layer.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:366:0
+// src/engine/editor.cpp:344:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, brush_layer *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)
@@ -41,13 +41,7 @@ DoEditorUi(renderer_2d *Ui, window_layout *Window, brush_layer *Element, cs Name
 
 
 
-      DoEditorUi(Ui,
-        Window,
-        // Cast to remove const/volatile keywords if they're there
-        Cast(chunk_thumbnail*,&Element->Preview),
-        CSz("Preview"),
-        Params
-        );
+
       if (DidToggle) { CLOSE_INDENT_FOR_TOGGLEABLE_REGION(); }
       PushTableEnd(Ui);
     }

diff --git a/generated/do_editor_ui_for_compound_type_brush_settings.h b/generated/do_editor_ui_for_compound_type_brush_settings.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:130:0
+// src/engine/editor.cpp:108:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, brush_settings *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_camera.h b/generated/do_editor_ui_for_compound_type_camera.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:351:0
+// src/engine/editor.cpp:329:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, camera *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_chunk_data.h b/generated/do_editor_ui_for_compound_type_chunk_data.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:274:0
+// src/engine/editor.cpp:252:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, chunk_data *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_chunk_thumbnail.h b/generated/do_editor_ui_for_compound_type_chunk_thumbnail.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:360:0
+// src/engine/editor.cpp:338:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, chunk_thumbnail *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_collision_event.h b/generated/do_editor_ui_for_compound_type_collision_event.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:338:0
+// src/engine/editor.cpp:316:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, collision_event *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_debug_state.h b/generated/do_editor_ui_for_compound_type_debug_state.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:171:0
+// src/engine/editor.cpp:149:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, debug_state *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_engine_debug.h b/generated/do_editor_ui_for_compound_type_engine_debug.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:441:0
+// src/engine/editor.cpp:419:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, engine_debug *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_engine_resources.h b/generated/do_editor_ui_for_compound_type_engine_resources.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:463:0
+// src/engine/editor.cpp:441:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, engine_resources *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_engine_settings.h b/generated/do_editor_ui_for_compound_type_engine_settings.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:459:0
+// src/engine/editor.cpp:437:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, engine_settings *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_entity.h b/generated/do_editor_ui_for_compound_type_entity.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:313:0
+// src/engine/editor.cpp:291:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, entity *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_entity_id.h b/generated/do_editor_ui_for_compound_type_entity_id.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:310:0
+// src/engine/editor.cpp:288:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, entity_id *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_entity_position_info.h b/generated/do_editor_ui_for_compound_type_entity_position_info.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:341:0
+// src/engine/editor.cpp:319:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, entity_position_info *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_file_traversal_node.h b/generated/do_editor_ui_for_compound_type_file_traversal_node.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:298:0
+// src/engine/editor.cpp:276:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, file_traversal_node *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_frustum.h b/generated/do_editor_ui_for_compound_type_frustum.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:348:0
+// src/engine/editor.cpp:326:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, frustum *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_g_buffer_render_group.h b/generated/do_editor_ui_for_compound_type_g_buffer_render_group.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:429:0
+// src/engine/editor.cpp:407:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, g_buffer_render_group *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_game_lights.h b/generated/do_editor_ui_for_compound_type_game_lights.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:423:0
+// src/engine/editor.cpp:401:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, game_lights *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_gpu_element_buffer_handles.h b/generated/do_editor_ui_for_compound_type_gpu_element_buffer_handles.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:280:0
+// src/engine/editor.cpp:258:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, gpu_element_buffer_handles *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_gpu_mapped_element_buffer.h b/generated/do_editor_ui_for_compound_type_gpu_mapped_element_buffer.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:283:0
+// src/engine/editor.cpp:261:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, gpu_mapped_element_buffer *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_graphics.h b/generated/do_editor_ui_for_compound_type_graphics.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:432:0
+// src/engine/editor.cpp:410:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, graphics *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)
@@ -204,6 +204,36 @@ DoEditorUi(renderer_2d *Ui, window_layout *Window, graphics *Element, cs Name, u
 
 
 
+      DoEditorUi(Ui,
+        Window,
+        // Cast to remove const/volatile keywords if they're there
+        Cast(v3*,&Element->MinClipP_worldspace),
+        CSz("MinClipP_worldspace"),
+        Params
+        );
+
+
+
+
+
+
+
+
+      DoEditorUi(Ui,
+        Window,
+        // Cast to remove const/volatile keywords if they're there
+        Cast(v3*,&Element->MaxClipP_worldspace),
+        CSz("MaxClipP_worldspace"),
+        Params
+        );
+
+
+
+
+
+
+
+
       DoEditorUi(Ui,
         Window,
         // Cast to remove const/volatile keywords if they're there

diff --git a/generated/do_editor_ui_for_compound_type_graphics_settings.h b/generated/do_editor_ui_for_compound_type_graphics_settings.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:456:0
+// src/engine/editor.cpp:434:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, graphics_settings *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_input.h b/generated/do_editor_ui_for_compound_type_input.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:164:0
+// src/engine/editor.cpp:142:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, input *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_input_event.h b/generated/do_editor_ui_for_compound_type_input_event.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:161:0
+// src/engine/editor.cpp:139:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, input_event *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)

diff --git a/generated/do_editor_ui_for_compound_type_keyframe.h b/generated/do_editor_ui_for_compound_type_keyframe.h
@@ -1,4 +1,4 @@
-// src/engine/editor.cpp:235:0
+// src/engine/editor.cpp:213:0
 
 link_internal void
 DoEditorUi(renderer_2d *Ui, window_layout *Window, keyframe *Element, cs Name, ui_render_params *Params = &DefaultUiRenderParams_Button)