Skip to content

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.

refactor: generate animation target enum and apply function from C++ annotations

esenginec9e4f9912451
diff --git a/sdk/src/timeline/TimelineUploader.ts b/sdk/src/timeline/TimelineUploader.ts
index 6bc7af084..f2ef71e3b 100644
--- a/sdk/src/timeline/TimelineUploader.ts
+++ b/sdk/src/timeline/TimelineUploader.ts
@@ -1,73 +1,8 @@
import type { ESEngineModule } from '../wasm';
import type { TimelineAsset, PropertyTrack, Track } from './TimelineTypes';
import { TrackType, InterpType } from './TimelineTypes';
-
-export enum AnimTargetField {
- PositionX = 0, PositionY, PositionZ,
- ScaleX, ScaleY, ScaleZ,
- RotationZ,
- ColorR, ColorG, ColorB, ColorA,
- SpriteOpacity,
- SpriteSizeX, SpriteSizeY,
- OffsetMinX, OffsetMinY,
- OffsetMaxX, OffsetMaxY,
- AnchorMinX, AnchorMinY,
- AnchorMaxX, AnchorMaxY,
- PivotX, PivotY,
- CameraOrthoSize,
- CustomField,
-}
-
-enum AnimTargetComponent {
- Transform = 0,
- Sprite,
- UIRect,
- Camera,
- Custom,
-}
-
-const FIELD_MAP: Record<string, Record<string, AnimTargetField>> = {
- Transform: {
- 'position.x': AnimTargetField.PositionX,
- 'position.y': AnimTargetField.PositionY,
- 'position.z': AnimTargetField.PositionZ,
- 'scale.x': AnimTargetField.ScaleX,
- 'scale.y': AnimTargetField.ScaleY,
- 'scale.z': AnimTargetField.ScaleZ,
- 'rotation': AnimTargetField.RotationZ,
- },
- Sprite: {
- 'color.r': AnimTargetField.ColorR,
- 'color.g': AnimTargetField.ColorG,
- 'color.b': AnimTargetField.ColorB,
- 'color.a': AnimTargetField.ColorA,
- 'opacity': AnimTargetField.SpriteOpacity,
- 'size.x': AnimTargetField.SpriteSizeX,
- 'size.y': AnimTargetField.SpriteSizeY,
- },
- UIRect: {
- 'offsetMin.x': AnimTargetField.OffsetMinX,
- 'offsetMin.y': AnimTargetField.OffsetMinY,
- 'offsetMax.x': AnimTargetField.OffsetMaxX,
- 'offsetMax.y': AnimTargetField.OffsetMaxY,
- 'anchorMin.x': AnimTargetField.AnchorMinX,
- 'anchorMin.y': AnimTargetField.AnchorMinY,
- 'anchorMax.x': AnimTargetField.AnchorMaxX,
- 'anchorMax.y': AnimTargetField.AnchorMaxY,
- 'pivot.x': AnimTargetField.PivotX,
- 'pivot.y': AnimTargetField.PivotY,
- },
- Camera: {
- 'orthoSize': AnimTargetField.CameraOrthoSize,
- },
-};
-
-const COMPONENT_MAP: Record<string, AnimTargetComponent> = {
- Transform: AnimTargetComponent.Transform,
- Sprite: AnimTargetComponent.Sprite,
- UIRect: AnimTargetComponent.UIRect,
- Camera: AnimTargetComponent.Camera,
-};
+export { AnimTargetField, AnimTargetComponent, FIELD_MAP, COMPONENT_MAP } from './animTargets.generated';
+import { AnimTargetField, AnimTargetComponent, FIELD_MAP, COMPONENT_MAP } from './animTargets.generated';
const INTERP_TYPE_MAP: Record<string, number> = {
[InterpType.Hermite]: 0,
diff --git a/sdk/src/timeline/animTargets.generated.ts b/sdk/src/timeline/animTargets.generated.ts
new file mode 100644
index 000000000..ca80acf6f
--- /dev/null
+++ b/sdk/src/timeline/animTargets.generated.ts
@@ -0,0 +1,107 @@
+/**
+ * @file animTargets.generated.ts
+ * @brief Auto-generated animation target mappings
+ * @details Generated by EHT - DO NOT EDIT
+ */
+
+export enum AnimTargetField {
+ UIRectAnchorMinX = 0,
+ UIRectAnchorMinY = 1,
+ UIRectAnchorMaxX = 2,
+ UIRectAnchorMaxY = 3,
+ UIRectOffsetMinX = 4,
+ UIRectOffsetMinY = 5,
+ UIRectOffsetMaxX = 6,
+ UIRectOffsetMaxY = 7,
+ UIRectPivotX = 8,
+ UIRectPivotY = 9,
+ TransformPositionX = 10,
+ TransformPositionY = 11,
+ TransformPositionZ = 12,
+ TransformRotationZ = 13,
+ TransformScaleX = 14,
+ TransformScaleY = 15,
+ TransformScaleZ = 16,
+ UIRendererColorR = 17,
+ UIRendererColorG = 18,
+ UIRendererColorB = 19,
+ UIRendererColorA = 20,
+ BitmapTextColorR = 21,
+ BitmapTextColorG = 22,
+ BitmapTextColorB = 23,
+ BitmapTextColorA = 24,
+ SpriteColorR = 25,
+ SpriteColorG = 26,
+ SpriteColorB = 27,
+ SpriteColorA = 28,
+ SpriteSizeX = 29,
+ SpriteSizeY = 30,
+ CameraOrthoSize = 31,
+ CustomField = 32,
+}
+
+export enum AnimTargetComponent {
+ UIRect = 0,
+ Transform = 1,
+ UIRenderer = 2,
+ BitmapText = 3,
+ Sprite = 4,
+ Camera = 5,
+ Custom = 6,
+}
+
+export const FIELD_MAP: Record<string, Record<string, AnimTargetField>> = {
+ UIRect: {
+ 'anchorMin.x': AnimTargetField.UIRectAnchorMinX,
+ 'anchorMin.y': AnimTargetField.UIRectAnchorMinY,
+ 'anchorMax.x': AnimTargetField.UIRectAnchorMaxX,
+ 'anchorMax.y': AnimTargetField.UIRectAnchorMaxY,
+ 'offsetMin.x': AnimTargetField.UIRectOffsetMinX,
+ 'offsetMin.y': AnimTargetField.UIRectOffsetMinY,
+ 'offsetMax.x': AnimTargetField.UIRectOffsetMaxX,
+ 'offsetMax.y': AnimTargetField.UIRectOffsetMaxY,
+ 'pivot.x': AnimTargetField.UIRectPivotX,
+ 'pivot.y': AnimTargetField.UIRectPivotY,
+ },
+ Transform: {
+ 'position.x': AnimTargetField.TransformPositionX,
+ 'position.y': AnimTargetField.TransformPositionY,
+ 'position.z': AnimTargetField.TransformPositionZ,
+ 'rotation.z': AnimTargetField.TransformRotationZ,
+ 'scale.x': AnimTargetField.TransformScaleX,
+ 'scale.y': AnimTargetField.TransformScaleY,
+ 'scale.z': AnimTargetField.TransformScaleZ,
+ },
+ UIRenderer: {
+ 'color.r': AnimTargetField.UIRendererColorR,
+ 'color.g': AnimTargetField.UIRendererColorG,
+ 'color.b': AnimTargetField.UIRendererColorB,
+ 'color.a': AnimTargetField.UIRendererColorA,
+ },
+ BitmapText: {
+ 'color.r': AnimTargetField.BitmapTextColorR,
+ 'color.g': AnimTargetField.BitmapTextColorG,
+ 'color.b': AnimTargetField.BitmapTextColorB,
+ 'color.a': AnimTargetField.BitmapTextColorA,
+ },
+ Sprite: {
+ 'color.r': AnimTargetField.SpriteColorR,
+ 'color.g': AnimTargetField.SpriteColorG,
+ 'color.b': AnimTargetField.SpriteColorB,
+ 'color.a': AnimTargetField.SpriteColorA,
+ 'size.x': AnimTargetField.SpriteSizeX,
+ 'size.y': AnimTargetField.SpriteSizeY,
+ },
+ Camera: {
+ 'orthoSize': AnimTargetField.CameraOrthoSize,
+ },
+};
+
+export const COMPONENT_MAP: Record<string, AnimTargetComponent> = {
+ UIRect: AnimTargetComponent.UIRect,
+ Transform: AnimTargetComponent.Transform,
+ UIRenderer: AnimTargetComponent.UIRenderer,
+ BitmapText: AnimTargetComponent.BitmapText,
+ Sprite: AnimTargetComponent.Sprite,
+ Camera: AnimTargetComponent.Camera,
+};
diff --git a/src/esengine/animation/AnimPropertyApply.hpp b/src/esengine/animation/AnimPropertyApply.hpp
index 9fc3a4a20..62359746d 100644
--- a/src/esengine/animation/AnimPropertyApply.hpp
+++ b/src/esengine/animation/AnimPropertyApply.hpp
@@ -1,126 +1,3 @@
#pragma once
-#include "TimelineData.hpp"
-#include "../ecs/Registry.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>
-
-namespace esengine::animation {
-
-inline void applyAnimatedValue(
- ecs::Registry& registry, Entity entity,
- AnimTargetField field, f32 value)
-{
- switch (field) {
- case AnimTargetField::PositionX:
- if (auto* t = registry.tryGet<ecs::Transform>(entity)) {
- t->position.x = value;
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) {
- r->anim_override_ |= ecs::UIRect::ANIM_POS_X;
- }
- }
- break;
- case AnimTargetField::PositionY:
- if (auto* t = registry.tryGet<ecs::Transform>(entity)) {
- t->position.y = value;
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) {
- r->anim_override_ |= ecs::UIRect::ANIM_POS_Y;
- }
- }
- break;
- case AnimTargetField::PositionZ:
- if (auto* t = registry.tryGet<ecs::Transform>(entity)) { t->position.z = value; }
- break;
- case AnimTargetField::ScaleX:
- if (auto* t = registry.tryGet<ecs::Transform>(entity)) {
- t->scale.x = value;
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) {
- r->anim_override_ |= ecs::UIRect::ANIM_SCALE_X;
- }
- }
- break;
- case AnimTargetField::ScaleY:
- if (auto* t = registry.tryGet<ecs::Transform>(entity)) {
- t->scale.y = value;
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) {
- r->anim_override_ |= ecs::UIRect::ANIM_SCALE_Y;
- }
- }
- break;
- case AnimTargetField::ScaleZ:
- if (auto* t = registry.tryGet<ecs::Transform>(entity)) { t->scale.z = value; }
- break;
- case AnimTargetField::RotationZ: {
- if (auto* t = registry.tryGet<ecs::Transform>(entity)) {
- f32 halfAngle = value * 0.5f;
- t->rotation = glm::quat(std::cos(halfAngle), 0.0f, 0.0f, std::sin(halfAngle));
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) {
- r->anim_override_ |= ecs::UIRect::ANIM_ROT_Z;
- }
- }
- break;
- }
- case AnimTargetField::ColorR:
- if (auto* s = registry.tryGet<ecs::Sprite>(entity)) { s->color.r = value; }
- break;
- case AnimTargetField::ColorG:
- if (auto* s = registry.tryGet<ecs::Sprite>(entity)) { s->color.g = value; }
- break;
- case AnimTargetField::ColorB:
- if (auto* s = registry.tryGet<ecs::Sprite>(entity)) { s->color.b = value; }
- break;
- case AnimTargetField::ColorA:
- case AnimTargetField::SpriteOpacity:
- if (auto* s = registry.tryGet<ecs::Sprite>(entity)) { s->color.a = value; }
- break;
- case AnimTargetField::SpriteSizeX:
- if (auto* s = registry.tryGet<ecs::Sprite>(entity)) { s->size.x = value; }
- break;
- case AnimTargetField::SpriteSizeY:
- if (auto* s = registry.tryGet<ecs::Sprite>(entity)) { s->size.y = value; }
- break;
- case AnimTargetField::OffsetMinX:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->offsetMin.x = value; }
- break;
- case AnimTargetField::OffsetMinY:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->offsetMin.y = value; }
- break;
- case AnimTargetField::OffsetMaxX:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->offsetMax.x = value; }
- break;
- case AnimTargetField::OffsetMaxY:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->offsetMax.y = value; }
- break;
- case AnimTargetField::AnchorMinX:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->anchorMin.x = value; }
- break;
- case AnimTargetField::AnchorMinY:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->anchorMin.y = value; }
- break;
- case AnimTargetField::AnchorMaxX:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->anchorMax.x = value; }
- break;
- case AnimTargetField::AnchorMaxY:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->anchorMax.y = value; }
- break;
- case AnimTargetField::PivotX:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->pivot.x = value; }
- break;
- case AnimTargetField::PivotY:
- if (auto* r = registry.tryGet<ecs::UIRect>(entity)) { r->pivot.y = value; }
- break;
- case AnimTargetField::CameraOrthoSize:
- if (auto* c = registry.tryGet<ecs::Camera>(entity)) { c->orthoSize = value; }
- break;
- case AnimTargetField::CustomField:
- default:
- break;
- }
-}
-
-} // namespace esengine::animation
+#include "animTargets.generated.hpp"
diff --git a/src/esengine/animation/TimelineData.hpp b/src/esengine/animation/TimelineData.hpp
index 54d8381c1..1e6f7ba35 100644
--- a/src/esengine/animation/TimelineData.hpp
+++ b/src/esengine/animation/TimelineData.hpp
@@ -1,6 +1,7 @@
#pragma once
#include "../core/Types.hpp"
+#include "animTargets.generated.hpp"
#include <string>
#include <vector>
@@ -34,50 +35,6 @@ struct TimelineChannel {
std::vector<TimelineKeyframe> keyframes;
};
-enum class AnimTargetComponent : u8 {
- Transform = 0,
- Sprite,
- UIRect,
- Camera,
- Custom,
- COUNT
-};
-
-enum class AnimTargetField : u8 {
- // Transform
- PositionX = 0,
- PositionY,
- PositionZ,
- ScaleX,
- ScaleY,
- ScaleZ,
- RotationZ,
- // Sprite
- ColorR,
- ColorG,
- ColorB,
- ColorA,
- SpriteOpacity,
- SpriteSizeX,
- SpriteSizeY,
- // UIRect
- OffsetMinX,
- OffsetMinY,
- OffsetMaxX,
- OffsetMaxY,
- AnchorMinX,
- AnchorMinY,
- AnchorMaxX,
- AnchorMaxY,
- PivotX,
- PivotY,
- // Camera
- CameraOrthoSize,
- // Custom (fallback to TS)
- CustomField,
- COUNT
-};
-
struct PropertyTrackBinding {
std::string childPath;
AnimTargetComponent component;
diff --git a/src/esengine/animation/TweenSystem.cpp b/src/esengine/animation/TweenSystem.cpp
index 3e63b8ef5..44b3d83b1 100644
--- a/src/esengine/animation/TweenSystem.cpp
+++ b/src/esengine/animation/TweenSystem.cpp
@@ -115,19 +115,19 @@ void TweenSystem::resumeTween(ecs::Registry& registry, Entity tweenEntity) {
}
constexpr AnimTargetField TWEEN_TO_ANIM_FIELD[] = {
- AnimTargetField::PositionX, // TransformPositionX
- AnimTargetField::PositionY, // TransformPositionY
- AnimTargetField::PositionZ, // TransformPositionZ
- AnimTargetField::ScaleX, // TransformScaleX
- AnimTargetField::ScaleY, // TransformScaleY
- AnimTargetField::RotationZ, // TransformRotationZ
- AnimTargetField::ColorR, // SpriteColorR
- AnimTargetField::ColorG, // SpriteColorG
- AnimTargetField::ColorB, // SpriteColorB
- AnimTargetField::ColorA, // SpriteColorA
- AnimTargetField::SpriteSizeX, // SpriteSizeX
- AnimTargetField::SpriteSizeY, // SpriteSizeY
- AnimTargetField::CameraOrthoSize, // CameraOrthoSize
+ 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,
};
void TweenSystem::applyValue(ecs::Registry& registry, const TweenData& tween, f32 value) {
diff --git a/src/esengine/animation/animTargets.generated.hpp b/src/esengine/animation/animTargets.generated.hpp
new file mode 100644
index 000000000..6ad014b3c
--- /dev/null
+++ b/src/esengine/animation/animTargets.generated.hpp
@@ -0,0 +1,243 @@
+#pragma once
+
+#include "../core/Types.hpp"
+#include "../ecs/Registry.hpp"
+#include "../ecs/components/UIRect.hpp"
+#include "../ecs/components/Transform.hpp"
+#include "../ecs/components/UIRenderer.hpp"
+#include "../ecs/components/BitmapText.hpp"
+#include "../ecs/components/Sprite.hpp"
+#include "../ecs/components/Camera.hpp"
+#include "../ecs/components/UIRect.hpp"
+
+#include <glm/glm.hpp>
+#include <cmath>
+
+namespace esengine::animation {
+
+enum class AnimTargetComponent : u8 {
+ UIRect = 0,
+ Transform = 1,
+ UIRenderer = 2,
+ BitmapText = 3,
+ Sprite = 4,
+ Camera = 5,
+ Custom = 6,
+ COUNT
+};
+
+enum class AnimTargetField : u8 {
+ UIRectAnchorMinX = 0,
+ UIRectAnchorMinY = 1,
+ UIRectAnchorMaxX = 2,
+ UIRectAnchorMaxY = 3,
+ UIRectOffsetMinX = 4,
+ UIRectOffsetMinY = 5,
+ UIRectOffsetMaxX = 6,
+ UIRectOffsetMaxY = 7,
+ UIRectPivotX = 8,
+ UIRectPivotY = 9,
+ TransformPositionX = 10,
+ TransformPositionY = 11,
+ TransformPositionZ = 12,
+ TransformRotationZ = 13,
+ TransformScaleX = 14,
+ TransformScaleY = 15,
+ TransformScaleZ = 16,
+ UIRendererColorR = 17,
+ UIRendererColorG = 18,
+ UIRendererColorB = 19,
+ UIRendererColorA = 20,
+ BitmapTextColorR = 21,
+ BitmapTextColorG = 22,
+ BitmapTextColorB = 23,
+ BitmapTextColorA = 24,
+ SpriteColorR = 25,
+ SpriteColorG = 26,
+ SpriteColorB = 27,
+ SpriteColorA = 28,
+ SpriteSizeX = 29,
+ SpriteSizeY = 30,
+ CameraOrthoSize = 31,
+ CustomField = 32,
+ COUNT
+};
+
+inline void applyAnimatedValue(
+ ecs::Registry& registry, Entity entity,
+ AnimTargetField field, f32 value)
+{
+ switch (field) {
+ case AnimTargetField::UIRectAnchorMinX:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->anchorMin.x = value;
+ }
+ break;
+ case AnimTargetField::UIRectAnchorMinY:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->anchorMin.y = value;
+ }
+ break;
+ case AnimTargetField::UIRectAnchorMaxX:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->anchorMax.x = value;
+ }
+ break;
+ case AnimTargetField::UIRectAnchorMaxY:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->anchorMax.y = value;
+ }
+ break;
+ case AnimTargetField::UIRectOffsetMinX:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->offsetMin.x = value;
+ }
+ break;
+ case AnimTargetField::UIRectOffsetMinY:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->offsetMin.y = value;
+ }
+ break;
+ case AnimTargetField::UIRectOffsetMaxX:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->offsetMax.x = value;
+ }
+ break;
+ case AnimTargetField::UIRectOffsetMaxY:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->offsetMax.y = value;
+ }
+ break;
+ case AnimTargetField::UIRectPivotX:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->pivot.x = value;
+ }
+ break;
+ case AnimTargetField::UIRectPivotY:
+ if (auto* c = registry.tryGet<ecs::UIRect>(entity)) {
+ c->pivot.y = value;
+ }
+ break;
+ case AnimTargetField::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 AnimTargetField::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 AnimTargetField::TransformPositionZ:
+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) {
+ c->position.z = value;
+ }
+ break;
+ case AnimTargetField::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 AnimTargetField::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 AnimTargetField::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 AnimTargetField::TransformScaleZ:
+ if (auto* c = registry.tryGet<ecs::Transform>(entity)) {
+ c->scale.z = value;
+ }
+ break;
+ case AnimTargetField::UIRendererColorR:
+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {
+ c->color.r = value;
+ }
+ break;
+ case AnimTargetField::UIRendererColorG:
+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {
+ c->color.g = value;
+ }
+ break;
+ case AnimTargetField::UIRendererColorB:
+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {
+ c->color.b = value;
+ }
+ break;
+ case AnimTargetField::UIRendererColorA:
+ if (auto* c = registry.tryGet<ecs::UIRenderer>(entity)) {
+ c->color.a = value;
+ }
+ break;
+ case AnimTargetField::BitmapTextColorR:
+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {
+ c->color.r = value;
+ }
+ break;
+ case AnimTargetField::BitmapTextColorG:
+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {
+ c->color.g = value;
+ }
+ break;
+ case AnimTargetField::BitmapTextColorB:
+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {
+ c->color.b = value;
+ }
+ break;
+ case AnimTargetField::BitmapTextColorA:
+ if (auto* c = registry.tryGet<ecs::BitmapText>(entity)) {
+ c->color.a = value;
+ }
+ break;
+ case AnimTargetField::SpriteColorR:
+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {
+ c->color.r = value;
+ }
+ break;
+ case AnimTargetField::SpriteColorG:
+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {
+ c->color.g = value;
+ }
+ break;
+ case AnimTargetField::SpriteColorB:
+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {
+ c->color.b = value;
+ }
+ break;
+ case AnimTargetField::SpriteColorA:
+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {
+ c->color.a = value;
+ }
+ break;
+ case AnimTargetField::SpriteSizeX:
+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {
+ c->size.x = value;
+ }
+ break;
+ case AnimTargetField::SpriteSizeY:
+ if (auto* c = registry.tryGet<ecs::Sprite>(entity)) {
+ c->size.y = value;
+ }
+ break;
+ case AnimTargetField::CameraOrthoSize:
+ if (auto* c = registry.tryGet<ecs::Camera>(entity)) {
+ c->orthoSize = value;
+ }
+ break;
+ case AnimTargetField::CustomField:
+ default:
+ break;
+ }
+}
+
+} // namespace esengine::animation
diff --git a/src/esengine/ecs/components/Transform.hpp b/src/esengine/ecs/components/Transform.hpp
index ae4804b30..14efaea23 100644
--- a/src/esengine/ecs/components/Transform.hpp
+++ b/src/esengine/ecs/components/Transform.hpp
@@ -38,13 +38,13 @@ namespace esengine::ecs {
*/
ES_COMPONENT()
struct Transform {
- ES_PROPERTY(animatable)
+ ES_PROPERTY(animatable, anim_override)
glm::vec3 position{0.0f, 0.0f, 0.0f};
- ES_PROPERTY(animatable)
+ ES_PROPERTY(animatable, anim_override)
glm::quat rotation{1.0f, 0.0f, 0.0f, 0.0f};
- ES_PROPERTY(animatable)
+ ES_PROPERTY(animatable, anim_override)
glm::vec3 scale{1.0f, 1.0f, 1.0f};
ES_PROPERTY()
diff --git a/tools/eht.py b/tools/eht.py
index abda90fe2..4bb17c017 100644
--- a/tools/eht.py
+++ b/tools/eht.py
@@ -912,9 +912,224 @@ class MetadataGenerator:
return '\n'.join(lines)
-# =============================================================================
-# Main
-# =============================================================================
+class AnimTargetGenerator:
+ """Generates animation target enum, apply function, and TS mappings."""
+
+ # Sub-component expansions per GLM type
+ VEC2_SUBS = [('x', 'x'), ('y', 'y')]
+ VEC3_SUBS = [('x', 'x'), ('y', 'y'), ('z', 'z')]
+ VEC4_COLOR_SUBS = [('r', 'r'), ('g', 'g'), ('b', 'b'), ('a', 'a')]
+ QUAT_SUBS = [('z', 'z')]
+
+ # UIRect anim_override flags per sub-component label
+ OVERRIDE_FLAGS = {
+ 'position': {'x': 'ANIM_POS_X', 'y': 'ANIM_POS_Y'},
+ 'scale': {'x': 'ANIM_SCALE_X', 'y': 'ANIM_SCALE_Y'},
+ 'rotation': {'z': 'ANIM_ROT_Z'},
+ }
+
+ def __init__(self, components: List[Component], enums: List[Enum]):
+ self.components = components
+ self.types = TypeSystem(enums)
+ self.entries: List[Dict] = []
+ self._collect()
+
+ def _collect(self):
+ for comp in self.components:
+ for prop in comp.properties:
+ if 'animatable' not in prop.annotations:
+ continue
+ t = self.types.clean_type(prop.cpp_type)
+ has_override = 'anim_override' in prop.annotations
+ is_color = any(pat in prop.name for pat in MetadataGenerator.COLOR_FIELD_PATTERNS)
+
+ if t == 'glm::vec2':
+ subs = self.VEC2_SUBS
+ elif t == 'glm::vec3':
+ subs = self.VEC3_SUBS
+ elif t == 'glm::vec4':
+ subs = self.VEC4_COLOR_SUBS if is_color else [('x', 'x'), ('y', 'y'), ('z', 'z'), ('w', 'w')]
+ elif t == 'glm::quat':
+ subs = self.QUAT_SUBS
+ else:
+ subs = [('', '')]
+
+ for sub_label, sub_member in subs:
+ enum_name = self._make_enum_name(comp.name, prop.name, sub_label)
+ field_path = f'{prop.name}.{sub_label}' if sub_label else prop.name
+ cpp_member = f'{prop.name}.{sub_member}' if sub_member else prop.name
+
+ override_flag = None
+ if has_override:
+ flags = self.OVERRIDE_FLAGS.get(prop.name, {})
+ override_flag = flags.get(sub_label)
+
+ self.entries.append({
+ 'enum_name': enum_name,
+ 'comp_name': comp.name,
+ 'field_path': field_path,
+ 'cpp_member': cpp_member,
+ 'cpp_type': t,
+ 'is_quat_z': t == 'glm::quat' and sub_label == 'z',
+ 'override_flag': override_flag,
+ })
+
+ @staticmethod
+ def _make_enum_name(comp: str, field: str, sub: str) -> str:
+ parts = [comp, field[0].upper() + field[1:]]
+ if sub:
+ parts.append(sub.upper())
+ return ''.join(parts)
+
+ def generate_hpp(self) -> str:
+ lines = [
+ '#pragma once',
+ '',
+ '#include "../core/Types.hpp"',
+ '#include "../ecs/Registry.hpp"',
+ ]
+
+ includes = set()
+ for e in self.entries:
+ includes.add(e['comp_name'])
+ for comp in self.components:
+ if comp.name in includes:
+ lines.append(f'#include "../ecs/components/{comp.name}.hpp"')
+ has_override = any(e['override_flag'] for e in self.entries)
+ if has_override:
+ lines.append('#include "../ecs/components/UIRect.hpp"')
+
+ lines.extend([
+ '',
+ '#include <glm/glm.hpp>',
+ '#include <cmath>',
+ '',
+ 'namespace esengine::animation {',
+ '',
+ ])
+
+ comp_names = []
+ seen_comps: Set[str] = set()
+ for e in self.entries:
+ if e['comp_name'] not in seen_comps:
+ seen_comps.add(e['comp_name'])
+ comp_names.append(e['comp_name'])
+
+ lines.append('enum class AnimTargetComponent : u8 {')
+ for i, name in enumerate(comp_names):
+ lines.append(f' {name} = {i},')
+ lines.extend([
+ f' Custom = {len(comp_names)},',
+ ' COUNT',
+ '};',
+ '',
+ 'enum class AnimTargetField : u8 {',
+ ])
+
+ for i, e in enumerate(self.entries):
+ lines.append(f' {e["enum_name"]} = {i},')
+
+ lines.extend([
+ f' CustomField = {len(self.entries)},',
+ ' COUNT',
+ '};',
+ '',
+ 'inline void applyAnimatedValue(',
+ ' ecs::Registry& registry, Entity entity,',
+ ' AnimTargetField field, f32 value)',
+ '{',
+ ' switch (field) {',
+ ])
+
+ for e in self.entries:
+ lines.append(f' case AnimTargetField::{e["enum_name"]}:')
+ comp_cpp = f'ecs::{e["comp_name"]}'
+ if e['is_quat_z']:
+ lines.append(f' if (auto* c = registry.tryGet<{comp_cpp}>(entity)) {{')
+ lines.append(' f32 h = value * 0.5f;')
+ lines.append(f' c->{e["cpp_member"].rsplit(".", 1)[0]} = glm::quat(std::cos(h), 0.0f, 0.0f, std::sin(h));')
+ if e['override_flag']:
+ lines.append(f' if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= ecs::UIRect::{e["override_flag"]};')
+ lines.append(' }')
+ else:
+ lines.append(f' if (auto* c = registry.tryGet<{comp_cpp}>(entity)) {{')
+ lines.append(f' c->{e["cpp_member"]} = value;')
+ if e['override_flag']:
+ lines.append(f' if (auto* r = registry.tryGet<ecs::UIRect>(entity)) r->anim_override_ |= ecs::UIRect::{e["override_flag"]};')
+ lines.append(' }')
+ lines.append(' break;')
+
+ lines.extend([
+ ' case AnimTargetField::CustomField:',
+ ' default:',
+ ' break;',
+ ' }',
+ '}',
+ '',
+ '} // namespace esengine::animation',
+ '',
+ ])
+ return '\n'.join(lines)
+
+ def generate_ts(self) -> str:
+ lines = [
+ '/**',
+ ' * @file animTargets.generated.ts',
+ ' * @brief Auto-generated animation target mappings',
+ ' * @details Generated by EHT - DO NOT EDIT',
+ ' */',
+ '',
+ 'export enum AnimTargetField {',
+ ]
+
+ for i, e in enumerate(self.entries):
+ lines.append(f' {e["enum_name"]} = {i},')
+
+ lines.extend([
+ f' CustomField = {len(self.entries)},',
+ '}',
+ '',
+ 'export enum AnimTargetComponent {',
+ ])
+
+ comp_names = []
+ seen = set()
+ for e in self.entries:
+ if e['comp_name'] not in seen:
+ seen.add(e['comp_name'])
+ comp_names.append(e['comp_name'])
+ for i, name in enumerate(comp_names):
+ lines.append(f' {name} = {i},')
+ lines.extend([
+ f' Custom = {len(comp_names)},',
+ '}',
+ '',
+ 'export const FIELD_MAP: Record<string, Record<string, AnimTargetField>> = {',
+ ])
+
+ by_comp: Dict[str, List[Dict]] = {}
+ for e in self.entries:
+ by_comp.setdefault(e['comp_name'], []).append(e)
+
+ for comp_name, entries in by_comp.items():
+ lines.append(f' {comp_name}: {{')
+ for e in entries:
+ lines.append(f" '{e['field_path']}': AnimTargetField.{e['enum_name']},")
+ lines.append(' },')
+
+ lines.extend([
+ '};',
+ '',
+ 'export const COMPONENT_MAP: Record<string, AnimTargetComponent> = {',
+ ])
+ for name in comp_names:
+ lines.append(f' {name}: AnimTargetComponent.{name},')
+ lines.extend([
+ '};',
+ '',
+ ])
+ return '\n'.join(lines)
+
def main():
parser = argparse.ArgumentParser(description='EHT - ESEngine Header Tool')
@@ -973,6 +1188,17 @@ def main():
print(f"Generating: {meta_path}")
meta_path.write_text(meta_content, encoding='utf-8')
+ anim_gen = AnimTargetGenerator(cpp_parser.components, cpp_parser.enums)
+
+ anim_hpp_path = Path('src/esengine/animation') / 'animTargets.generated.hpp'
+ print(f"Generating: {anim_hpp_path}")
+ anim_hpp_path.write_text(anim_gen.generate_hpp(), encoding='utf-8')
+
+ anim_ts_path = args.ts_output / 'src' / 'timeline' / 'animTargets.generated.ts'
+ if anim_ts_path.parent.exists():
+ print(f"Generating: {anim_ts_path}")
+ anim_ts_path.write_text(anim_gen.generate_ts(), encoding='utf-8')
+
print("[OK] Done!")
return 0