Relintai/godot_voxel
1
0
Fork 0
mirror of https://github.com/Relintai/godot_voxel.git synced 2025-05-01 17:57:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use raw copy to speed up the mesher a little

Browse Source
This commit is contained in:
Marc Gilleron 2018-09-29 22:41:52 +01:00
parent 65aed7de5b
commit 9e6170e705
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
voxel_mesher.cpp
View File

@ -2,6 +2,15 @@
#include "voxel_library.h" #include "voxel_library.h"
#include "cube_tables.h" #include "cube_tables.h"
#include "utility.h" #include "utility.h"
#include <core/os/os.h>
template <typename T>
void raw_copy_to(PoolVector<T> &to, const Vector<T> &from) {
to.resize(from.size());
typename PoolVector<T>::Write w = to.write();
memcpy(w.ptr(), from.ptr(), from.size() * sizeof(T));
}
VoxelMesher::VoxelMesher() VoxelMesher::VoxelMesher()
: _baked_occlusion_darkness(0.75), : _baked_occlusion_darkness(0.75),
@ -68,6 +77,8 @@ Ref<ArrayMesh> VoxelMesher::build_mesh(Ref<VoxelBuffer> buffer_ref, unsigned int
} }
Array VoxelMesher::build(const VoxelBuffer &buffer, unsigned int channel, Vector3i min, Vector3i max) { Array VoxelMesher::build(const VoxelBuffer &buffer, unsigned int channel, Vector3i min, Vector3i max) {
uint64_t time_before = OS::get_singleton()->get_ticks_usec();
ERR_FAIL_COND_V(_library.is_null(), Array()); ERR_FAIL_COND_V(_library.is_null(), Array());
ERR_FAIL_COND_V(channel >= VoxelBuffer::MAX_CHANNELS, Array()); ERR_FAIL_COND_V(channel >= VoxelBuffer::MAX_CHANNELS, Array());
@ -102,6 +113,9 @@ Array VoxelMesher::build(const VoxelBuffer &buffer, unsigned int channel, Vector
int index_offset = 0; int index_offset = 0;
uint64_t time_prep = OS::get_singleton()->get_ticks_usec() - time_before;
time_before = OS::get_singleton()->get_ticks_usec();
// Iterate 3D padded data to extract voxel faces. // Iterate 3D padded data to extract voxel faces.
// This is the most intensive job in this class, so all required data should be as fit as possible. // This is the most intensive job in this class, so all required data should be as fit as possible.
for (unsigned int z = min.z; z < max.z; ++z) { for (unsigned int z = min.z; z < max.z; ++z) {
@ -260,6 +274,9 @@ Array VoxelMesher::build(const VoxelBuffer &buffer, unsigned int channel, Vector
} }
} }
uint64_t time_meshing = OS::get_singleton()->get_ticks_usec() - time_before;
time_before = OS::get_singleton()->get_ticks_usec();
// Commit mesh // Commit mesh
// print_line(String("Made mesh v: ") + String::num(_arrays[0].positions.size()) // print_line(String("Made mesh v: ") + String::num(_arrays[0].positions.size())
@ -282,11 +299,11 @@ Array VoxelMesher::build(const VoxelBuffer &buffer, unsigned int channel, Vector
PoolVector<Color> colors; PoolVector<Color> colors;
PoolVector<int> indices; PoolVector<int> indices;
copy_to(positions, arrays.positions); raw_copy_to(positions, arrays.positions);
copy_to(uvs, arrays.uvs); raw_copy_to(uvs, arrays.uvs);
copy_to(normals, arrays.normals); raw_copy_to(normals, arrays.normals);
copy_to(colors, arrays.colors); raw_copy_to(colors, arrays.colors);
copy_to(indices, arrays.indices); raw_copy_to(indices, arrays.indices);
mesh_arrays[Mesh::ARRAY_VERTEX] = positions; mesh_arrays[Mesh::ARRAY_VERTEX] = positions;
mesh_arrays[Mesh::ARRAY_TEX_UV] = uvs; mesh_arrays[Mesh::ARRAY_TEX_UV] = uvs;
@ -299,6 +316,10 @@ Array VoxelMesher::build(const VoxelBuffer &buffer, unsigned int channel, Vector
} }
} }
uint64_t time_commit = OS::get_singleton()->get_ticks_usec() - time_before;
//print_line(String("P: {0}, M: {1}, C: {2}").format(varray(time_prep, time_meshing, time_commit)));
return surfaces; return surfaces;
} }