Working on save-load system and UI

src/items/InteractiveObject.cpp

@@ -67,7 +67,6 @@ namespace ZL {
                                                   obj.state.jsonPositionY,
                                                   obj.state.jsonPositionZ);
         }
-
         return obj;
     }
 
@@ -239,8 +238,25 @@ namespace ZL {
         out["scale"]     = scale;
         out["alpha"]     = alpha;
         out["isActive"]  = isActive;
-        // isAnimating and animTask are not saved: animations snap to their end
-        // state on load (the final position/scale/alpha is already in the fields above).
+        out["isAnimating"] = isAnimating;
+
+        if (isAnimating && animTask.has_value()) {
+            nlohmann::json at;
+            at["type"]        = static_cast<int>(animTask->type);
+            at["startPosX"]   = animTask->startPos.x();
+            at["startPosY"]   = animTask->startPos.y();
+            at["startPosZ"]   = animTask->startPos.z();
+            at["startRotY"]   = animTask->startRotY;
+            at["startScale"]  = animTask->startScale;
+            at["targetPosX"]  = animTask->targetPos.x();
+            at["targetPosY"]  = animTask->targetPos.y();
+            at["targetPosZ"]  = animTask->targetPos.z();
+            at["targetRotY"]  = animTask->targetRotY;
+            at["targetScale"] = animTask->targetScale;
+            at["durationMs"]  = animTask->durationMs;
+            at["elapsedMs"]   = animTask->elapsedMs;
+            out["animTask"] = std::move(at);
+        }
     }
 
     void InteractiveObjectState::load(const nlohmann::json& in)
@@ -252,9 +268,24 @@ namespace ZL {
         scale        = in.value("scale",     scale);
         alpha        = in.value("alpha",     alpha);
         isActive     = in.value("isActive",  isActive);
-        // Cancel any in-flight animation; state was restored to final values above.
-        isAnimating = false;
+        isAnimating  = in.value("isAnimating", false);
         animTask.reset();
+
+        if (isAnimating && in.contains("animTask") && in["animTask"].is_object()) {
+            const auto& at = in["animTask"];
+            AnimTask task;
+            task.type        = static_cast<AnimTask::Type>(at.value("type", 0));
+            task.startPos    = { at.value("startPosX", 0.f), at.value("startPosY", 0.f), at.value("startPosZ", 0.f) };
+            task.startRotY   = at.value("startRotY",  0.f);
+            task.startScale  = at.value("startScale", 1.f);
+            task.targetPos   = { at.value("targetPosX", 0.f), at.value("targetPosY", 0.f), at.value("targetPosZ", 0.f) };
+            task.targetRotY  = at.value("targetRotY",  0.f);
+            task.targetScale = at.value("targetScale", 1.f);
+            task.durationMs  = at.value("durationMs",  1000.f);
+            task.elapsedMs   = at.value("elapsedMs",   0.f);
+            // onComplete is non-serializable; re-wired at runtime by Lua script callbacks.
+            animTask = std::move(task);
+        }
     }
 
 } // namespace ZL