mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-04 10:34:01 +00:00
Code Issues Releases Wiki Activity

Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental

Browse source
This commit is contained in:
fgenesis 2013-06-11 08:05:32 +01:00
commit ab019252bc
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Aquaria/ScriptInterface.cpp
View file

@ -865,6 +865,12 @@ luaFunc(obj_alphaMod)
luaReturnNil() luaReturnNil()
} }
luaFunc(obj_getAlphaMod)
{
RenderObject *r = robj(L);
luaReturnNum(r ? r->alphaMod : 0.0f);
}
luaFunc(obj_getAlpha) luaFunc(obj_getAlpha)
{ {
RenderObject *r = robj(L); RenderObject *r = robj(L);
@ -883,6 +889,16 @@ luaFunc(obj_color)
luaReturnNil(); luaReturnNil();
} }
luaFunc(obj_getColor)
{
RenderObject *r = robj(L);
Vector c;
if(r)
c = r->color;
luaReturnVec3(c.x, c.y, c.z);
}
luaFunc(obj_rotate) luaFunc(obj_rotate)
{ {
RenderObject *r = robj(L); RenderObject *r = robj(L);
@ -1535,7 +1551,9 @@ luaFunc(quad_setSegs)
RO_FUNC(getter, prefix, alpha ) \ RO_FUNC(getter, prefix, alpha ) \
RO_FUNC(getter, prefix, alphaMod ) \ RO_FUNC(getter, prefix, alphaMod ) \
RO_FUNC(getter, prefix, getAlpha ) \ RO_FUNC(getter, prefix, getAlpha ) \
RO_FUNC(getter, prefix, getAlphaMod ) \
RO_FUNC(getter, prefix, color ) \ RO_FUNC(getter, prefix, color ) \
RO_FUNC(getter, prefix, getColor ) \
RO_FUNC(getter, prefix, rotate ) \ RO_FUNC(getter, prefix, rotate ) \
RO_FUNC(getter, prefix, rotateOffset ) \ RO_FUNC(getter, prefix, rotateOffset ) \
RO_FUNC(getter, prefix, getRotation ) \ RO_FUNC(getter, prefix, getRotation ) \
@ -2761,13 +2779,13 @@ luaFunc(avatar_canBurst)
luaFunc(avatar_setCanLockToWall) luaFunc(avatar_setCanLockToWall)
{ {
dsq->game->avatar->setCanBurst(getBool(L, 1)); dsq->game->avatar->setCanLockToWall(getBool(L, 1));
luaReturnNil(); luaReturnNil();
} }
luaFunc(avatar_canLockToWall) luaFunc(avatar_canLockToWall)
{ {
luaReturnBool(dsq->game->avatar->canBurst()); luaReturnBool(dsq->game->avatar->canLockToWall());
} }
luaFunc(avatar_setCanSwimAgainstCurrents) luaFunc(avatar_setCanSwimAgainstCurrents)