Namespaced DirectMultiMeshInstance

terrain/instancing/voxel_instancer.h

@@ -143,7 +143,7 @@ private:
 		uint8_t lod_index;
 		// Position in mesh block coordinate system
 		Vector3i grid_position;
-		DirectMultiMeshInstance multimesh_instance;
+		zylann::DirectMultiMeshInstance multimesh_instance;
 		// For physics we use nodes because it's easier to manage.
 		// Such instances may be less numerous.
 		// If the item associated to this block has no collisions, this will be empty.

util/godot/direct_multimesh_instance.cpp

@@ -3,7 +3,7 @@
 
 #include <scene/resources/world_3d.h>
 
-using namespace zylann;
+namespace zylann {
 
 DirectMultiMeshInstance::DirectMultiMeshInstance() {}
 
@@ -173,3 +173,5 @@ void DirectMultiMeshInstance::make_transform_and_color32_3d_bulk_array(
 		ptr[transform_size + 3] = d.color.a;
 	}
 }
+
+} // namespace zylann

util/godot/direct_multimesh_instance.h

@@ -10,6 +10,8 @@
 
 class World3D;
 
+namespace zylann {
+
 // Thin wrapper around VisualServer multimesh instance API
 class DirectMultiMeshInstance : public zylann::NonCopyable {
 public:
@@ -50,4 +52,6 @@ private:
 	Ref<MultiMesh> _multimesh;
 };
 
+} // namespace zylann
+
 #endif // DIRECT_MULTIMESH_INSTANCE_H