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
6363 _scriptName(),
6464 _fileNameString(fileNameString),
6565 _quatLibrary(),
66− _vec3Library()
66+ _vec3Library(),
67+ _uuidLibrary()
6768 {
6869 }
6970
@@ -86,7 +87,8 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, · 16 unmodified lines
8687 _scriptName(),
8788 _fileNameString(),
8889 _quatLibrary(),
89− _vec3Library()
90+ _vec3Library(),
91+ _uuidLibrary()
9092 {
9193 QString scriptURLString = scriptURL.toString();
9294 _fileNameString = scriptURLString;
@@ -200,6 +202,7 @@ void ScriptEngine::init() { · 107 unmodified lines
200202 registerGlobalObject("Particles", &_particlesScriptingInterface);
201203 registerGlobalObject("Quat", &_quatLibrary);
202204 registerGlobalObject("Vec3", &_vec3Library);
205+ registerGlobalObject("Uuid", &_uuidLibrary);
203206
204207 registerGlobalObject("Voxels", &_voxelsScriptingInterface);
205208