lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #300 from haraldreingruber-dedalus/fix_update_model_matrix

Browse Source 
[scenegraph] Fix update of model matrix
This commit is contained in:
Joey de Vries
2023-01-19 11:14:17 +01:00
committed by GitHub
parent b7eb2b55f1 13c446f255
commit 3da5dfeff0
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
includes/learnopengl/entity.h
View File

@@ -38,11 +38,13 @@ public:
void computeModelMatrix() void computeModelMatrix()
{ {
m_modelMatrix = getLocalModelMatrix(); m_modelMatrix = getLocalModelMatrix();
m_isDirty = false;
} }
void computeModelMatrix(const glm::mat4& parentGlobalModelMatrix) void computeModelMatrix(const glm::mat4& parentGlobalModelMatrix)
{ {
m_modelMatrix = parentGlobalModelMatrix * getLocalModelMatrix(); m_modelMatrix = parentGlobalModelMatrix * getLocalModelMatrix();
m_isDirty = false;
} }
void setLocalPosition(const glm::vec3& newPosition) void setLocalPosition(const glm::vec3& newPosition)
@@ -439,10 +441,15 @@ public:
//Update transform if it was changed //Update transform if it was changed
void updateSelfAndChild() void updateSelfAndChild()
{ {
if (!transform.isDirty()) if (transform.isDirty()) {
forceUpdateSelfAndChild();
return; return;
}
forceUpdateSelfAndChild();
for (auto&& child : children)
{
child->updateSelfAndChild();
}
} }
//Force update of transform even if local space don't change //Force update of transform even if local space don't change