Merge pull request #287 from naivisoftware/fix_transforms

Fix transform updates
napframework · Sep 14, 2023 · ac8fc2f · ac8fc2f
2 parents 11a0be5 + a5abd66
commit ac8fc2f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/system_modules/napscene/src/scene.cpp b/system_modules/napscene/src/scene.cpp
@@ -546,19 +546,17 @@ namespace nap
 	 */
 	static void sUpdateTransformsRecursive(EntityInstance& entity, bool parentDirty, const glm::mat4& parentTransform)
 	{
-		glm::mat4 new_transform = parentTransform;
-
-		bool is_dirty = parentDirty;
 		TransformComponentInstance* transform = entity.findComponent<TransformComponentInstance>();
-		if (transform && (transform->isDirty() || parentDirty))
+		bool has_transform = (transform != nullptr);
+		bool is_dirty = parentDirty;
+		if (has_transform && (transform->isDirty() || is_dirty))
 		{
 			is_dirty = true;
 			transform->update(parentTransform);
-			new_transform = transform->getGlobalTransform();
 		}
-
+		const glm::mat4& next_parent = (has_transform) ? transform->getGlobalTransform() : parentTransform;
 		for (EntityInstance* child : entity.getChildren())
-			sUpdateTransformsRecursive(*child, is_dirty, new_transform);
+			sUpdateTransformsRecursive(*child, is_dirty, next_parent);
 	}
 
 	//////////////////////////////////////////////////////////////////////////