ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start work to control particle emitters from scripts, and allow getting kart velocity from script

Browse Source
This commit is contained in:
Marianne Gagnon 2015-06-28 19:00:25 -04:00
parent 08529e167f
commit 68eb4eb359
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/scriptengine/script_kart.cpp
View File

@ -100,7 +100,7 @@ namespace Scripting
} }
/** Sets the kart's velocity to the specified value. */ /** Sets the kart's velocity to the specified value. */
void setVelocity(int idKart, Vec3* position) void setVelocity(int idKart, SimpleVec3* position)
{ {
float x = position->getX(); float x = position->getX();
float y = position->getY(); float y = position->getY();
@ -110,6 +110,14 @@ namespace Scripting
kart->setVelocity(btVector3(x, y, z)); kart->setVelocity(btVector3(x, y, z));
} }
/** Gets the kart's velocity */
SimpleVec3 getVelocity(int idKart)
{
AbstractKart* kart = World::getWorld()->getKart(idKart);
btVector3 velocity = kart->getVelocity();
return SimpleVec3(velocity.getX(), velocity.getY(), velocity.getZ());
}
/** @}*/ /** @}*/
/** @}*/ /** @}*/
@ -122,6 +130,7 @@ namespace Scripting
r = engine->RegisterGlobalFunction("void setVelocity(int id, const Vec3 &in)", asFUNCTION(setVelocity), asCALL_CDECL); assert(r >= 0); r = engine->RegisterGlobalFunction("void setVelocity(int id, const Vec3 &in)", asFUNCTION(setVelocity), asCALL_CDECL); assert(r >= 0);
//r = engine->RegisterGlobalFunction("void jumpTo(int id, float x, float y)", asFUNCTION(jumpTo), asCALL_GENERIC); assert(r >= 0); //r = engine->RegisterGlobalFunction("void jumpTo(int id, float x, float y)", asFUNCTION(jumpTo), asCALL_GENERIC); assert(r >= 0);
r = engine->RegisterGlobalFunction("Vec3 getLocation(int id)", asFUNCTION(getLocation), asCALL_CDECL); assert(r >= 0); r = engine->RegisterGlobalFunction("Vec3 getLocation(int id)", asFUNCTION(getLocation), asCALL_CDECL); assert(r >= 0);
r = engine->RegisterGlobalFunction("Vec3 getVelocity(int id)", asFUNCTION(getVelocity), asCALL_CDECL); assert(r >= 0);
} }
void registerScriptEnums(asIScriptEngine *engine) void registerScriptEnums(asIScriptEngine *engine)

5
src/tracks/track_object_presentation.cpp
View File

@ -784,6 +784,9 @@ TrackObjectPresentationParticles::TrackObjectPresentationParticles(
xml_node.get("clip_distance", &clip_distance); xml_node.get("clip_distance", &clip_distance);
xml_node.get("conditions", &m_trigger_condition); xml_node.get("conditions", &m_trigger_condition);
bool auto_emit = true;
xml_node.get("auto_emit", &auto_emit);
try try
{ {
ParticleKind* kind = ParticleKindManager::get()->getParticles(path); ParticleKind* kind = ParticleKindManager::get()->getParticles(path);
@ -810,7 +813,7 @@ TrackObjectPresentationParticles::TrackObjectPresentationParticles(
m_emitter = emitter; m_emitter = emitter;
} }
if (m_trigger_condition.size() > 0) if (m_trigger_condition.size() > 0 || !auto_emit)
{ {
m_emitter->setCreationRateAbsolute(0.0f); m_emitter->setCreationRateAbsolute(0.0f);
} }