mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

add 3 new Lua functions:

Browse source 
entity_getAnimationLoop()
entity_getAnimLayerTimeMult()
obj_getLayer()
This commit is contained in:
fgenesis 2013-02-03 16:13:54 +01:00
parent 76c31f8147
commit 188469102b
1 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Aquaria/ScriptInterface.cpp
View file

@ -1261,6 +1261,12 @@ luaFunc(obj_setLayer)
luaReturnNil(); luaReturnNil();
} }
luaFunc(obj_getLayer)
{
RenderObject *r = robj(L);
luaReturnInt(r ? r->layer : 0);
}
luaFunc(obj_setRenderPass) luaFunc(obj_setRenderPass)
{ {
RenderObject *r = robj(L); RenderObject *r = robj(L);
@ -1538,6 +1544,7 @@ luaFunc(quad_setSegs)
RO_FUNC(getter, prefix, moveToFront ) \ RO_FUNC(getter, prefix, moveToFront ) \
RO_FUNC(getter, prefix, moveToBack ) \ RO_FUNC(getter, prefix, moveToBack ) \
RO_FUNC(getter, prefix, setLayer ) \ RO_FUNC(getter, prefix, setLayer ) \
RO_FUNC(getter, prefix, getLayer ) \
RO_FUNC(getter, prefix, setRenderBeforeParent) \ RO_FUNC(getter, prefix, setRenderBeforeParent) \
RO_FUNC(getter, prefix, addChild ) \ RO_FUNC(getter, prefix, addChild ) \
RO_FUNC(getter, prefix, fh ) \ RO_FUNC(getter, prefix, fh ) \
@ -3344,6 +3351,21 @@ luaFunc(entity_setAnimLayerTimeMult)
luaReturnNum(t); luaReturnNum(t);
} }
luaFunc(entity_getAnimLayerTimeMult)
{
Entity *e = entity(L);
float t = 0;
if (e)
{
AnimationLayer *l = e->skeletalSprite.getAnimationLayer(lua_tointeger(L, 2));
if (l)
{
t = l->timeMultiplier.x;
}
}
luaReturnNum(t);
}
luaFunc(entity_animate) luaFunc(entity_animate)
{ {
SkeletalSprite *skel = getSkeletalSprite(entity(L)); SkeletalSprite *skel = getSkeletalSprite(entity(L));
@ -3372,6 +3394,19 @@ luaFunc(entity_stopAnimation)
luaReturnNil(); luaReturnNil();
} }
luaFunc(entity_getAnimationLoop)
{
int loop = 0;
SkeletalSprite *skel = getSkeletalSprite(entity(L));
if (skel)
{
AnimationLayer *animlayer = skel->getAnimationLayer(lua_tointeger(L, 2));
if (animlayer)
loop = animlayer->loop ? animlayer->loop : animlayer->enqueuedAnimationLoop;
}
luaReturnInt(loop);
}
// entity, x, y, time, ease, relative // entity, x, y, time, ease, relative
luaFunc(entity_move) luaFunc(entity_move)
{ {
@ -7589,7 +7624,9 @@ static const struct {
luaRegister(entity_doCollisionAvoidance), luaRegister(entity_doCollisionAvoidance),
luaRegister(entity_animate), luaRegister(entity_animate),
luaRegister(entity_setAnimLayerTimeMult), luaRegister(entity_setAnimLayerTimeMult),
luaRegister(entity_getAnimLayerTimeMult),
luaRegister(entity_stopAnimation), luaRegister(entity_stopAnimation),
luaRegister(entity_getAnimationLoop),
luaRegister(entity_setCurrentTarget), luaRegister(entity_setCurrentTarget),
luaRegister(entity_stopInterpolating), luaRegister(entity_stopInterpolating),
@ -8776,11 +8813,6 @@ static const struct {
luaConstant(ANIMLAYER_ARMOVERRIDE), luaConstant(ANIMLAYER_ARMOVERRIDE),
luaConstant(ANIMLAYER_UPPERBODYIDLE), luaConstant(ANIMLAYER_UPPERBODYIDLE),
luaConstant(ANIMLAYER_HEADOVERRIDE), luaConstant(ANIMLAYER_HEADOVERRIDE),
luaConstantFromClass(ANIM_NONE, Bone),
luaConstantFromClass(ANIM_POS, Bone),
luaConstantFromClass(ANIM_ROT, Bone),
luaConstantFromClass(ANIM_ALL, Bone),
}; };
//============================================================================================ //============================================================================================