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

Fix transforms in add_prop.

Browse Source
This commit is contained in:
Relintai 2020-07-07 17:02:30 +02:00
parent b8aaaf499b
commit eac68265c1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
world/voxel_world.cpp
View File

@ -509,9 +509,13 @@ void VoxelWorld::set_chunks(const Vector<Variant> &chunks) {
} }
#if PROPS_PRESENT #if PROPS_PRESENT
void VoxelWorld::add_prop(const Transform &tarnsform, const Ref<PropData> &prop) { void VoxelWorld::add_prop(Transform tarnsform, const Ref<PropData> &prop, const bool apply_voxel_scael) {
ERR_FAIL_COND(!prop.is_valid()); ERR_FAIL_COND(!prop.is_valid());
if (apply_voxel_scael) {
tarnsform = tarnsform.scaled(Vector3(get_voxel_scale(), get_voxel_scale(), get_voxel_scale()));
}
Vector3 wp; Vector3 wp;
wp = tarnsform.xform(wp); wp = tarnsform.xform(wp);
Ref<VoxelChunk> chunk = get_or_create_chunk_at_world_position(wp); Ref<VoxelChunk> chunk = get_or_create_chunk_at_world_position(wp);
@ -527,7 +531,7 @@ void VoxelWorld::add_prop(const Transform &tarnsform, const Ref<PropData> &prop)
Transform t = tarnsform * entry->get_transform(); Transform t = tarnsform * entry->get_transform();
wp = t.xform(wp); wp = t.xform(Vector3());
chunk = get_or_create_chunk_at_world_position(wp); chunk = get_or_create_chunk_at_world_position(wp);
Ref<PropDataProp> prop_entry_data = entry; Ref<PropDataProp> prop_entry_data = entry;
@ -538,7 +542,7 @@ void VoxelWorld::add_prop(const Transform &tarnsform, const Ref<PropData> &prop)
if (!p.is_valid()) if (!p.is_valid())
continue; continue;
add_prop(t, p); add_prop(t, p, false);
continue; continue;
} }
@ -1096,7 +1100,7 @@ void VoxelWorld::_bind_methods() {
ClassDB::bind_method(D_METHOD("on_chunk_mesh_generation_finished", "chunk"), &VoxelWorld::on_chunk_mesh_generation_finished); ClassDB::bind_method(D_METHOD("on_chunk_mesh_generation_finished", "chunk"), &VoxelWorld::on_chunk_mesh_generation_finished);
#if PROPS_PRESENT #if PROPS_PRESENT
ClassDB::bind_method(D_METHOD("add_prop", "transform", "prop"), &VoxelWorld::add_prop); ClassDB::bind_method(D_METHOD("add_prop", "transform", "prop", "apply_voxel_scael"), &VoxelWorld::add_prop, DEFVAL(true));
#endif #endif
//Lights //Lights

2
world/voxel_world.h
View File

@ -161,7 +161,7 @@ public:
void set_chunks(const Vector<Variant> &chunks); void set_chunks(const Vector<Variant> &chunks);
#if PROPS_PRESENT #if PROPS_PRESENT
void add_prop(const Transform &tarnsform, const Ref<PropData> &prop); void add_prop(Transform tarnsform, const Ref<PropData> &prop, const bool apply_voxel_scael = true);
#endif #endif
//Lights //Lights