hook the DataServerScriptingInterface to the ScriptEngine

Stephen Birarda committed 12 years ago

Commit aa9f7ff1 parent e08f4d23 files · +12 −0Browse files

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

Unified · Split

@@ -119,6 +119,8 @@ void ScriptEngine::init() { · 118 unmodified lines
119	119
120	120	QScriptValue audioScriptingInterfaceValue = _engine.newQObject(&_audioScriptingInterface);
121	121	_engine.globalObject().setProperty("Audio", audioScriptingInterfaceValue);
	122	+
	123	+ registerGlobalObject("Data", &_dataServerScriptingInterface);
122	124
123	125	if (_controllerScriptingInterface) {
124	126	QScriptValue controllerScripterValue = _engine.newQObject(_controllerScriptingInterface);
@@ -140,6 +142,10 @@ void ScriptEngine::registerGlobalObject(const QString& name, QObject* object) { · 15 unmodified lines
140	142	_engine.globalObject().setProperty(name, value);
141	143	}
142	144
	145	+void ScriptEngine::preEvaluateReset() {
	146	+ _dataServerScriptingInterface.refreshUUID();
	147	+}
	148	+
143	149	void ScriptEngine::evaluate() {
144	150	if (!_isInitialized) {
145	151	init();