clang-format

Author: Zylann

editor/blocky_library/types/voxel_blocky_type_library_editor_inspector_plugin.cpp

@@ -17,9 +17,11 @@ void VoxelBlockyTypeLibraryEditorInspectorPlugin::_zn_parse_end(Object *p_object
 	Button *button = memnew(Button);
 	button->set_text(ZN_TTR("Inspect IDs..."));
 
-	button->connect("pressed",
+	button->connect(
+			"pressed",
 			callable_mp(this, &VoxelBlockyTypeLibraryEditorInspectorPlugin::_on_inspect_ids_button_pressed)
-					.bind(library));
+					.bind(library)
+	);
 
 	// TODO I want to add this button at the end OF THE VoxelBlockyTypeLibrary PART OF THE INSPECTOR,
 	// NOT AT THE VERY BOTTOM... but how do I do that?

editor/instance_library/voxel_instance_library_multimesh_item_inspector_plugin.cpp

@@ -25,15 +25,20 @@ void VoxelInstanceLibraryMultiMeshItemInspectorPlugin::_zn_parse_group(Object *p
 			Button *button = memnew(Button);
 			button->set_tooltip_text(
 					ZN_TTR("Set properties based on an existing scene. This might copy mesh and material data if "
-						   "the scene embeds them. Properties will not update if the scene changes later."));
+						   "the scene embeds them. Properties will not update if the scene changes later.")
+			);
 			button->set_text(ZN_TTR("Update from scene..."));
 
 			// Using a bind() instead of relying on "currently edited" item in the editor plugin allows to support
 			// multiple sub-inspectors. Plugins are not instanced per-inspected-object, but custom controls are.
-			button->connect("pressed",
-					callable_mp(listener,
-							&VoxelInstanceLibraryMultiMeshItemEditorPlugin::_on_update_from_scene_button_pressed)
-							.bind(item));
+			button->connect(
+					"pressed",
+					callable_mp(
+							listener,
+							&VoxelInstanceLibraryMultiMeshItemEditorPlugin::_on_update_from_scene_button_pressed
+					)
+							.bind(item)
+			);
 
 			add_custom_control(button);
 
@@ -52,9 +57,15 @@ void VoxelInstanceLibraryMultiMeshItemInspectorPlugin::_zn_parse_group(Object *p
 	// }
 }
 
-bool VoxelInstanceLibraryMultiMeshItemInspectorPlugin::_zn_parse_property(Object *p_object, const Variant::Type p_type,
-		const String &p_path, const PropertyHint p_hint, const String &p_hint_text,
-		const BitField<PropertyUsageFlags> p_usage, const bool p_wide) {
+bool VoxelInstanceLibraryMultiMeshItemInspectorPlugin::_zn_parse_property(
+		Object *p_object,
+		const Variant::Type p_type,
+		const String &p_path,
+		const PropertyHint p_hint,
+		const String &p_hint_text,
+		const BitField<PropertyUsageFlags> p_usage,
+		const bool p_wide
+) {
 	// TODO Godot invokes `parse_property` on ALL editor plugins when inspecting items of an Array!
 	// See https://github.com/godotengine/godot/issues/71236
 	if (p_object == nullptr) {
@@ -63,9 +74,12 @@ bool VoxelInstanceLibraryMultiMeshItemInspectorPlugin::_zn_parse_property(Object
 	}
 	// Hide manual properties if a scene is assigned, because it will override them
 	const VoxelInstanceLibraryMultiMeshItem *item = Object::cast_to<VoxelInstanceLibraryMultiMeshItem>(p_object);
-	ERR_FAIL_COND_V_MSG(item == nullptr, false,
+	ERR_FAIL_COND_V_MSG(
+			item == nullptr,
+			false,
 			String("Did not expect {0}, see https://github.com/godotengine/godot/issues/71236")
-					.format(varray(p_object->get_class())));
+					.format(varray(p_object->get_class()))
+	);
 	if (item->get_scene().is_null()) {
 		return false;
 	}

meshers/blocky/types/voxel_blocky_attribute_direction.cpp

@@ -86,7 +86,8 @@ bool VoxelBlockyAttributeDirection::is_horizontal_only() const {
 void VoxelBlockyAttributeDirection::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_horizontal_only"), &VoxelBlockyAttributeDirection::is_horizontal_only);
 	ClassDB::bind_method(
-			D_METHOD("set_horizontal_only", "enabled"), &VoxelBlockyAttributeDirection::set_horizontal_only);
+			D_METHOD("set_horizontal_only", "enabled"), &VoxelBlockyAttributeDirection::set_horizontal_only
+	);
 	ClassDB::bind_method(D_METHOD("from_vec3", "v"), &VoxelBlockyAttributeDirection::from_vec3);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "horizontal_only"), "set_horizontal_only", "is_horizontal_only");

meshers/cubes/voxel_mesher_cubes.cpp

@@ -335,8 +335,8 @@ void build_voxel_mesh_as_greedy_cubes(
 
 					// Check if the next rows of faces are the same along Y
 					unsigned int ry = fy + 1;
-					while (ry < mask_size_y && L::is_range_equal(mask, fx + ry * mask_size_x, rx + ry * mask_size_x, m)
-					) {
+					while (ry < mask_size_y &&
+						   L::is_range_equal(mask, fx + ry * mask_size_x, rx + ry * mask_size_x, m)) {
 						++ry;
 					}
 
@@ -546,8 +546,8 @@ void build_voxel_mesh_as_greedy_cubes_atlased(
 
 					// Check if the next rows of faces are the same along Y
 					unsigned int ry = fy + 1;
-					while (ry < mask_size_y && L::is_range_equal(mask, fx + ry * mask_size_x, rx + ry * mask_size_x, m)
-					) {
+					while (ry < mask_size_y &&
+						   L::is_range_equal(mask, fx + ry * mask_size_x, rx + ry * mask_size_x, m)) {
 						++ry;
 					}
 

meshers/mesh_block_task.cpp

@@ -526,12 +526,13 @@ void MeshBlockTask::build_mesh() {
 	// smooth terrain.
 	Ref<VoxelMesherTransvoxel> transvoxel_mesher;
 
-	if (require_visual //
-		&& zylann::godot::try_get_as(mesher, transvoxel_mesher) //
-		&& detail_texture_settings.enabled //
-		&& !mesh_is_empty //
-		&& lod_index >= detail_texture_settings.begin_lod_index //
-		&& require_detail_texture //
+	if (
+			require_visual //
+			&& zylann::godot::try_get_as(mesher, transvoxel_mesher) //
+			&& detail_texture_settings.enabled //
+			&& !mesh_is_empty //
+			&& lod_index >= detail_texture_settings.begin_lod_index //
+			&& require_detail_texture //
 	) {
 		ZN_PROFILE_SCOPE_NAMED("Schedule detail render");
 

meshers/transvoxel/voxel_mesher_transvoxel.cpp

@@ -187,7 +187,8 @@ void simplify(
 				sizeof(Vector3f),
 				target_index_count,
 				p_error_threshold,
-				zylannmeshopt::meshopt_SimplifyLockBorder, // Crucial for chunk borders, see https://github.com/zeux/meshoptimizer/issues/311
+				// Crucial for chunk borders, see https://github.com/zeux/meshoptimizer/issues/311
+				zylannmeshopt::meshopt_SimplifyLockBorder,
 				&lod_error
 		);
 

meshers/voxel_mesher.cpp

@@ -9,8 +9,8 @@
 #include "transvoxel/transvoxel_cell_iterator.h"
 
 #ifdef VOXEL_ENABLE_SMOOTH_MESHING
-#include "../meshers/transvoxel/voxel_mesher_transvoxel.h"
 #include "../engine/detail_rendering/detail_rendering.h"
+#include "../meshers/transvoxel/voxel_mesher_transvoxel.h"
 #endif
 
 using namespace zylann::godot;

streams/voxel_stream_script.cpp

@@ -9,7 +9,8 @@ void VoxelStreamScript::load_voxel_block(VoxelStream::VoxelQueryData &query_data
 	Variant output;
 	// Create a temporary wrapper so Godot can pass it to scripts
 	Ref<godot::VoxelBuffer> buffer_wrapper(memnew(
-			godot::VoxelBuffer(static_cast<godot::VoxelBuffer::Allocator>(query_data.voxel_buffer.get_allocator()))));
+			godot::VoxelBuffer(static_cast<godot::VoxelBuffer::Allocator>(query_data.voxel_buffer.get_allocator()))
+	));
 	buffer_wrapper->get_buffer().copy_format(query_data.voxel_buffer);
 	buffer_wrapper->get_buffer().create(query_data.voxel_buffer.get_size());
 
@@ -35,7 +36,8 @@ void VoxelStreamScript::load_voxel_block(VoxelStream::VoxelQueryData &query_data
 void VoxelStreamScript::save_voxel_block(VoxelStream::VoxelQueryData &query_data) {
 	// For now the callee can exceptionally take ownership of this wrapper, because we copy the data to it.
 	Ref<godot::VoxelBuffer> buffer_wrapper(memnew(
-			godot::VoxelBuffer(static_cast<godot::VoxelBuffer::Allocator>(query_data.voxel_buffer.get_allocator()))));
+			godot::VoxelBuffer(static_cast<godot::VoxelBuffer::Allocator>(query_data.voxel_buffer.get_allocator()))
+	));
 	query_data.voxel_buffer.copy_to(buffer_wrapper->get_buffer(), true);
 	if (!GDVIRTUAL_CALL(_save_voxel_block, buffer_wrapper, query_data.position_in_blocks, query_data.lod_index)) {
 		WARN_PRINT_ONCE("VoxelStreamScript::_save_voxel_block is unimplemented!");

util/thread/spatial_lock_3d.h

@@ -16,7 +16,7 @@ namespace zylann {
 
 // Locking on a large voxel data structure can be done with this, instead of putting RWLocks on every chunk or
 // every octree node. This also reduces the amount of required mutexes considerably (that matters on some platforms with
-// low limits).
+// low limits; it also reduces memory usage, as mutex implementations can occupy a lot of bytes).
 //
 // Some methods allow to `try` locking areas. They should be used in contextes where blocking is worse than
 // delaying operations. Such contextes may then postpone their work, or cancel it. If that's not possible, then it
@@ -48,11 +48,14 @@ class SpatialLock3D {
 	bool try_lock_read(const BoxBounds3i &box) {
 		_boxes_mutex.lock();
 		if (can_lock_for_read(box)) {
-			_boxes.push_back(Box{ box, MODE_READ,
+			_boxes.push_back(
+					Box{ box,
+						 MODE_READ,
 #ifdef ZN_SPATIAL_LOCK_3D_CHECKS
-					Thread::get_caller_id()
+						 Thread::get_caller_id()
 #endif
-			});
+					}
+			);
 			_boxes_mutex.unlock();
 			return true;
 		} else {
@@ -74,11 +77,14 @@ class SpatialLock3D {
 	bool try_lock_write(const BoxBounds3i &box) {
 		_boxes_mutex.lock();
 		if (can_lock_for_write(box)) {
-			_boxes.push_back(Box{ box, MODE_WRITE,
+			_boxes.push_back(
+					Box{ box,
+						 MODE_WRITE,
 #ifdef ZN_SPATIAL_LOCK_3D_CHECKS
-					Thread::get_caller_id()
+						 Thread::get_caller_id()
 #endif
-			});
+					}
+			);
 			_boxes_mutex.unlock();
 			return true;
 		} else {
@@ -144,8 +150,9 @@ class SpatialLock3D {
 			//   This is a deadlock.
 			// Note: this is not true if threads only lock for reading, but if we didn't ever write we'd not use locks.
 			// Note: this is also not true if threads use `try_lock` instead!
-			ZN_ASSERT_RETURN_V_MSG(existing_box.thread_id != thread_id, false,
-					"Locking two areas from the same threads is not allowed");
+			ZN_ASSERT_RETURN_V_MSG(
+					existing_box.thread_id != thread_id, false, "Locking two areas from the same threads is not allowed"
+			);
 #endif
 			if (existing_box.bounds.intersects(box) && existing_box.mode == MODE_WRITE) {
 				return false;
@@ -164,8 +171,9 @@ class SpatialLock3D {
 			const Box &existing_box = _boxes[i];
 
 #ifdef ZN_SPATIAL_LOCK_3D_CHECKS
-			ZN_ASSERT_RETURN_V_MSG(existing_box.thread_id != thread_id, false,
-					"Locking two areas from the same threads is not allowed");
+			ZN_ASSERT_RETURN_V_MSG(
+					existing_box.thread_id != thread_id, false, "Locking two areas from the same threads is not allowed"
+			);
 #endif
 			if (existing_box.bounds.intersects(box)) {
 				return false;