Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-25 21:25:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added an add_mesh_data_resource variant to VoxelChunk, also added the apply_voxel_scale parameter to them. Also added a few transform helpers.

Browse Source
This commit is contained in:
Relintai 2020-07-20 01:06:34 +02:00
parent 698f6083ea
commit c9ee935af3
2 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
world/voxel_chunk.cpp
View File

@ -705,13 +705,51 @@ void VoxelChunk::clear_props() {
#endif #endif
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
int VoxelChunk::add_mesh_data_resource(const Transform &local_transform, const Ref<MeshDataResource> &mesh, const Ref<Texture> &texture, const Color &color) { int VoxelChunk::add_mesh_data_resourcev(const Vector3 &local_data_pos, const Ref<MeshDataResource> &mesh, const Ref<Texture> &texture, const Color &color, const bool apply_voxel_scale) {
ERR_FAIL_COND_V(!mesh.is_valid(), 0); ERR_FAIL_COND_V(!mesh.is_valid(), 0);
int index = _mesh_data_resources.size(); int index = _mesh_data_resources.size();
MeshDataResourceEntry e; MeshDataResourceEntry e;
if (apply_voxel_scale) {
e.transform = Transform(Basis().scaled(Vector3(_voxel_scale, _voxel_scale, _voxel_scale)));
e.transform.origin = local_data_pos * _voxel_scale;
} else {
e.transform.origin = local_data_pos;
}
e.mesh = mesh;
e.texture = texture;
e.color = color;
if (get_library().is_valid() && texture.is_valid())
e.uv_rect = get_library()->get_prop_uv_rect(texture);
else
e.uv_rect = Rect2(0, 0, 1, 1);
_mesh_data_resources.push_back(e);
if (has_method("_mesh_data_resource_added"))
call("_mesh_data_resource_added", index);
return index;
}
int VoxelChunk::add_mesh_data_resource(const Transform &local_transform, const Ref<MeshDataResource> &mesh, const Ref<Texture> &texture, const Color &color, const bool apply_voxel_scale) {
ERR_FAIL_COND_V(!mesh.is_valid(), 0);
int index = _mesh_data_resources.size();
MeshDataResourceEntry e;
e.transform = local_transform; e.transform = local_transform;
if (apply_voxel_scale) {
e.transform.basis = e.transform.basis.scaled(Vector3(_voxel_scale, _voxel_scale, _voxel_scale));
e.transform.origin = e.transform.origin * _voxel_scale;
}
e.mesh = mesh; e.mesh = mesh;
e.texture = texture; e.texture = texture;
e.color = color; e.color = color;
@ -913,6 +951,23 @@ void VoxelChunk::set_transform(const Transform &transform) {
_transform = transform; _transform = transform;
} }
Transform VoxelChunk::get_global_transform() const {
ERR_FAIL_COND_V(!get_voxel_world(), Transform());
return get_voxel_world()->get_global_transform() * _transform;
}
Vector3 VoxelChunk::to_local(Vector3 p_global) const {
return get_global_transform().affine_inverse().xform(p_global);
}
Vector3 VoxelChunk::to_global(Vector3 p_local) const {
return get_global_transform().xform(p_local);
}
VoxelChunk::VoxelChunk() { VoxelChunk::VoxelChunk() {
_is_build_threaded = false; _is_build_threaded = false;
_is_processing = false; _is_processing = false;
@ -1208,7 +1263,8 @@ void VoxelChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("clear_props"), &VoxelChunk::clear_props); ClassDB::bind_method(D_METHOD("clear_props"), &VoxelChunk::clear_props);
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
ClassDB::bind_method(D_METHOD("add_mesh_data_resource", "local_transform", "mesh", "texture", "color"), &VoxelChunk::add_mesh_data_resource, DEFVAL(Ref<Texture>()), DEFVAL(Color(1, 1, 1, 1))); ClassDB::bind_method(D_METHOD("add_mesh_data_resourcev", "local_data_pos", "mesh", "texture", "color", "apply_voxel_scale"), &VoxelChunk::add_mesh_data_resourcev, DEFVAL(Ref<Texture>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(true));
ClassDB::bind_method(D_METHOD("add_mesh_data_resource", "local_transform", "mesh", "texture", "color", "apply_voxel_scale"), &VoxelChunk::add_mesh_data_resource, DEFVAL(Ref<Texture>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(true));
ClassDB::bind_method(D_METHOD("get_mesh_data_resource", "index"), &VoxelChunk::get_mesh_data_resource); ClassDB::bind_method(D_METHOD("get_mesh_data_resource", "index"), &VoxelChunk::get_mesh_data_resource);
ClassDB::bind_method(D_METHOD("set_mesh_data_resource", "index", "mesh"), &VoxelChunk::set_mesh_data_resource); ClassDB::bind_method(D_METHOD("set_mesh_data_resource", "index", "mesh"), &VoxelChunk::set_mesh_data_resource);
@ -1250,5 +1306,9 @@ void VoxelChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("create_meshers"), &VoxelChunk::create_meshers); ClassDB::bind_method(D_METHOD("create_meshers"), &VoxelChunk::create_meshers);
ClassDB::bind_method(D_METHOD("get_global_transform"), &VoxelChunk::get_global_transform);
ClassDB::bind_method(D_METHOD("to_local", "global"), &VoxelChunk::to_local);
ClassDB::bind_method(D_METHOD("to_global", "local"), &VoxelChunk::to_global);
ClassDB::bind_method(D_METHOD("_world_transform_changed"), &VoxelChunk::_world_transform_changed); ClassDB::bind_method(D_METHOD("_world_transform_changed"), &VoxelChunk::_world_transform_changed);
} }

7
world/voxel_chunk.h
View File

@ -204,7 +204,8 @@ public:
#endif #endif
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
int add_mesh_data_resource(const Transform &local_transform, const Ref<MeshDataResource> &mesh, const Ref<Texture> &texture = Ref<Texture>(), const Color &color = Color(1, 1, 1, 1)); int add_mesh_data_resourcev(const Vector3 &local_data_pos, const Ref<MeshDataResource> &mesh, const Ref<Texture> &texture = Ref<Texture>(), const Color &color = Color(1, 1, 1, 1), const bool apply_voxel_scale = true);
int add_mesh_data_resource(const Transform &local_transform, const Ref<MeshDataResource> &mesh, const Ref<Texture> &texture = Ref<Texture>(), const Color &color = Color(1, 1, 1, 1), const bool apply_voxel_scale = true);
Ref<MeshDataResource> get_mesh_data_resource(const int index); Ref<MeshDataResource> get_mesh_data_resource(const int index);
void set_mesh_data_resource(const int index, const Ref<MeshDataResource> &mesh); void set_mesh_data_resource(const int index, const Ref<MeshDataResource> &mesh);
@ -258,6 +259,10 @@ public:
Transform get_transform() const; Transform get_transform() const;
void set_transform(const Transform &transform); void set_transform(const Transform &transform);
Transform get_global_transform() const;
Vector3 to_local(Vector3 p_global) const;
Vector3 to_global(Vector3 p_local) const;
VoxelChunk(); VoxelChunk();
~VoxelChunk(); ~VoxelChunk();