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
feat(ui): tween anim_override works on UINode (REARCH_GUI unification S3)
esengine2e42b7a6b030
diff --git a/src/esengine/animation/TweenSystem.cpp b/src/esengine/animation/TweenSystem.cppindex 044898702..5c10c6fad 100644--- a/src/esengine/animation/TweenSystem.cpp+++ b/src/esengine/animation/TweenSystem.cpp@@ -6,6 +6,7 @@#include "../ecs/components/Sprite.hpp"#include "../ecs/components/Camera.hpp"#include "../ecs/components/UIRect.hpp"+#include "../ecs/components/UINode.hpp"#include <glm/glm.hpp>#include <cmath>@@ -132,18 +133,25 @@ void TweenSystem::resumeTween(ecs::Registry& registry, Entity tweenEntity) {// 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.+// Flag the entity's layout component (modern UINode or legacy UIRect) so the+// layout pass leaves the tween-driven Transform field alone this frame.+static void markUIAnimOverride(ecs::Registry& registry, Entity entity, u8 flag) {+ if (auto* n = registry.tryGet<ecs::UINode>(entity)) n->anim_override_ |= flag;+ else if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= flag;+}+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;+ markUIAnimOverride(registry, entity, ecs::UINode::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;+ markUIAnimOverride(registry, entity, ecs::UINode::ANIM_POS_Y);}break;case TweenTarget::TransformPositionZ:@@ -152,20 +160,20 @@ static void applyTweenValue(ecs::Registry& registry, Entity entity, TweenTargetcase 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;+ markUIAnimOverride(registry, entity, ecs::UINode::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;+ markUIAnimOverride(registry, entity, ecs::UINode::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;+ markUIAnimOverride(registry, entity, ecs::UINode::ANIM_ROT_Z);}break;case TweenTarget::SpriteColorR:diff --git a/src/esengine/bindings/WebSDKEntry.cpp b/src/esengine/bindings/WebSDKEntry.cppindex 8d51739f0..6fece573b 100644--- a/src/esengine/bindings/WebSDKEntry.cpp+++ b/src/esengine/bindings/WebSDKEntry.cpp@@ -630,11 +630,15 @@ void uiRect_clearAnimOverrides(ecs::Registry& registry) {for (auto entity : registry.view<ecs::UIRect>()) {registry.get<ecs::UIRect>(entity).anim_override_ = 0;}+ for (auto entity : registry.view<ecs::UINode>()) {+ registry.get<ecs::UINode>(entity).anim_override_ = 0;+ }}void uiRect_setAnimOverride(ecs::Registry& registry, u32 entity, u8 flags) {- auto* rect = registry.tryGet<ecs::UIRect>(Entity::fromRaw(entity));- if (rect) {+ if (auto* n = registry.tryGet<ecs::UINode>(Entity::fromRaw(entity))) {+ n->anim_override_ |= flags;+ } else if (auto* rect = registry.tryGet<ecs::UIRect>(Entity::fromRaw(entity))) {rect->anim_override_ |= flags;}}diff --git a/src/esengine/ecs/UILayoutSystem.cpp b/src/esengine/ecs/UILayoutSystem.cppindex b07d12832..492a55a5d 100644--- a/src/esengine/ecs/UILayoutSystem.cpp+++ b/src/esengine/ecs/UILayoutSystem.cpp@@ -540,8 +540,9 @@ void layoutUINodeSubtree(f32 localY = (1.0f - ppy) * ph - yt - 0.5f * fh;if (auto* t = registry.tryGet<Transform>(e)) {- t->position.x = localX;- t->position.y = localY;+ // Leave tween-driven position axes alone (see TweenSystem anim_override_).+ if (!(un.anim_override_ & UINode::ANIM_POS_X)) t->position.x = localX;+ if (!(un.anim_override_ & UINode::ANIM_POS_Y)) t->position.y = localY;}tree.nodes_[k].flags &= ~(LAYOUT_DIRTY | HAS_DIRTY_CHILD);}diff --git a/src/esengine/ecs/components/UINode.hpp b/src/esengine/ecs/components/UINode.hppindex 8e5de1a63..a80426fec 100644--- a/src/esengine/ecs/components/UINode.hpp+++ b/src/esengine/ecs/components/UINode.hpp@@ -92,6 +92,15 @@ struct UINode {// Layout output (not serialized): resolved px size written by the Yoga pass.glm::vec2 computed_size_{0.0f};+ // Set by the tween system for Transform fields it drives, so the layout pass+ // leaves those fields alone this frame (cleared each frame). Mirrors UIRect.+ u8 anim_override_{0};+ static constexpr u8 ANIM_POS_X = 1;+ static constexpr u8 ANIM_POS_Y = 2;+ static constexpr u8 ANIM_ROT_Z = 4;+ static constexpr u8 ANIM_SCALE_X = 8;+ static constexpr u8 ANIM_SCALE_Y = 16;+UINode() = default;};