diff --git a/terrain/instancing/voxel_instancer.h b/terrain/instancing/voxel_instancer.h index 924b4fc3..0993b763 100644 --- a/terrain/instancing/voxel_instancer.h +++ b/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. diff --git a/util/godot/direct_multimesh_instance.cpp b/util/godot/direct_multimesh_instance.cpp index 82a2ac21..0b60a6a9 100644 --- a/util/godot/direct_multimesh_instance.cpp +++ b/util/godot/direct_multimesh_instance.cpp @@ -3,7 +3,7 @@ #include -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 diff --git a/util/godot/direct_multimesh_instance.h b/util/godot/direct_multimesh_instance.h index 115ed4e1..e555a5f5 100644 --- a/util/godot/direct_multimesh_instance.h +++ b/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; }; +} // namespace zylann + #endif // DIRECT_MULTIMESH_INSTANCE_H