Small fixes to compilation and profiling regarding animations

Mormert · Aug 25, 2023 · 7c9c6ba · 7c9c6ba
1 parent 432b1ce
commit 7c9c6ba
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -95,7 +95,8 @@ add_library(engine STATIC
         "jleSkinnedMesh.cpp"
         "jleAnimationBone.cpp"
         "jleAnimation.cpp"
-        "cSkinnedMesh.cpp")
+        "cSkinnedMesh.cpp"
+        "jleAnimationFinalMatrices.cpp")
 
 if (BUILD_EDITOR)
     target_sources(engine PRIVATE

diff --git a/engine/cAnimator.cpp b/engine/cAnimator.cpp
@@ -1,9 +1,11 @@
 // Copyright (c) 2023. Johan Lind
 
 #include "cAnimator.h"
+
 #include "jleResourceRef.h"
 #include "jle3DGraph.h"
 #include "cSkinnedMesh.h"
+#include "jleProfiler.h"
 
 JLE_EXTERN_TEMPLATE_CEREAL_CPP(cAnimator)
 
@@ -29,6 +31,8 @@ cAnimator::update(float dt)
 {
     if(auto skinnedMeshComponent = _attachedToObject->getComponent<cSkinnedMesh>()){
 
+        JLE_SCOPE_PROFILE_CPU(cAnimator_Skinning)
+
         _deltaTime = dt;
         if(_currentAnimation){
             _currentTime += _currentAnimation->getTicksPerSec() * dt;

diff --git a/engine/jle3DGraph.cpp b/engine/jle3DGraph.cpp
@@ -2,8 +2,6 @@
 
 #include "jle3DGraph.h"
 #include "jleMaterial.h"
-#include "jleMesh.h"
-#include "jleAnimationFinalMatrices.h"
 
 void
 jle3DGraph::sendMesh(std::shared_ptr<jleMesh> &mesh,

diff --git a/engine/jle3DGraph.h b/engine/jle3DGraph.h
@@ -10,7 +10,7 @@
 class jleMaterial;
 class jleMesh;
 class jleSkinnedMesh;
-class jleAnimationFinalMatrices;
+struct jleAnimationFinalMatrices;
 
 struct jle3DRendererLight {
     glm::vec3 position;

diff --git a/engine/jle3DRenderer.cpp b/engine/jle3DRenderer.cpp
@@ -177,6 +177,7 @@ jle3DRenderer::renderMeshes(const jleCamera &camera,
                             const jle3DSettings &settings)
 {
     for (auto &&mesh : meshes) {
+        JLE_SCOPE_PROFILE_GPU(MeshRender);
         if (!mesh.material || !mesh.material->getShader()) {
             _shaders->missingMaterialShader->use();
             _shaders->missingMaterialShader->SetMat4("uView", camera.getViewMatrix());
@@ -205,6 +206,7 @@ jle3DRenderer::renderSkinnedMeshes(const jleCamera &camera,
                                    const jle3DSettings &settings)
 {
     for (auto &&mesh : skinnedMeshes) {
+        JLE_SCOPE_PROFILE_GPU(SkinnedMeshRender);
         if (!mesh.material || !mesh.material->getShader()) {
             _shaders->missingMaterialShader->use();
             _shaders->missingMaterialShader->SetMat4("uView", camera.getViewMatrix());

diff --git a/engine/jleAnimationFinalMatrices.cpp b/engine/jleAnimationFinalMatrices.cpp
@@ -0,0 +1,11 @@
+// Copyright (c) 2023. Johan Lind
+
+#include "jleAnimationFinalMatrices.h"
+
+jleAnimationFinalMatrices::jleAnimationFinalMatrices()
+{
+    matrices.reserve(100);
+    for(int i = 0; i < 100; ++i){
+        matrices.emplace_back(1.f);
+    }
+}
diff --git a/engine/jleAnimationFinalMatrices.h b/engine/jleAnimationFinalMatrices.h
@@ -8,10 +8,5 @@
 struct jleAnimationFinalMatrices{
     std::vector<glm::mat4> matrices;
 
-    jleAnimationFinalMatrices() {
-        matrices.reserve(100);
-        for(int i = 0; i < 100; ++i){
-            matrices.emplace_back(1.f);
-        }
-    }
+    jleAnimationFinalMatrices();
 };