Zylann
/
godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into paged_lod

master
Marc Gilleron 2019-08-30 01:09:37 +01:00
parent 8574655c18 c3bc356119
commit fa22666ccf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
terrain/voxel_block.cpp
View File

@ -73,6 +73,7 @@ void VoxelBlock::set_mesh(Ref<Mesh> mesh, Spatial *node, bool generate_collision
// Create instance if it doesn't exist // Create instance if it doesn't exist
_mesh_instance.create(); _mesh_instance.create();
_mesh_instance.set_world(*world); _mesh_instance.set_world(*world);
_mesh_instance.set_visible(_visible);
} }
Transform transform(Basis(), _position_in_voxels.to_vec3()); Transform transform(Basis(), _position_in_voxels.to_vec3());
@ -94,6 +95,7 @@ void VoxelBlock::set_mesh(Ref<Mesh> mesh, Spatial *node, bool generate_collision
} }
_static_body.add_shape(shape); _static_body.add_shape(shape);
_static_body.set_debug(debug_collision, *world); _static_body.set_debug(debug_collision, *world);
_static_body.set_shape_enabled(0, _visible);
} }
} else { } else {