History

Merge branch 'protocol_changes' into entityFading

HifiExperiments committed 1 year ago

Commit 14bb71e2 parents 5b03698 e6fbe9138 files · +1673 −141Browse files

Showing the changes to interface/src/Application_Setup.cpp (1 of 38 files). Show all

Unified · Split

interface/src/Application_Setup.cpp+11−0
@@ -86,6 +86,7 @@ · 85 unmodified lines
8686 #include <ResourceScriptingInterface.h>
8787 #include <SceneScriptingInterface.h>
8888 #include <ScriptEngines.h>
89+#include <ScriptEntityItem.h>
8990 #include <scripting/Audio.h>
9091 #include <scripting/AssetMappingsScriptingInterface.h>
9192 #include <scripting/ControllerScriptingInterface.h>
@@ -1669,6 +1670,16 @@ void Application::setupSignalsAndOperators() { · 1577 unmodified lines
16691670 return nullptr;
16701671 });
16711672
1673+ ScriptEntityItem::setLoadOrReloadScriptOperator([](const EntityItemID& entityID, const QString& oldScriptURL, const QString& newScriptURL) -> bool {
1674+ return DependencyManager::get<EntityTreeRenderer>()->checkAndCallPreload(entityID, true, true, oldScriptURL, newScriptURL);
1675+ });
1676+ ScriptEntityItem::setUnloadScriptOperator([](const EntityItemID& entityID, const QString& scriptURL) -> void {
1677+ DependencyManager::get<EntityTreeRenderer>()->unloadEntityScript(entityID, scriptURL);
1678+ });
1679+ EntityItem::setUpdateScriptUserDataOperator([](const EntityItemID& entityID, const QString& scriptURL, const QString& userData) -> void {
1680+ return DependencyManager::get<EntityTreeRenderer>()->updateScriptUserData(entityID, scriptURL, userData);
1681+ });
1682+
16721683 Procedural::opaqueStencil = [](gpu::StatePointer state, bool useAA) {
16731684 useAA ? PrepareStencil::testMaskDrawShape(*state) : PrepareStencil::testMaskDrawShapeNoAA(*state);
16741685 };