History

Merge branch 'master' of https://github.com/highfidelity/hifi

Stephen Birarda committed 12 years ago

Commit c208af22 parents 7dec499 49a965325 files · +462 −125Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−2
@@ -63,7 +63,8 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 62 unmodified lines
63 _scriptName(),63 _scriptName(),
64 _fileNameString(fileNameString),64 _fileNameString(fileNameString),
65 _quatLibrary(),65 _quatLibrary(),
66 _vec3Library()66 _vec3Library(),
67 _uuidLibrary()
67{68{
68}69}
69 70
@@ -86,7 +87,8 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 16 unmodified lines
86 _scriptName(),87 _scriptName(),
87 _fileNameString(),88 _fileNameString(),
88 _quatLibrary(),89 _quatLibrary(),
89 _vec3Library()90 _vec3Library(),
91 _uuidLibrary()
90{92{
91 QString scriptURLString = scriptURL.toString();93 QString scriptURLString = scriptURL.toString();
92 _fileNameString = scriptURLString;94 _fileNameString = scriptURLString;
@@ -200,6 +202,7 @@ void ScriptEngine::init() { · 107 unmodified lines
200 registerGlobalObject("Particles", &_particlesScriptingInterface);202 registerGlobalObject("Particles", &_particlesScriptingInterface);
201 registerGlobalObject("Quat", &_quatLibrary);203 registerGlobalObject("Quat", &_quatLibrary);
202 registerGlobalObject("Vec3", &_vec3Library);204 registerGlobalObject("Vec3", &_vec3Library);
205 registerGlobalObject("Uuid", &_uuidLibrary);
203 206
204 registerGlobalObject("Voxels", &_voxelsScriptingInterface);207 registerGlobalObject("Voxels", &_voxelsScriptingInterface);
205 208