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
23#include "ScriptEngine.h"23#include "ScriptEngine.h"
24 24
25int ScriptEngine::_scriptNumber = 1;25int ScriptEngine::_scriptNumber = 1;
26VoxelScriptingInterface ScriptEngine::_voxelScriptingInterface;
27ParticleScriptingInterface ScriptEngine::_particleScriptingInterface;
28
26 29
27ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems,30ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems,
28 const char* scriptMenuName, AbstractMenuInterface* menu,31 const char* scriptMenuName, AbstractMenuInterface* menu,
@@ -43,6 +46,15 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, · 14 unmodified lines
43 }46 }
44 _menu = menu;47 _menu = menu;
45 _controllerScriptingInterface = controllerScriptingInterface;48 _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 }
46}58}
47 59
48ScriptEngine::~ScriptEngine() {60ScriptEngine::~ScriptEngine() {