History

More work on animation loading.

Andrzej Kapolka committed 12 years ago

Commit 8cbad1b1 parent 38c0e998 files · +117 −2Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−0
@@ -180,11 +180,13 @@ void ScriptEngine::init() { · 179 unmodified lines
180 registerVoxelMetaTypes(&_engine);180 registerVoxelMetaTypes(&_engine);
181 registerEventTypes(&_engine);181 registerEventTypes(&_engine);
182 registerMenuItemProperties(&_engine);182 registerMenuItemProperties(&_engine);
183 registerAnimationTypes(&_engine);
183 184
184 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);185 qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
185 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);186 qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);
186 qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);187 qScriptRegisterSequenceMetaType<QVector<ParticleID> >(&_engine);
187 qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(&_engine);188 qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(&_engine);
189 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);
188 qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine);190 qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine);
189 191
190 QScriptValue soundConstructorValue = _engine.newFunction(soundConstructor);192 QScriptValue soundConstructorValue = _engine.newFunction(soundConstructor);