Working on stuff

src/items/InteractiveObject.cpp

@@ -71,7 +71,7 @@ namespace ZL {
     }
 
 
-    void InteractiveObject::moveTo(const Eigen::Vector3f& target, float durationSec, std::function<void()> onComplete) {
+    void InteractiveObject::moveTo(const Eigen::Vector3f& target, float durationSec, std::function<void()> onComplete, std::string callbackName) {
         if (state.isAnimating) return;
         AnimTask task;
         task.type        = AnimTask::Type::Move;
@@ -83,12 +83,13 @@ namespace ZL {
         task.targetScale = state.scale;
         task.durationMs  = durationSec * 1000.f;
         task.elapsedMs   = 0.f;
-        task.onComplete  = std::move(onComplete);
+        task.onComplete     = std::move(onComplete);
+        task.onCompleteName = std::move(callbackName);
         state.animTask    = std::move(task);
         state.isAnimating = true;
     }
 
-    void InteractiveObject::rotateTo(float targetRotY, float durationSec, std::function<void()> onComplete) {
+    void InteractiveObject::rotateTo(float targetRotY, float durationSec, std::function<void()> onComplete, std::string callbackName) {
         if (state.isAnimating) return;
         AnimTask task;
         task.type        = AnimTask::Type::Rotate;
@@ -100,12 +101,13 @@ namespace ZL {
         task.targetScale = state.scale;
         task.durationMs  = durationSec * 1000.f;
         task.elapsedMs   = 0.f;
-        task.onComplete  = std::move(onComplete);
+        task.onComplete     = std::move(onComplete);
+        task.onCompleteName = std::move(callbackName);
         state.animTask    = std::move(task);
         state.isAnimating = true;
     }
 
-    void InteractiveObject::scaleTo(float targetScale, float durationSec, std::function<void()> onComplete) {
+    void InteractiveObject::scaleTo(float targetScale, float durationSec, std::function<void()> onComplete, std::string callbackName) {
         if (state.isAnimating) return;
         AnimTask task;
         task.type        = AnimTask::Type::Scale;
@@ -117,12 +119,13 @@ namespace ZL {
         task.targetScale = targetScale;
         task.durationMs  = durationSec * 1000.f;
         task.elapsedMs   = 0.f;
-        task.onComplete  = std::move(onComplete);
+        task.onComplete     = std::move(onComplete);
+        task.onCompleteName = std::move(callbackName);
         state.animTask    = std::move(task);
         state.isAnimating = true;
     }
 
-    void InteractiveObject::fadeTo(float targetAlpha, float durationSec, std::function<void()> onComplete) {
+    void InteractiveObject::fadeTo(float targetAlpha, float durationSec, std::function<void()> onComplete, std::string callbackName) {
         if (state.isAnimating) return;
         AnimTask task;
         task.type        = AnimTask::Type::Fade;
@@ -134,7 +137,8 @@ namespace ZL {
         task.targetScale = targetAlpha;          // reuse targetScale to hold target alpha
         task.durationMs  = durationSec * 1000.f;
         task.elapsedMs   = 0.f;
-        task.onComplete  = std::move(onComplete);
+        task.onComplete     = std::move(onComplete);
+        task.onCompleteName = std::move(callbackName);
         state.animTask    = std::move(task);
         state.isAnimating = true;
     }
@@ -256,6 +260,8 @@ namespace ZL {
             at["targetScale"] = animTask->targetScale;
             at["durationMs"]  = animTask->durationMs;
             at["elapsedMs"]   = animTask->elapsedMs;
+            if (!animTask->onCompleteName.empty())
+                at["onCompleteName"] = animTask->onCompleteName;
             out["animTask"] = std::move(at);
         }
     }
@@ -284,6 +290,7 @@ namespace ZL {
             task.targetScale = at.value("targetScale", 1.f);
             task.durationMs  = at.value("durationMs",  1000.f);
             task.elapsedMs   = at.value("elapsedMs",   0.f);
+            task.onCompleteName = at.value("onCompleteName", std::string());
             // onComplete is non-serializable; re-wired at runtime by Lua script callbacks.
             animTask = std::move(task);
         }

src/items/InteractiveObject.h

@@ -31,10 +31,12 @@ namespace ZL {
 		                                          Renderer& renderer,
 		                                          const std::string& zipPath = "");
 
-		void moveTo(const Eigen::Vector3f& target, float durationSec, std::function<void()> onComplete = {});
-		void rotateTo(float targetRotY, float durationSec, std::function<void()> onComplete = {});
-		void scaleTo(float targetScale, float durationSec, std::function<void()> onComplete = {});
-		void fadeTo(float targetAlpha, float durationSec, std::function<void()> onComplete = {});
+		// callbackName, if given, is the global Lua function name backing onComplete —
+		// stored in the AnimTask so it survives save/load (see ScriptEngine::rehydrateNamedCallback).
+		void moveTo(const Eigen::Vector3f& target, float durationSec, std::function<void()> onComplete = {}, std::string callbackName = "");
+		void rotateTo(float targetRotY, float durationSec, std::function<void()> onComplete = {}, std::string callbackName = "");
+		void scaleTo(float targetScale, float durationSec, std::function<void()> onComplete = {}, std::string callbackName = "");
+		void fadeTo(float targetAlpha, float durationSec, std::function<void()> onComplete = {}, std::string callbackName = "");
 		void update(int64_t deltaMs);
 		void draw(Renderer& renderer) const;
 		void drawDarklands(Renderer& renderer) const;

src/items/InteractiveObjectState.h

@@ -22,6 +22,10 @@ struct AnimTask {
     float durationMs  = 1000.f;
     float elapsedMs   = 0.f;
     std::function<void()> onComplete;  // non-serializable; re-wired at runtime by Lua callbacks
+    // Global Lua function name backing onComplete, if it was sourced from a script
+    // (see ScriptEngine::rehydrateNamedCallback). Serialized so the callback can be
+    // re-looked-up by name after a save/load; empty if none or non-Lua.
+    std::string onCompleteName;
 };
 
 // Paths and baked mesh transforms needed to recreate a LoadedGameObject from disk.