History

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

Stephen Birarda committed 12 years ago

Commit abddb962 parents 120001e 135f96a46 files · +2067 −894Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−3
@@ -116,6 +116,8 @@ void ScriptEngine::init() { · 115 unmodified lines
116116
117117 // register meta-type for glm::vec3 conversions
118118 registerMetaTypes(&_engine);
119+ qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
120+ qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
119121
120122 QScriptValue agentValue = _engine.newQObject(this);
121123 _engine.globalObject().setProperty("Agent", agentValue);
@@ -164,7 +166,6 @@ void ScriptEngine::evaluate() { · 42 unmodified lines
164166 }
165167
166168 QScriptValue result = _engine.evaluate(_scriptContents);
167− qDebug("Evaluated script.");
168169
169170 if (_engine.hasUncaughtException()) {
170171 int line = _engine.uncaughtExceptionLineNumber();
@@ -179,8 +180,6 @@ void ScriptEngine::run() { · 8 unmodified lines
179180 _isRunning = true;
180181
181182 QScriptValue result = _engine.evaluate(_scriptContents);
182− qDebug("Evaluated script");
183−
184183 if (_engine.hasUncaughtException()) {
185184 int line = _engine.uncaughtExceptionLineNumber();
186185 qDebug() << "Uncaught exception at line" << line << ":" << result.toString();