Relintai/props
1
0
Fork 0
mirror of https://github.com/Relintai/props.git synced 2025-02-04 16:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix moving PropInstanceMerger even when it's parent is moved.

Browse Source
This commit is contained in:
Relintai 2021-08-12 20:24:39 +02:00
parent 7643391f80
commit 067008bb90
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
prop_instance_merger.cpp
View File

@ -804,24 +804,32 @@ void PropInstanceMerger::_notification(int p_what) {
break; break;
} }
case NOTIFICATION_TRANSFORM_CHANGED: { case NOTIFICATION_TRANSFORM_CHANGED: {
Transform new_transform = get_global_transform();
if (new_transform == _last_transform) {
break;
}
_last_transform = new_transform;
VisualServer *vs = VisualServer::get_singleton(); VisualServer *vs = VisualServer::get_singleton();
for (int i = 0; i < _meshes.size(); ++i) { for (int i = 0; i < _meshes.size(); ++i) {
RID mir = _meshes[i].mesh_instance; RID mir = _meshes[i].mesh_instance;
if (mir != RID()) { if (mir != RID()) {
vs->instance_set_transform(mir, get_transform()); vs->instance_set_transform(mir, new_transform);
} }
} }
if (_debug_mesh_instance != RID()) { if (_debug_mesh_instance != RID()) {
vs->instance_set_transform(_debug_mesh_instance, get_transform()); vs->instance_set_transform(_debug_mesh_instance, new_transform);
} }
for (int i = 0; i < _colliders.size(); ++i) { for (int i = 0; i < _colliders.size(); ++i) {
const ColliderBody &c = _colliders[i]; const ColliderBody &c = _colliders[i];
PhysicsServer::get_singleton()->body_set_shape_transform(c.body, 0, get_transform() * c.transform); PhysicsServer::get_singleton()->body_set_shape_transform(c.body, 0, new_transform * c.transform);
} }
break; break;

2
prop_instance_merger.h
View File

@ -148,6 +148,8 @@ private:
int _lod_level; int _lod_level;
Transform _last_transform;
Ref<PropInstancePropJob> _job; Ref<PropInstancePropJob> _job;
Vector<Ref<Material>> _materials; Vector<Ref<Material>> _materials;