History

Allow a script to set a resource override.

Brad Davis committed 10 years ago

Commit 07531351 parent a5c19c05 files · +66 −5Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−2
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include <EntityScriptingInterface.h>
2727 #include <MessagesClient.h>
2828 #include <NetworkAccessManager.h>
29+#include <ResourceScriptingInterface.h>
2930 #include <NodeList.h>
3031 #include <udt/PacketHeaders.h>
3132 #include <UUID.h>
@@ -391,7 +392,7 @@ void ScriptEngine::init() { · 359 unmodified lines
391392 registerGlobalObject("Recording", recordingInterface.data());
392393
393394 registerGlobalObject("Assets", &_assetScriptingInterface);
394−
395+ registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());
395396 }
396397
397398 void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {
@@ -1296,4 +1297,4 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS · 898 unmodified lines
12961297 entityScript.property(methodName).call(entityScript, args);
12971298 }
12981299 }
1299−}
1300+}