History

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 assignment-client/src/scripts/EntityScriptServer.cpp (1 of 21 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+2−2
@@ -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
@@ -454,7 +454,7 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 383 unmodified lines
454 _entityViewer.getTree()->update();454 _entityViewer.getTree()->update();
455 });455 });
456 456
457 457 scriptEngines->runScriptInitializers(newEngine);
458 newEngine->runInThread();458 newEngine->runInThread();
459 auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);459 auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
460 DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);460 DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);