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

Scripting work : improve flyable vs object collision callbacks. More work to do still.

Browse Source
This commit is contained in:
Marianne Gagnon 2015-05-31 18:09:51 -04:00
parent 40ea7f94f0
commit 8ef16c146e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/physics/physics.cpp
View File

@ -257,15 +257,17 @@ void Physics::update(float dt)
// Projectile hits physical object
// -------------------------------
Scripting::ScriptEngine* script_engine = World::getWorld()->getScriptEngine();
// TODO: pass arguments
//Scripting::Physics::setColl0ision(
// p->getUserPointer(1)->getPointerPhysicalObject()->getID(),
// "item"
//);
script_engine->runFunction("void onItemObjectCollision()");
p->getUserPointer(0)->getPointerFlyable()
->hit(NULL, p->getUserPointer(1)->getPointerPhysicalObject());
Flyable* flyable = p->getUserPointer(0)->getPointerFlyable();
PhysicalObject* obj = p->getUserPointer(1)->getPointerPhysicalObject();
std::string obj_id = obj->getID();
// TODO: attach this callback directly to a specific track object
script_engine->runFunction("void onItemObjectCollision(int, int, const string)",
[&](asIScriptContext* ctx) {
ctx->SetArgDWord(0, (int)flyable->getType());
ctx->SetArgDWord(1, flyable->getOwnerId());
ctx->SetArgObject(2, &obj_id);
});
flyable->hit(NULL, obj);
if (obj->isSoccerBall() &&
race_manager->getMinorMode() == RaceManager::MINOR_MODE_SOCCER)