Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 00:47:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix EntityItemID not being converted to string in ScriptEngine

Browse source
This commit is contained in:
Ryan Huffman 2016-10-05 15:45:54 -07:00
parent 8e3f4b705f
commit df09254437
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -1307,7 +1307,7 @@ void ScriptEngine::loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const
// so that they show up in stacktraces // so that they show up in stacktraces
// //
// Extract the url portion of a url that has been encoded with encodeEntityIdIntoEntityUrl(...) // Extract the url portion of a url that has been encoded with encodeEntityIdIntoEntityUrl(...)
QString extractUrlFromEntityUrl(QString url) { QString extractUrlFromEntityUrl(const QString& url) {
auto parts = url.split(' ', QString::SkipEmptyParts); auto parts = url.split(' ', QString::SkipEmptyParts);
if (parts.length() > 0) { if (parts.length() > 0) {
return parts[0]; return parts[0];
@ -1318,7 +1318,7 @@ QString extractUrlFromEntityUrl(QString url) {
// Encode an entity id into an entity url // Encode an entity id into an entity url
// Example: http://www.example.com/some/path.js [EntityID:{9fdd355f-d226-4887-9484-44432d29520e}] // Example: http://www.example.com/some/path.js [EntityID:{9fdd355f-d226-4887-9484-44432d29520e}]
QString encodeEntityIdIntoEntityUrl(QString url, QString entityID) { QString encodeEntityIdIntoEntityUrl(const QString& url, const QString& entityID) {
return url + " [EntityID:" + entityID + "]"; return url + " [EntityID:" + entityID + "]";
} }
@ -1348,7 +1348,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
auto scriptCache = DependencyManager::get<ScriptCache>(); auto scriptCache = DependencyManager::get<ScriptCache>();
bool isFileUrl = isURL && scriptOrURL.startsWith("file://"); bool isFileUrl = isURL && scriptOrURL.startsWith("file://");
auto fileName = isURL ? encodeEntityIdIntoEntityUrl(scriptOrURL, entityID) : "EmbeddedEntityScript"; auto fileName = isURL ? encodeEntityIdIntoEntityUrl(scriptOrURL, entityID.toString()) : "EmbeddedEntityScript";
QScriptProgram program(contents, fileName); QScriptProgram program(contents, fileName);
if (!hasCorrectSyntax(program)) { if (!hasCorrectSyntax(program)) {