Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 06:17:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5711 from ZappoMan/fixEntityScriptIncludes

Browse source 
fix a bug in entity script includes and file based includes on windows
This commit is contained in:
Brad Davis 2015-09-03 21:21:42 -07:00
commit 0f70797ab4
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/script-engine/src/BatchLoader.cpp
View file

@ -58,11 +58,13 @@ void BatchLoader::start() {
connect(this, &QObject::destroyed, reply, &QObject::deleteLater); connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
} else { } else {
#ifdef _WIN32
QString fileName = url.toString();
#else
QString fileName = url.toLocalFile(); QString fileName = url.toLocalFile();
#endif
// sometimes on windows, we see the toLocalFile() return null,
// in this case we will attempt to simply use the url as a string
if (fileName.isEmpty()) {
fileName = url.toString();
}
qCDebug(scriptengine) << "Reading file at " << fileName; qCDebug(scriptengine) << "Reading file at " << fileName;

3
libraries/shared/src/RegisteredMetaTypes.cpp
View file

@ -26,8 +26,7 @@ static int quatMetaTypeId = qRegisterMetaType<glm::quat>();
static int xColorMetaTypeId = qRegisterMetaType<xColor>(); static int xColorMetaTypeId = qRegisterMetaType<xColor>();
static int pickRayMetaTypeId = qRegisterMetaType<PickRay>(); static int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
static int collisionMetaTypeId = qRegisterMetaType<Collision>(); static int collisionMetaTypeId = qRegisterMetaType<Collision>();
static int qMapURLStringMetaTypeId = qRegisterMetaType<QMap<QUrl,QString>>();
void registerMetaTypes(QScriptEngine* engine) { void registerMetaTypes(QScriptEngine* engine) {
qScriptRegisterMetaType(engine, vec4toScriptValue, vec4FromScriptValue); qScriptRegisterMetaType(engine, vec4toScriptValue, vec4FromScriptValue);