From 138614f7439791045a49ef87846d70da4c1df502 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 30 Jun 2020 15:24:11 +0200 Subject: [PATCH] Update MeshDataResource offsets, as now they are Transforms. --- world/default/voxel_chunk_default.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/world/default/voxel_chunk_default.cpp b/world/default/voxel_chunk_default.cpp index e447925..4cb0a7a 100644 --- a/world/default/voxel_chunk_default.cpp +++ b/world/default/voxel_chunk_default.cpp @@ -907,8 +907,7 @@ void VoxelChunkDefault::draw_debug_mdr_colliders() { continue; Transform t = get_mesh_data_resource_transform(i); - Vector3 offset = mdr->get_collision_shape_offset(i); - t.origin += offset; + Transform offset = mdr->get_collision_shape_offset(i); for (int j = 0; j < mdr->get_collision_shape_count(); ++j) { Ref shape = mdr->get_collision_shape(j); @@ -916,7 +915,7 @@ void VoxelChunkDefault::draw_debug_mdr_colliders() { if (!shape.is_valid()) continue; - shape->add_vertices_to_array(_debug_mesh_array, t); + shape->add_vertices_to_array(_debug_mesh_array, t * offset); } } } @@ -1747,7 +1746,7 @@ void VoxelChunkDefault::_build_phase_physics_process(int phase) { for (int i = 0; i < get_mesh_data_resource_count(); ++i) { Ref mdr = get_mesh_data_resource(i); - Vector3 offset = mdr->get_collision_shape_offset(i); + Transform offset = mdr->get_collision_shape_offset(i); for (int j = 0; j < mdr->get_collision_shape_count(); ++j) { Ref shape = mdr->get_collision_shape(j); @@ -1762,7 +1761,7 @@ void VoxelChunkDefault::_build_phase_physics_process(int phase) { c.body = body; c.transform = get_mesh_data_resource_transform(i); - c.transform.origin += offset; + c.transform *= offset; PhysicsServer::get_singleton()->body_add_shape(body, shape->get_rid());