Making modelViewProjectionMatrix internal

supernovaengine · Nov 14, 2024 · a27a3d6 · a27a3d6
1 parent 3e05878
commit a27a3d6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/engine/core/component/Transform.h b/engine/core/component/Transform.h
@@ -25,6 +25,8 @@ namespace Supernova{
 
         Matrix4 modelMatrix;
         Matrix4 normalMatrix;
+
+        // internal use only, it depends of camera (same scene can have multiple cameras)
         Matrix4 modelViewProjectionMatrix;
 
         bool staticObject = false;

diff --git a/engine/core/object/Camera.cpp b/engine/core/object/Camera.cpp
@@ -311,6 +311,21 @@ Vector3 Camera::getWorldRight() const{
     return camera.worldRight;
 }
 
+Matrix4 Camera::getViewMatrix() const{
+    CameraComponent& camera = getComponent<CameraComponent>();
+    return camera.viewMatrix;
+}
+
+Matrix4 Camera::getProjectionMatrix() const{
+    CameraComponent& camera = getComponent<CameraComponent>();
+    return camera.projectionMatrix;
+}
+
+Matrix4 Camera::getViewProjectionMatrix() const{
+    CameraComponent& camera = getComponent<CameraComponent>();
+    return camera.viewProjectionMatrix;
+}
+
 void Camera::rotateView(float angle){
     if (angle != 0){
         CameraComponent& camera = getComponent<CameraComponent>();

diff --git a/engine/core/object/Camera.h b/engine/core/object/Camera.h
@@ -70,6 +70,10 @@ namespace Supernova{
         Vector3 getWorldUp() const;
         Vector3 getWorldRight() const;
 
+        Matrix4 getViewMatrix() const;
+        Matrix4 getProjectionMatrix() const;
+        Matrix4 getViewProjectionMatrix() const;
+
         void rotateView(float angle);
         void rotatePosition(float angle);
 

diff --git a/engine/core/object/Object.cpp b/engine/core/object/Object.cpp
@@ -197,11 +197,6 @@ Matrix4 Object::getNormalMatrix() const{
     return transform.normalMatrix;
 }
 
-Matrix4 Object::getModelViewProjectionMatrix() const{
-    Transform& transform = getComponent<Transform>();
-    return transform.modelViewProjectionMatrix;
-}
-
 void Object::addChild(Object* child){
     scene->addEntityChild(this->entity, child->entity, false);
 }

diff --git a/engine/core/object/Object.h b/engine/core/object/Object.h
@@ -65,7 +65,6 @@ namespace Supernova{
 
         Matrix4 getModelMatrix() const;
         Matrix4 getNormalMatrix() const;
-        Matrix4 getModelViewProjectionMatrix() const;
 
         void updateTransform();
 

diff --git a/engine/core/script/binding/ObjectClassesLua.cpp b/engine/core/script/binding/ObjectClassesLua.cpp
@@ -201,7 +201,6 @@ void LuaBinding::registerObjectClasses(lua_State *L){
         .addProperty("localMatrix", &Object::getLocalMatrix, &Object::setLocalMatrix)
         .addProperty("modelMatrix", &Object::getModelMatrix)
         .addProperty("normalMatrix", &Object::getNormalMatrix)
-        .addProperty("modelViewProjectionMatrix", &Object::getModelViewProjectionMatrix)
         .addFunction("updateTransform", &Object::updateTransform)
         .addFunction("getBody2D", &Object::getBody2D)
         .addFunction("removeBody2D", &Object::removeBody2D)
@@ -237,6 +236,9 @@ void LuaBinding::registerObjectClasses(lua_State *L){
         .addFunction("getWorldDirection", &Camera::getWorldDirection)
         .addFunction("getWorldUp", &Camera::getWorldUp)
         .addFunction("getWorldRight", &Camera::getWorldRight)
+        .addFunction("getViewMatrix", &Camera::getViewMatrix)
+        .addFunction("getProjectionMatrix", &Camera::getProjectionMatrix)
+        .addFunction("getViewProjectionMatrix", &Camera::getViewProjectionMatrix)
         .addFunction("rotateView", &Camera::rotateView)
         .addFunction("rotatePosition", &Camera::rotatePosition)
         .addFunction("elevateView", &Camera::elevateView)