modkit core changes initial commit whitespace corrections + warnings updated cmake plugin rework with focus on JS API integration example cleanup edit_filter scope separate-out edit_filter wantsScope stuff -plugin metadata split scriptengines out separately cleanup url/filename sets additional cleanup fix typo; consolidate ScriptInitializerMixin inits add more example API protoypes cleanup pass; fix entity_server / agent init fix whitespace remove technically unnessary plugin filtering +EDIT_FILTER_SCRIPT; cleanup reorder public/slot/private use std::count_if formatting better debug output; cleanup fix msvc compiler warning cleanup eradicate QtScript references from API Example updated header comments Updated KasenAPIExample

kasenvr committed 7 years ago

Commit e9e96071 parent de53b9b21 files · +302 −62Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+4−24

@@ -136,24 +136,6 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) { · 135 unmodified lines
136		136
137	QObject* scriptsModel();	137	QObject* scriptsModel();
138		138
139	bool NativeScriptInitializers::registerNativeScriptInitializer(NativeScriptInitializer initializer) {
140	return registerScriptInitializer([initializer](ScriptEnginePointer engine) {
141	initializer(qobject_cast<QScriptEngine*>(engine.data()));
142	});
143	}
144
145	bool NativeScriptInitializers::registerScriptInitializer(ScriptInitializer initializer) {
146	if (auto scriptEngines = DependencyManager::get<ScriptEngines>().data()) {
147	scriptEngines->registerScriptInitializer(initializer);
148	return true;
149	}
150	return false;
151	}
152
153	void ScriptEngines::registerScriptInitializer(ScriptInitializer initializer) {
154	_scriptInitializers.push_back(initializer);
155	}
156
157	void ScriptEngines::addScriptEngine(ScriptEnginePointer engine) {	139	void ScriptEngines::addScriptEngine(ScriptEnginePointer engine) {
158	if (!_isStopped) {	140	if (!_isStopped) {
159	QMutexLocker locker(&_allScriptsMutex);	141	QMutexLocker locker(&_allScriptsMutex);
@@ -559,12 +541,10 @@ void ScriptEngines::quitWhenFinished() { · 399 unmodified lines
559	}	541	}
560		542
561	int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {	543	int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {
562	int ii=0;	544	auto nativeCount = DependencyManager::get<ScriptInitializers>()->runScriptInitializers(scriptEngine.data());
563	for (auto initializer : _scriptInitializers) {	545	return nativeCount + std::count_if(_scriptInitializers.begin(), _scriptInitializers.end(),
564	ii++;	546	[scriptEngine](auto initializer){ initializer(scriptEngine); return true; }
565	initializer(scriptEngine);	547	);
566	}
567	return ii;
568	}	548	}
569		549
570	void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {	550	void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {