Merge pull request #3121 from ZappoMan/animationFrameIndex

adds JavaScript API for getting the current animationDetails (state) for avatar animations

Clément Brisset committed 12 years ago

Commit 4798cad2 parents b8071d8 8755e2d8 files · +146 −0Browse files

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

Unified · Split

@@ -256,6 +256,8 @@ void ScriptEngine::init() { · 255 unmodified lines
256		256
257	qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);	257	qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);
258		258
		259	qScriptRegisterMetaType(&_engine, animationDetailsToScriptValue, animationDetailsFromScriptValue);
		260
259	registerGlobalObject("Script", this);	261	registerGlobalObject("Script", this);
260	registerGlobalObject("Audio", &_audioScriptingInterface);	262	registerGlobalObject("Audio", &_audioScriptingInterface);
261	registerGlobalObject("Controller", _controllerScriptingInterface);	263	registerGlobalObject("Controller", _controllerScriptingInterface);