Added computeAABB

deni2312 · Aug 23, 2024 · 483b9b8 · 483b9b8
1 parent be0572d
commit 483b9b8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 6 deletions.
diff --git a/Engine/include/SceneData/SceneExporterLayout.h b/Engine/include/SceneData/SceneExporterLayout.h
@@ -310,7 +310,6 @@ namespace Prisma {
             verticesData->vertices = vertices;
             verticesData->indices = j.at("faces").get<std::vector<unsigned int>>();
             mesh->loadModel(verticesData);
-            mesh->computeAABB();
         }
         else if(type == "LIGHT_DIRECTIONAL"){
             auto light = std::dynamic_pointer_cast<Prisma::Light<Prisma::LightType::LightDir>>(n);
@@ -433,7 +432,6 @@ namespace Prisma {
 
 
             mesh->loadAnimateModel(verticesData);
-            mesh->computeAABB();
         }
     }
 

diff --git a/Engine/src/Components/PhysicsMeshComponent.cpp b/Engine/src/Components/PhysicsMeshComponent.cpp
@@ -107,7 +107,6 @@ void Prisma::PhysicsMeshComponent::updateCollisionData() {
 void Prisma::PhysicsMeshComponent::colliderDispatcher(Prisma::Physics::Collider collider) {
     auto mesh = dynamic_cast<Prisma::Mesh*>(parent());
     if (mesh && !m_fixed) {
-        mesh->computeAABB();
         auto aabbData = mesh->aabbData();
         switch (collider) {
         case Prisma::Physics::Collider::BOX_COLLIDER: {

diff --git a/Engine/src/SceneData/SceneLoader.cpp b/Engine/src/SceneData/SceneLoader.cpp
@@ -138,8 +138,6 @@ void Prisma::SceneLoader::nodeIteration(std::shared_ptr<Node> nodeRoot, aiNode*
         currentMesh->matrix(glm::mat4(1.0f), false);
         currentMesh->finalMatrix(glm::mat4(1.0f), false);
 
-        currentMesh->computeAABB();
-
         nodeRoot->addChild(currentMesh,false);
         if (isAnimate) {
             if (m_scene->animateMeshes.size() < MAX_ANIMATION_MESHES) {

diff --git a/Engine/src/SceneObjects/AnimatedMesh.cpp b/Engine/src/SceneObjects/AnimatedMesh.cpp
@@ -33,6 +33,7 @@ void Prisma::AnimatedMesh::computeAABB()
 
 void Prisma::AnimatedMesh::loadAnimateModel(std::shared_ptr<AnimateVerticesData> vertices) {
 	m_animateVertices = vertices;
+    computeAABB();
 }
 
 std::shared_ptr<Prisma::AnimatedMesh::AnimateVerticesData> Prisma::AnimatedMesh::animateVerticesData()

diff --git a/Engine/src/SceneObjects/Mesh.cpp b/Engine/src/SceneObjects/Mesh.cpp
@@ -12,6 +12,7 @@
 void Prisma::Mesh::loadModel(std::shared_ptr<VerticesData> vertices)
 {
 	m_vertices = vertices;
+    computeAABB();
 }
 
 const Prisma::Mesh::VerticesData& Prisma::Mesh::verticesData() const

diff --git a/UserEngine/src/PlayerController.cpp b/UserEngine/src/PlayerController.cpp
@@ -199,7 +199,6 @@ void PlayerController::createCamera() {
         if (button == GLFW_MOUSE_BUTTON_LEFT && action == GLFW_PRESS) {
             auto ball = Prisma::Mesh::instantiate(m_sphereMesh);
             auto physicsComponent = std::make_shared<Prisma::PhysicsMeshComponent>();
-            ball->computeAABB();
             ball->addComponent(physicsComponent);
             auto front = glm::normalize(m_front);
             auto position = m_gunPosition->finalMatrix()[3] + glm::vec4(Prisma::getVec3GLM(m_currentDirection), 0.0f);