History

add access to Voxels and Particles inside of collision scripts

ZappoMan committed 12 years ago

Commit 8e6f9241 parent f4b28046 files · +84 −11Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 6 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+12−0
@@ -23,6 +23,9 @@ · 22 unmodified lines
2323 #include "ScriptEngine.h"
2424
2525 int ScriptEngine::_scriptNumber = 1;
26+VoxelScriptingInterface ScriptEngine::_voxelScriptingInterface;
27+ParticleScriptingInterface ScriptEngine::_particleScriptingInterface;
28+
2629
2730 ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems,
2831 const char* scriptMenuName, AbstractMenuInterface* menu,
@@ -43,6 +46,15 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, · 14 unmodified lines
4346 }
4447 _menu = menu;
4548 _controllerScriptingInterface = controllerScriptingInterface;
49+
50+ // hook up our interfaces
51+ if (!Particle::getVoxelsScriptingInterface()) {
52+ Particle::setVoxelsScriptingInterface(getVoxelScriptingInterface());
53+ }
54+
55+ if (!Particle::getParticlesScriptingInterface()) {
56+ Particle::setParticlesScriptingInterface(getParticleScriptingInterface());
57+ }
4658 }
4759
4860 ScriptEngine::~ScriptEngine() {