Fix-up more object animation problems

redstrate · redstrate · commit 77a1ef4e8473 · 2026-01-07T20:27:33.000-05:00
Now stuff will properly spin around! As a side benefit, models are now
orientated and scaled correctly everywhere.
diff --git a/apps/armoury/src/gearview.cpp b/apps/armoury/src/gearview.cpp
@@ -343,9 +343,15 @@ void GearView::updatePart()
                     maxLod = std::max(mdl.num_lod, maxLod);
 
                     gearAddition.bodyId = physis_get_race_code(fallbackRace, fallbackTribe, currentGender);
+
+                    Transformation transformation{};
+                    transformation.scale[0] = 1;
+                    transformation.scale[1] = 1;
+                    transformation.scale[2] = 1;
+
                     mdlPart->addModel(mdl,
                                       true,
-                                      glm::vec3(),
+                                      transformation,
                                       sanitizeMdlPath(mdlPath),
                                       materials,
                                       currentLod,
@@ -401,7 +407,12 @@ void GearView::updatePart()
                     }
                 }
 
-                mdlPart->addModel(mdl, true, glm::vec3(), sanitizeMdlPath(mdlPath), materials, currentLod);
+                Transformation transformation{};
+                transformation.scale[0] = 1;
+                transformation.scale[1] = 1;
+                transformation.scale[2] = 1;
+
+                mdlPart->addModel(mdl, true, transformation, sanitizeMdlPath(mdlPath), materials, currentLod);
             }
         }
     };
diff --git a/apps/mateditor/src/materialview.cpp b/apps/mateditor/src/materialview.cpp
@@ -47,7 +47,12 @@ void MaterialView::addSphere(physis_Material material)
     std::string skelNameStd = skelName.toStdString();
     mdlPart->setSkeleton(physis_skeleton_parse(data->platform, physis_sqpack_read(data, skelNameStd.c_str())));
 
-    mdlPart->addModel(m_mdl, false, glm::vec3(), QStringLiteral("mdl"), {material}, 0);
+    Transformation transformation{};
+    transformation.scale[0] = 1;
+    transformation.scale[1] = 1;
+    transformation.scale[2] = 1;
+
+    mdlPart->addModel(m_mdl, false, transformation, QStringLiteral("mdl"), {material}, 0);
 }
 
 #include "moc_materialview.cpp"
diff --git a/apps/mdlviewer/src/mainwindow.cpp b/apps/mdlviewer/src/mainwindow.cpp
@@ -98,7 +98,12 @@ void MainWindow::setupActions()
 
             setWindowFilePath(fileName);
 
-            part->addModel(mdl, false, glm::vec3(), QStringLiteral("mdl"), {}, 0);
+            Transformation transformation{};
+            transformation.scale[0] = 1;
+            transformation.scale[1] = 1;
+            transformation.scale[2] = 1;
+
+            part->addModel(mdl, false, transformation, QStringLiteral("mdl"), {}, 0);
 
             // Clear layout
             QLayoutItem *child = nullptr;
diff --git a/apps/sagasu/src/mainwindow.cpp b/apps/sagasu/src/mainwindow.cpp
@@ -224,8 +224,13 @@ void MainWindow::refreshParts(const QString &indexPath, Hash hash, const QString
         auto exportButton = new QPushButton(QStringLiteral("Export glTF"));
         mdlLayout->addWidget(exportButton);
 
+        Transformation transformation{};
+        transformation.scale[0] = 1;
+        transformation.scale[1] = 1;
+        transformation.scale[2] = 1;
+
         auto mdlWidget = new MDLPart(&m_data, fileCache);
-        mdlWidget->addModel(physis_mdl_parse(m_data.platform, file), false, glm::vec3(), QStringLiteral("mdl"), {}, 0);
+        mdlWidget->addModel(physis_mdl_parse(m_data.platform, file), false, transformation, QStringLiteral("mdl"), {}, 0);
         mdlLayout->addWidget(mdlWidget);
 
         connect(importButton, &QPushButton::clicked, this, [this, mdlWidget](bool) {
diff --git a/extern/libphysis b/extern/libphysis
@@ -1 +1 @@
-Subproject commit fa418a32c5367ed66e69a8a396f3717b29f38954
+Subproject commit 10127dbafa286f001083c72235dd2f9dd1134237
diff --git a/parts/mdl/mdlpart.cpp b/parts/mdl/mdlpart.cpp
@@ -85,7 +85,7 @@ void MDLPart::clear()
 
 void MDLPart::addModel(physis_MDL mdl,
                        bool skinned,
-                       glm::vec3 position,
+                       Transformation transformation,
                        const QString &name,
                        std::vector<physis_Material> materials,
                        int lod,
@@ -113,7 +113,7 @@ void MDLPart::addModel(physis_MDL mdl,
     }
 
     Q_ASSERT(model != nullptr);
-    vkWindow->models.push_back(DrawObjectInstance{name, model, position});
+    vkWindow->models.push_back(DrawObjectInstance{name, model, transformation});
 
     Q_EMIT modelChanged();
 }
@@ -500,10 +500,10 @@ bool MDLPart::modelExists(const QString &name)
     return vkWindow->sourceModels.contains(name);
 }
 
-void MDLPart::addExistingModel(const QString &name, glm::vec3 position)
+void MDLPart::addExistingModel(const QString &name, Transformation transformation)
 {
     auto model = vkWindow->sourceModels[name];
-    vkWindow->models.push_back(DrawObjectInstance{name, model, position});
+    vkWindow->models.push_back(DrawObjectInstance{name, model, transformation});
 }
 
 #include "moc_mdlpart.cpp"
diff --git a/parts/mdl/mdlpart.h b/parts/mdl/mdlpart.h
@@ -70,14 +70,14 @@ public Q_SLOTS:
 
     void addModel(physis_MDL mdl,
                   bool skinned,
-                  glm::vec3 position,
+                  Transformation transformation,
                   const QString &name,
                   std::vector<physis_Material> materials,
                   int lod,
                   uint16_t fromBodyId = 101,
                   uint16_t toBodyId = 101);
 
-    void addExistingModel(const QString &name, glm::vec3 position);
+    void addExistingModel(const QString &name, Transformation transformation);
 
     void removeModel(const physis_MDL &mdl);
 
diff --git a/parts/scene/animation.cpp b/parts/scene/animation.cpp
@@ -29,8 +29,6 @@ float FCurve::atTime(const float time) const
     const auto adjustedMomentStart = time - startTime; // Example: 20 - 400
     const auto adjustedMoment = adjustedMomentStart / duration; // ???
 
-    qInfo() << "Between points:" << startTime << adjustedMoment << endTime;
-
     return std::lerp(startPoint.value, endPoint.value, adjustedMoment);
 }
 
@@ -96,18 +94,27 @@ Animation::Animation(const ObjectScene &scene)
 {
     processScene(scene);
 
-    // TODO: I suspect this won't work out because nested scenes may share IDs, but I'm unsure. Then we would need an animation nesting system similar to
-    // scenes.
-    for (const auto &nestedScene : scene.nestedScenes.values()) {
-        processScene(nestedScene);
-    }
-
     qInfo() << "Processed" << m_tracks.size() << "timelines with" << m_actorTracks.size() << "actors!";
 }
 
 void Animation::update(ObjectScene &scene, const float time)
 {
-    processUpdateScene(scene, time);
+    for (const auto &[id, track] : m_actorTracks.asKeyValueRange()) {
+        const auto newTransformation = track->transformationAtTime(time);
+        if (scene.nestedScenes.contains(id)) {
+            scene.nestedScenes[id].transformation = newTransformation;
+        } else {
+            // TODO: searches through embedded LGBs, but it really should be all objects maybe?
+            // We really need a proper scene graph anyhow
+            for (auto &lgb : scene.embeddedLgbs) {
+                for (uint32_t i = 0; i < lgb.layer_count; i++) {
+                    for (uint32_t j = 0; j < lgb.layers[i].num_objects; j++) {
+                        lgb.layers[i].objects[j].transform = newTransformation;
+                    }
+                }
+            }
+        }
+    }
 }
 
 float Animation::duration() const
@@ -222,30 +229,3 @@ void Animation::processTimeline(const physis_Tmb &timeline)
         }
     }
 }
-
-void printTransformation(const Transformation &transformation)
-{
-    qInfo() << "- pos[x] =" << transformation.translation[0];
-    qInfo() << "- pos[y] =" << transformation.translation[1];
-    qInfo() << "- pos[z] =" << transformation.translation[2];
-
-    qInfo() << "- rot[x] =" << transformation.rotation[0];
-    qInfo() << "- rot[y] =" << transformation.rotation[1];
-    qInfo() << "- rot[z] =" << transformation.rotation[2];
-
-    qInfo() << "- scl[x] =" << transformation.scale[0];
-    qInfo() << "- scl[y] =" << transformation.scale[1];
-    qInfo() << "- scl[z] =" << transformation.scale[2];
-}
-
-void Animation::processUpdateScene(ObjectScene &scene, const float time)
-{
-    for (const auto &[id, track] : m_actorTracks.asKeyValueRange()) {
-        if (scene.nestedScenes.contains(id)) {
-            qInfo() << "Updating nested scene" << id;
-            scene.nestedScenes[id].transformation = track->transformationAtTime(time);
-            printTransformation(scene.nestedScenes[id].transformation);
-            qInfo() << "";
-        }
-    }
-}
diff --git a/parts/scene/animation.h b/parts/scene/animation.h
@@ -54,7 +54,6 @@ class Animation
 private:
     void processScene(const ObjectScene &scene);
     void processTimeline(const physis_Tmb &timeline);
-    void processUpdateScene(ObjectScene &scene, float time);
 
     QList<Track *> m_tracks;
     QHash<uint32_t, Track *> m_actorTracks;
diff --git a/parts/scene/mapview.cpp b/parts/scene/mapview.cpp
@@ -69,12 +69,13 @@ void MapView::addTerrain(QString basePath, physis_Terrain terrain)
                 }
             }
 
-            mdlPart->addModel(plateMdl,
-                              false,
-                              glm::vec3(terrain.plates[i].position[0], 0.0f, terrain.plates[i].position[1]),
-                              QStringLiteral("terapart%1").arg(i),
-                              materials,
-                              0);
+            Transformation transformation{
+                .translation = {terrain.plates[i].position[0], 0.0f, terrain.plates[i].position[1]},
+                .rotation = {0, 0, 0},
+                .scale = {1, 1, 1},
+            };
+
+            mdlPart->addModel(plateMdl, false, transformation, QStringLiteral("terapart%1").arg(i), materials, 0);
 
             // We don't need this, and it will just take up memory
             physis_mdl_free(&plateMdl);
@@ -142,9 +143,9 @@ void MapView::processLayer(const physis_Layer &layer, const Transformation &root
                                       a.rotation[2] + b.rotation[2],
                                   },
                               .scale = {
-                                  a.scale[0] + b.scale[0],
-                                  a.scale[1] + b.scale[1],
-                                  a.scale[2] + b.scale[2],
+                                  a.scale[0] * b.scale[0],
+                                  a.scale[1] * b.scale[1],
+                                  a.scale[2] * b.scale[2],
                               }};
     };
 
@@ -176,12 +177,7 @@ void MapView::processLayer(const physis_Layer &layer, const Transformation &root
                             }
                         }
 
-                        mdlPart->addModel(plateMdl,
-                                          false,
-                                          glm::vec3(combinedTransform.translation[0], combinedTransform.translation[1], combinedTransform.translation[2]),
-                                          QString::fromStdString(assetPath),
-                                          materials,
-                                          0);
+                        mdlPart->addModel(plateMdl, false, combinedTransform, QString::fromStdString(assetPath), materials, 0);
 
                         // We don't need this, and it will just take up memory
                         physis_mdl_free(&plateMdl);
@@ -191,8 +187,7 @@ void MapView::processLayer(const physis_Layer &layer, const Transformation &root
 
                     physis_free_file(&plateMdlFile);
                 } else {
-                    mdlPart->addExistingModel(QString::fromStdString(assetPath),
-                                              glm::vec3(combinedTransform.translation[0], combinedTransform.translation[1], combinedTransform.translation[2]));
+                    mdlPart->addExistingModel(QString::fromStdString(assetPath), combinedTransform);
                 }
             }
         } break;
diff --git a/parts/scene/scenepart.cpp b/parts/scene/scenepart.cpp
@@ -33,7 +33,7 @@ ScenePart::ScenePart(physis_SqPackResource *data, QWidget *parent)
     m_animationTimeSlider->setMaximumWidth(400);
     m_animationTimeSlider->setEnabled(false);
     connect(m_animationTimeSlider, &QSlider::valueChanged, this, [this](const int value) {
-        m_animation->update(m_appState->rootScene, value);
+        m_appState->updateAllAnimations(value);
         Q_EMIT m_appState->mapLoaded(); // FIXME: extreme solution to lack of a proper updatable scene graph
     });
     sidebarLayout->addWidget(m_animationTimeSlider);
@@ -53,11 +53,11 @@ void ScenePart::loadSgb(physis_Buffer file)
         // TODO: load more than one section?
         m_appState->load(m_data, sgb.sections[0]);
 
-        m_animation = new Animation(m_appState->rootScene);
-
         // Update animation slider maximum
-        m_animationTimeSlider->setMaximum(m_animation->duration());
+        m_animationTimeSlider->setMaximum(m_appState->longestAnimationTime());
         m_animationTimeSlider->setEnabled(true);
+
+        qInfo() << "Longest animation time:" << m_appState->longestAnimationTime();
     } else {
         qWarning() << "Failed to parse SGB!";
     }
diff --git a/parts/scene/scenepart.h b/parts/scene/scenepart.h
@@ -17,7 +17,6 @@ class SceneState;
 class ObjectPropertiesWidget;
 struct physis_SqPackResource;
 class VulkanWindow;
-class Animation;
 
 class ScenePart : public QWidget
 {
@@ -38,6 +37,5 @@ class ScenePart : public QWidget
     ObjectPropertiesWidget *m_objectPropertiesWidget = nullptr;
     MapView *m_mapView = nullptr;
     FileCache m_fileCache;
-    Animation *m_animation;
     QSlider *m_animationTimeSlider = nullptr;
 };
diff --git a/parts/scene/scenestate.cpp b/parts/scene/scenestate.cpp
@@ -5,6 +5,8 @@
 
 #include <KLocalizedString>
 
+#include "animation.h"
+
 SceneState::SceneState(physis_SqPackResource *resource, QObject *parent)
     : QObject(parent)
 {
@@ -100,6 +102,8 @@ void ObjectScene::load(physis_SqPackResource *data, const physis_ScnSection &sec
     for (const auto layerGroup : embeddedLgbs) {
         processScnLayerGroup(data, layerGroup);
     }
+
+    animation = new Animation(*this);
 }
 
 void SceneState::load(physis_SqPackResource *data, const physis_ScnSection &section)
@@ -125,6 +129,8 @@ void SceneState::load(physis_SqPackResource *data, const physis_ScnSection &sect
         }
     }
 
+    processLongestAnimationTime(rootScene);
+
     Q_EMIT mapLoaded();
 }
 
@@ -155,6 +161,34 @@ QString SceneState::lookupEObjName(const uint32_t id) const
     return i18n("Event Object");
 }
 
+float SceneState::longestAnimationTime() const
+{
+    return m_longestAnimationTime;
+}
+
+void SceneState::updateAllAnimations(const float time)
+{
+    processUpdateAnimation(rootScene, time);
+}
+
+void SceneState::processLongestAnimationTime(const ObjectScene &scene)
+{
+    m_longestAnimationTime = std::max(m_longestAnimationTime, scene.animation->duration());
+
+    for (const auto &nestedScene : scene.nestedScenes.values()) {
+        processLongestAnimationTime(nestedScene);
+    }
+}
+
+void SceneState::processUpdateAnimation(ObjectScene &scene, float time)
+{
+    scene.animation->update(scene, time);
+
+    for (auto &nestedScene : scene.nestedScenes.values()) {
+        processUpdateAnimation(nestedScene, time);
+    }
+}
+
 void ObjectScene::processSharedGroup(physis_SqPackResource *data, uint32_t instanceId, const Transformation &transformation, const char *path)
 {
     qInfo() << "Processing" << path;
diff --git a/parts/scene/scenestate.h b/parts/scene/scenestate.h
diff --git a/renderer/include/drawobject.h b/renderer/include/drawobject.h
diff --git a/renderer/src/simplerenderer.cpp b/renderer/src/simplerenderer.cpp

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ void MDLPart::clear()`
`85`	`85`
`86`	`86`	`void MDLPart::addModel(physis_MDL mdl,`
`87`	`87`	`bool skinned,`
`88`		`- glm::vec3 position,`
	`88`	`+ Transformation transformation,`
`89`	`89`	`const QString &name,`
`90`	`90`	`std::vector<physis_Material> materials,`
`91`	`91`	`int lod,`
`@@ -113,7 +113,7 @@ void MDLPart::addModel(physis_MDL mdl,`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`Q_ASSERT(model != nullptr);`
`116`		`- vkWindow->models.push_back(DrawObjectInstance{name, model, position});`
	`116`	`+ vkWindow->models.push_back(DrawObjectInstance{name, model, transformation});`
`117`	`117`
`118`	`118`	`Q_EMIT modelChanged();`
`119`	`119`	`}`
`@@ -500,10 +500,10 @@ bool MDLPart::modelExists(const QString &name)`
`500`	`500`	`return vkWindow->sourceModels.contains(name);`
`501`	`501`	`}`
`502`	`502`
`503`		`-void MDLPart::addExistingModel(const QString &name, glm::vec3 position)`
	`503`	`+void MDLPart::addExistingModel(const QString &name, Transformation transformation)`
`504`	`504`	`{`
`505`	`505`	`auto model = vkWindow->sourceModels[name];`
`506`		`- vkWindow->models.push_back(DrawObjectInstance{name, model, position});`
	`506`	`+ vkWindow->models.push_back(DrawObjectInstance{name, model, transformation});`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`#include "moc_mdlpart.cpp"`