Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc

Kasen Plugin Infrastructure v½ Codename "Modkit Mini"

Shannon Romano committed 7 years ago

Commit 65d0bb12 parents 9784b9b 271fac425 files · +421 −64Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 25 files). Show all

Unified · Split

@@ -64,7 +64,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig · 63 unmodified lines
64	DependencyManager::set<ResourceScriptingInterface>();	64	DependencyManager::set<ResourceScriptingInterface>();
65		65
66	DependencyManager::set<ResourceManager>();	66	DependencyManager::set<ResourceManager>();
67	DependencyManager::set<PluginManager>();	67	DependencyManager::set<PluginManager>()->instantiate();
68		68
69	DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();	69	DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
70		70
@@ -462,7 +462,7 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 391 unmodified lines
462	_entityViewer.getTree()->update();	462	_entityViewer.getTree()->update();
463	});	463	});
464		464
465		465	scriptEngines->runScriptInitializers(newEngine);
466	newEngine->runInThread();	466	newEngine->runInThread();
467	auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);	467	auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
468	DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);	468	DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);