summaryrefslogtreecommitdiff
path: root/src/ecs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ecs.cpp')
-rw-r--r--src/ecs.cpp87
1 files changed, 49 insertions, 38 deletions
diff --git a/src/ecs.cpp b/src/ecs.cpp
index 831adfb..9de5c44 100644
--- a/src/ecs.cpp
+++ b/src/ecs.cpp
@@ -2,16 +2,13 @@
#include "ecs.hpp"
#include "game-settings.hpp"
+#include "math-helpers.hpp"
#include "memory.hpp"
#include "vendor/glm_include.hpp"
#include "window.hpp"
#include <btBulletDynamicsCommon.h>
-
-#define GLM_TO_BULLET_VEC_3(vec) btVector3(vec.x, vec.y, vec.z)
-#define GLM_TO_BULLET_QUAT(quat) btQuaternion(quat.x, quat.y, quat.z, quat.w)
-#define BULLET_TO_GLM_VEC_3(vec) glm::vec3(vec.getX(), vec.getY(), vec.getZ())
-#define BULLET_TO_GLM_QUAT(qt) glm::quat(qt.getW(), qt.getX(), qt.getY(), qt.getZ())
+#include <glm/gtc/type_ptr.hpp>
TypeSafeInt_B(EntityHandle);
const uint64_t maxBucketItemCount = 256;
@@ -193,14 +190,11 @@ void ECS_Tick(double delta) {
long count = Comp_Instance_BucketContainer.bucketCounter == b ? Comp_Instance_BucketContainer.itemCounter >> 32 : maxBucketItemCount;
for (uint32_t i = 0; i < count; ++i) {
auto &inst = bkt.instances[i];
- btTransform trans;
- inst.bt.defaultMotionState.getWorldTransform(trans);
-
- InstPos instPos = inst.instPos;
- instPos.pos = BULLET_TO_GLM_VEC_3(trans.getOrigin());
- instPos.rot = BULLET_TO_GLM_QUAT(trans.getRotation());
- // TODO add an _INNER since we have a reference to the object that this looks up
- ECS_UpdateInstance(inst.entHandle, instPos, false);
+ auto activationState = inst.bt.rigidBody->getActivationState();
+ if (activationState == ISLAND_SLEEPING || activationState == DISABLE_SIMULATION || activationState == WANTS_DEACTIVATION) {
+ continue;
+ }
+ inst.isNeedingUpdated = true;
}
}
}
@@ -263,10 +257,16 @@ void ECS_Tick_Late(double delta) {
chunk->dstBufferCopy.dstOffset = sizeof(glm::mat4) * inst.index;
}
- chunk->mats.Push(
- glm::translate(glm::mat4(1), inst.instPos.pos)
- * glm::mat4_cast(inst.instPos.rot)
- * glm::scale(glm::mat4(1), inst.instPos.scale));
+ btTransform btMatrix_posRot;
+ inst.bt.defaultMotionState.getWorldTransform(btMatrix_posRot);
+ float openglMatrix[16];
+ btMatrix_posRot.getOpenGLMatrix(openglMatrix);
+ glm::mat4 glmMat_posRot = glm::make_mat4(openglMatrix);
+
+ glm::vec3 scale;
+ BulletToGlm(inst.bt.collisionShape->getLocalScaling(), scale);
+
+ chunk->mats.Push(glm::scale(glmMat_posRot, scale));
bfrUpdate->runningSize += sizeof(glm::mat4);
inst.isNeedingUpdated = false;
}
@@ -365,7 +365,7 @@ CompGrBinds *ECS_GetGrBinds(uint64_t bucketIndex, uint64_t &itemCount) {
return Comp_GrBinds_BucketContainer.buckets[bucketIndex].compGrBinds;
}
-CompInstance &ECS_CreateInstance(EntityHandle entHandle, EntityHandle entityTypeEntityHandle) {
+CompInstance &ECS_CreateInstance(EntityHandle entHandle, EntityHandle entityTypeEntityHandle, const InstPos &instPos) {
assert(entHandle != EntityHandle_MAX);
assert(entityTypeEntityHandle != EntityHandle_MAX);
@@ -395,9 +395,6 @@ CompInstance &ECS_CreateInstance(EntityHandle entHandle, EntityHandle entityType
comp->grBindsHandle = grBinds->grBindsHandle;
comp->instanceHandle = ent->instanceHandle;
comp->index = grBinds->instanceCounter++;
- comp->instPos.pos = glm::vec3(0, 0, 0);
- comp->instPos.rot = glm::quat(1, 0, 0, 0);
- comp->instPos.scale = glm::vec3(1, 1, 1);
comp->isNeedingUpdated = true;
if (grBinds->instanceCounter > grBinds->instanceBufferMaxCount) {
@@ -406,15 +403,24 @@ CompInstance &ECS_CreateInstance(EntityHandle entHandle, EntityHandle entityType
if (btDynamicsWorld) {
comp->bt.localInertia = btVector3(0, 0, 0);
+ btVector3 scale;
+ GlmToBullet(instPos.scale, scale);
comp->bt.collisionShape = Pke_New<btBoxShape>(bulletBucket);
- new (comp->bt.collisionShape) btBoxShape(GLM_TO_BULLET_VEC_3(comp->instPos.scale));
+ new (comp->bt.collisionShape) btBoxShape(scale);
comp->bt.collisionShape->calculateLocalInertia(btScalar(1.f), comp->bt.localInertia);
btTransform transform;
transform.setIdentity();
- transform.setOrigin(GLM_TO_BULLET_VEC_3(comp->instPos.pos));
+ btVector3 origin;
+ GlmToBullet(instPos.pos, origin);
+ transform.setOrigin(origin);
+ btQuaternion rot;
+ GlmToBullet(instPos.rot, rot);
+ transform.setRotation(rot);
comp->bt.defaultMotionState = btDefaultMotionState(transform);
comp->bt.rigidBody = Pke_New<btRigidBody>(bulletBucket);
new (comp->bt.rigidBody) btRigidBody(btScalar(1.f), &comp->bt.defaultMotionState, comp->bt.collisionShape, comp->bt.localInertia);
+ comp->bt.rigidBody->setLinearVelocity(btVector3(0,0,0));
+ comp->bt.rigidBody->setAngularVelocity(btVector3(0,0,0));
btDynamicsWorld->addRigidBody(comp->bt.rigidBody);
comp->bt.rigidBody->setUserPointer(reinterpret_cast<void *>(comp->entHandle));
}
@@ -449,24 +455,29 @@ void ECS_UpdateInstance(EntityHandle entHandle, const InstPos &instPos, bool ove
auto i = Buckets_GetItemIndex(instanceHandle_t);
auto *inst = &Comp_Instance_BucketContainer.buckets[b].instances[i];
- if (overridePhysics == false
- && instPos.pos == inst->instPos.pos
- && instPos.rot == inst->instPos.rot
- && instPos.scale == inst->instPos.scale) {
- return;
- }
-
- inst->instPos.pos = instPos.pos;
- inst->instPos.rot = instPos.rot;
- inst->instPos.scale = instPos.scale;
- inst->isNeedingUpdated = true;
-
- if (overridePhysics == true && btDynamicsWorld) {
+ if (btDynamicsWorld && overridePhysics) {
btTransform transform;
transform.setIdentity();
- transform.setOrigin(GLM_TO_BULLET_VEC_3(inst->instPos.pos));
- transform.setRotation(GLM_TO_BULLET_QUAT(inst->instPos.rot));
+
+ btVector3 origin;
+ GlmToBullet(instPos.pos, origin);
+ transform.setOrigin(origin);
+
+ btQuaternion rot;
+ GlmToBullet(instPos.rot, rot);
+ transform.setRotation(rot);
inst->bt.rigidBody->setWorldTransform(transform);
+
+ btVector3 scale;
+ GlmToBullet(instPos.scale, scale);
+ inst->bt.collisionShape->setLocalScaling(scale);
+
+ inst->bt.rigidBody->setLinearVelocity(btVector3(0,0,0));
+ inst->bt.rigidBody->setAngularVelocity(btVector3(0,0,0));
+ btDynamicsWorld->getPairCache()->cleanProxyFromPairs(inst->bt.rigidBody->getBroadphaseProxy(), btDynamicsWorld->getDispatcher());
+ inst->bt.rigidBody->activate();
+
+ inst->isNeedingUpdated = true;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-08 23:48:42 +0000