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
26#include <EntityScriptingInterface.h>26#include <EntityScriptingInterface.h>
27#include <MessagesClient.h>27#include <MessagesClient.h>
28#include <NetworkAccessManager.h>28#include <NetworkAccessManager.h>
29#include <ResourceScriptingInterface.h>
29#include <NodeList.h>30#include <NodeList.h>
30#include <udt/PacketHeaders.h>31#include <udt/PacketHeaders.h>
31#include <UUID.h>32#include <UUID.h>
@@ -391,7 +392,7 @@ void ScriptEngine::init() { · 359 unmodified lines
391 registerGlobalObject("Recording", recordingInterface.data());392 registerGlobalObject("Recording", recordingInterface.data());
392 393
393 registerGlobalObject("Assets", &_assetScriptingInterface);394 registerGlobalObject("Assets", &_assetScriptingInterface);
394 395 registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());
395}396}
396 397
397void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {398void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {
@@ -1296,4 +1297,4 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS · 898 unmodified lines
1296 entityScript.property(methodName).call(entityScript, args);1297 entityScript.property(methodName).call(entityScript, args);
1297 }1298 }
1298 }1299 }
1299}1300}