diff options
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 0ab040c..860907c 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -52,7 +52,7 @@ Entity_Base *EntityType_CreateGenericInstance(EntityType *et, Entity_Base *level for (int64_t i = 0; i < et->detailsCount; ++i) { auto &etd = et->details[i]; - auto *compInst = ECS_CreateInstance(genericEntity, uuid, etd.grBinds); + auto *compInst = ECS_CreateInstance(genericEntity, uuid, etd.grBinds, nullptr); btVector3 scaling{1.f,1.f,1.f}; btTransform posRot{}; @@ -65,17 +65,18 @@ Entity_Base *EntityType_CreateGenericInstance(EntityType *et, Entity_Base *level } compInst->physicsLayer = srcInstance->physicsLayer; compInst->physicsMask = srcInstance->physicsMask; - posRot = instPos->posRot; } else { compInst->physicsLayer = etd.bt.startingCollisionLayer; compInst->physicsMask = etd.bt.startingCollisionMask; posRot.setIdentity(); } if (instPos != nullptr) { + posRot = instPos->posRot; mass = instPos->mass; scaling = instPos->scale; } else { mass = etd.bt.startingMass; + posRot.setIdentity(); } btVector3 localInertia(0, 0, 0); |