Completed implementation of WebSocket and WebSocketServer

Thijs Wenker committed 11 years ago

Commit e43dc3f1 parent 229b7ae5 files · +124 −37Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−0

@@ -361,6 +361,8 @@ void ScriptEngine::init() { · 360 unmodified lines
361	qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue);	361	qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue);
362	qScriptRegisterMetaType(this, avatarDataToScriptValue, avatarDataFromScriptValue);	362	qScriptRegisterMetaType(this, avatarDataToScriptValue, avatarDataFromScriptValue);
363	qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);	363	qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);
		364	qScriptRegisterMetaType(this, webSocketToScriptValue, webSocketFromScriptValue);
		365	qScriptRegisterMetaType(this, qWSCloseCodeToScriptValue, qWSCloseCodeFromScriptValue);
364		366
365	registerGlobalObject("Script", this);	367	registerGlobalObject("Script", this);
366	registerGlobalObject("Audio", &AudioScriptingInterface::getInstance());	368	registerGlobalObject("Audio", &AudioScriptingInterface::getInstance());