mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-18 18:54:58 +00:00
Code Issues Releases Wiki Activity

Move hair functions to Entity; add quad_setSegs() & obj_setRealRenderPass()

Browse source
This commit is contained in:
fgenesis 2013-01-03 00:36:24 +01:00
parent 366838d800
commit 32aca3b768
5 changed files with 85 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Aquaria/Entity.cpp
View file

@ -3096,3 +3096,39 @@ bool Entity::doCollisionAvoidance(float dt, int search, float mod, Vector *vp, i
return false;
}
void Entity::initHair(int numSegments, int segmentLength, int width, const std::string &tex)
{
if (hair)
{
errorLog("Trying to init hair when hair is already present");
}
hair = new Hair(numSegments, segmentLength, width);
hair->setTexture(tex);
dsq->game->addRenderObject(hair, layer);
}
void Entity::setHairHeadPosition(const Vector &pos)
{
if (hair)
{
hair->setHeadPosition(pos);
}
}
void Entity::updateHair(float dt)
{
if (hair)
{
hair->updatePositions();
}
}
void Entity::exertHairForce(const Vector &force, float dt)
{
if (hair)
{
hair->exertForce(force, dt);
}
}

5
Aquaria/Entity.h
View file

@ -481,6 +481,11 @@ public:
virtual bool canSetBoneLock();
void initHair(int numSegments, int segmentLength, int width, const std::string &tex);
void updateHair(float dt);
void setHairHeadPosition(const Vector &pos);
void exertHairForce(const Vector &force, float dt);
protected:
bool calledEntityDied;
Path *waterBubble;

68
Aquaria/ScriptInterface.cpp
View file

@ -1270,6 +1270,15 @@ luaFunc(obj_setRenderPass)
luaReturnNil();
}
luaFunc(obj_setRealRenderPass)
{
RenderObject *r = robj(L);
int pass = lua_tointeger(L, 2);
if (r)
r->setRenderPass(pass);
luaReturnNil();
}
luaFunc(obj_fh)
{
RenderObject *r = robj(L);
@ -1467,6 +1476,14 @@ luaFunc(quad_setHeight)
luaReturnNil();
}
luaFunc(quad_setSegs)
{
Quad *b = getQuad(L);
if (b)
b->setSegs(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5), lua_tonumber(L, 6), lua_tonumber(L, 7), lua_tonumber(L, 8), lua_tointeger(L, 9));
luaReturnNil();
}
// --- standard set/get functions for each type, wrapping RenderObject functions ---
@ -1544,6 +1561,7 @@ luaFunc(quad_setHeight)
RO_FUNC(getter, prefix, setCullRadius ) \
RO_FUNC(getter, prefix, setUpdateCull ) \
RO_FUNC(getter, prefix, setRenderPass ) \
RO_FUNC(getter, prefix, setRealRenderPass ) \
RO_FUNC(getter, prefix, setPositionX ) \
RO_FUNC(getter, prefix, setPositionY ) \
RO_FUNC(getter, prefix, enableMotionBlur ) \
@ -1558,7 +1576,8 @@ luaFunc(quad_setHeight)
Q_FUNC(getter, prefix, setVisible ) \
Q_FUNC(getter, prefix, isVisible ) \
Q_FUNC(getter, prefix, setWidth ) \
Q_FUNC(getter, prefix, setHeight )
Q_FUNC(getter, prefix, setHeight ) \
Q_FUNC(getter, prefix, setSegs )
// This should reflect the internal class hierarchy,
// e.g. a Beam is a Quad, so it can use quad_* functions
@ -1571,7 +1590,7 @@ luaFunc(quad_setHeight)
MAKE_ROBJ_FUNCS(getWeb, web ) \
MAKE_ROBJ_FUNCS(getText, text )
// first time, create them. (There is a second use of this further down, with differet MK_* macros)
// first time, create them. (There is a second use of this further down, with different MK_* macros)
EXPAND_FUNC_PROTOTYPES
@ -2839,22 +2858,6 @@ luaFunc(bone_lookAtEntity)
luaReturnNil();
}
luaFunc(bone_setSegs)
{
Bone *b = bone(L);
if (b)
b->setSegs(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5), lua_tonumber(L, 6), lua_tonumber(L, 7), lua_tonumber(L, 8), lua_tointeger(L, 9));
luaReturnNil();
}
luaFunc(entity_setSegs)
{
Entity *e = entity(L);
if (e)
e->setSegs(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tonumber(L, 4), lua_tonumber(L, 5), lua_tonumber(L, 6), lua_tonumber(L, 7), lua_tonumber(L, 8), lua_tointeger(L, 9));
luaReturnNil();
}
luaFunc(entity_resetTimer)
{
ScriptedEntity *se = scriptedEntity(L);
@ -6501,7 +6504,7 @@ luaFunc(entity_switchLayer)
// entity numSegments segmentLength width texture
luaFunc(entity_initHair)
{
ScriptedEntity *se = scriptedEntity(L);
Entity *se = entity(L);
if (se)
{
se->initHair(lua_tonumber(L, 2), lua_tonumber(L, 3), lua_tonumber(L, 4), getString(L, 5));
@ -6509,9 +6512,26 @@ luaFunc(entity_initHair)
luaReturnNil();
}
luaFunc(entity_getHair)
{
Entity *e = entity(L);
luaReturnPtr(e ? e->hair : NULL);
}
luaFunc(entity_clearHair)
{
Entity *e = entity(L);
if (e)
{
e->hair->safeKill();
e->hair = 0;
}
luaReturnNil();
}
luaFunc(entity_getHairPosition)
{
ScriptedEntity *se = scriptedEntity(L);
Entity *se = entity(L);
float x=0;
float y=0;
int idx = lua_tonumber(L, 2);
@ -6530,7 +6550,7 @@ luaFunc(entity_getHairPosition)
// entity x y z
luaFunc(entity_setHairHeadPosition)
{
ScriptedEntity *se = scriptedEntity(L);
Entity *se = entity(L);
if (se)
{
se->setHairHeadPosition(Vector(lua_tonumber(L, 2), lua_tonumber(L, 3)));
@ -6540,7 +6560,7 @@ luaFunc(entity_setHairHeadPosition)
luaFunc(entity_updateHair)
{
ScriptedEntity *se = scriptedEntity(L);
Entity *se = entity(L);
if (se)
{
se->updateHair(lua_tonumber(L, 2));
@ -7385,8 +7405,6 @@ static const struct {
luaRegister(entity_setTargetRange),
luaRegister(bone_addSegment),
luaRegister(entity_setSegs),
luaRegister(bone_setSegs),
luaRegister(bone_setSegmentOffset),
luaRegister(bone_setSegmentProps),
@ -7866,6 +7884,8 @@ static const struct {
luaRegister(entity_initHair),
luaRegister(entity_getHairPosition),
luaRegister(entity_getHair),
luaRegister(entity_clearHair),
luaRegister(entity_setHairHeadPosition),
luaRegister(entity_updateHair),

35
Aquaria/ScriptedEntity.cpp
View file

@ -180,41 +180,6 @@ void ScriptedEntity::registerNewPart(RenderObject *r, const std::string &name)
partMap[name] = r;
}
void ScriptedEntity::initHair(int numSegments, int segmentLength, int width, const std::string &tex)
{
if (hair)
{
errorLog("Trying to init hair when hair is already present");
}
hair = new Hair(numSegments, segmentLength, width);
hair->setTexture(tex);
dsq->game->addRenderObject(hair, layer);
}
void ScriptedEntity::setHairHeadPosition(const Vector &pos)
{
if (hair)
{
hair->setHeadPosition(pos);
}
}
void ScriptedEntity::updateHair(float dt)
{
if (hair)
{
hair->updatePositions();
}
}
void ScriptedEntity::exertHairForce(const Vector &force, float dt)
{
if (hair)
{
hair->exertForce(force, dt);
}
}
void ScriptedEntity::initSegments(int numSegments, int minDist, int maxDist, std::string bodyTex, std::string tailTex, int w, int h, float taper, bool reverseSegments)
{
this->reverseSegments = reverseSegments;

4
Aquaria/ScriptedEntity.h
View file

@ -38,7 +38,6 @@ public:
void setEntityLayer(int layer);
void setupEntity(const std::string &tex, int layer=0);
void setupBasicEntity(const std::string& texture, int health, int manaBall, int exp, int money, int collideRadius, int state, int w, int h, int expType, bool hitEntity, int updateCull, int layer);
void initHair(int numSegments, int segmentLength, int width, const std::string &tex);
void initSegments(int numSegments, int minDist, int maxDist, std::string bodyTex, std::string tailTex, int w, int h, float taper, bool reverseSegments);
void registerNewPart(RenderObject *r, const std::string &name);
typedef std::map<std::string, RenderObject*> PartMap;
@ -72,9 +71,6 @@ public:
bool isEntityInside();
void becomeSolid();
void updateHair(float dt);
void setHairHeadPosition(const Vector &pos);
void exertHairForce(const Vector &force, float dt);
std::string deathParticleEffect;
ParticleEffect pullEmitter;