A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
refactor(anim): Tween owns its 13 target writes; decouple from animTargets (REARCH_ANIMATION P4b)
esengine21b951b28b53
diff --git a/src/esengine/animation/TweenSystem.cpp b/src/esengine/animation/TweenSystem.cppindex 762cf9d9b..92514b6a9 100644--- a/src/esengine/animation/TweenSystem.cpp+++ b/src/esengine/animation/TweenSystem.cpp@@ -1,7 +1,12 @@#include "TweenSystem.hpp"#include "EasingFunctions.hpp"-#include "AnimPropertyApply.hpp"+#include "../ecs/components/Transform.hpp"+#include "../ecs/components/Sprite.hpp"+#include "../ecs/components/Camera.hpp"+#include "../ecs/components/UIRect.hpp"+#include <glm/glm.hpp>+#include <cmath>#include <algorithm>namespace esengine::animation {@@ -120,32 +125,79 @@ void TweenSystem::resumeTween(ecs::Registry& registry, Entity tweenEntity) {}}-constexpr AnimTargetField TWEEN_TO_ANIM_FIELD[] = {- AnimTargetField::TransformPositionX,- AnimTargetField::TransformPositionY,- AnimTargetField::TransformPositionZ,- AnimTargetField::TransformScaleX,- AnimTargetField::TransformScaleY,- AnimTargetField::TransformRotationZ,- AnimTargetField::SpriteColorR,- AnimTargetField::SpriteColorG,- AnimTargetField::SpriteColorB,- AnimTargetField::SpriteColorA,- AnimTargetField::SpriteSizeX,- AnimTargetField::SpriteSizeY,- AnimTargetField::CameraOrthoSize,-};+// Tween owns the writes for its fixed 13 targets (was routed through the generic+// animTargets `applyAnimatedValue`; REARCH_ANIMATION P4b decouples it so the+// generic enum+switch can be deleted with the C++ timeline in P4c). Mirrors the+// per-field semantics exactly: rotation.z → half-angle quaternion, and the UIRect+// `anim_override_` flags so UI layout doesn't clobber animated Transform fields.+static void applyTweenValue(ecs::Registry& registry, Entity entity, TweenTarget target, f32 value) {+ switch (target) {+ case TweenTarget::TransformPositionX:+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) {+ c->position.x = value;+ if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= ecs::UIRect::ANIM_POS_X;+ }+ break;+ case TweenTarget::TransformPositionY:+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) {+ c->position.y = value;+ if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= ecs::UIRect::ANIM_POS_Y;+ }+ break;+ case TweenTarget::TransformPositionZ:+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) c->position.z = value;+ break;+ case TweenTarget::TransformScaleX:+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) {+ c->scale.x = value;+ if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= ecs::UIRect::ANIM_SCALE_X;+ }+ break;+ case TweenTarget::TransformScaleY:+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) {+ c->scale.y = value;+ if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= ecs::UIRect::ANIM_SCALE_Y;+ }+ break;+ case TweenTarget::TransformRotationZ:+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) {+ f32 h = value * 0.5f;+ c->rotation = glm::quat(std::cos(h), 0.0f, 0.0f, std::sin(h));+ if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= ecs::UIRect::ANIM_ROT_Z;+ }+ break;+ case TweenTarget::SpriteColorR:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) c->color.r = value;+ break;+ case TweenTarget::SpriteColorG:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) c->color.g = value;+ break;+ case TweenTarget::SpriteColorB:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) c->color.b = value;+ break;+ case TweenTarget::SpriteColorA:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) c->color.a = value;+ break;+ case TweenTarget::SpriteSizeX:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) c->size.x = value;+ break;+ case TweenTarget::SpriteSizeY:+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) c->size.y = value;+ break;+ case TweenTarget::CameraOrthoSize:+ if (auto* c = registry.tryGet<ecs::Camera>(entity)) c->orthoSize = value;+ break;+ default:+ break;+ }+}void TweenSystem::applyValue(ecs::Registry& registry, const TweenData& tween, f32 value) {Entity target = tween.target_entity;if (!registry.valid(target)) {return;}-- auto idx = static_cast<u8>(tween.target_property);- if (idx < static_cast<u8>(TweenTarget::COUNT)) {- applyAnimatedValue(registry, target, TWEEN_TO_ANIM_FIELD[idx], value);- }+ applyTweenValue(registry, target, tween.target_property, value);}f32 TweenSystem::evaluateEasing(const TweenData& tween, f32 t) {