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

fix a bug in entity script includes and file based includes on windows

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-09-03 16:37:24 -07:00
parent a8b5336e02
commit 063320771c
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,11 +58,7 @@ 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
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);