Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

works on windows now

Browse source
This commit is contained in:
Seth Alves 2016-03-29 13:39:35 -07:00
parent 3aa1090ced
commit 0c72ca1be3
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -216,7 +216,7 @@ QVariantList ScriptEngines::getRunning() {
static const QString SETTINGS_KEY = "Settings";
void ScriptEngines::loadDefaultScripts() {
loadScript(defaultScriptsLocation() + "/defaultScripts.js");
loadScript(defaultScriptsLocation() + "/scripts/defaultScripts.js");
}
void ScriptEngines::loadOneScript(const QString& scriptFilename) {

14
libraries/script-engine/src/ScriptsModel.cpp
View file

@ -158,13 +158,13 @@ void ScriptsModel::requestDefaultFiles(QString marker) {
QUrl url(defaultScriptsLocation());
if (url.isLocalFile()) {
// QDirIterator it(url.toLocalFile(), QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories);
// while (it.hasNext()) {
// QString jsFile = it.next();;
// _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()),
// defaultScriptsLocation() + "/" + jsFile,
// SCRIPT_ORIGIN_DEFAULT));
// }
QString localDir = url.toLocalFile() + "/scripts";
QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories);
while (it.hasNext()) {
QString jsFullPath = it.next();
QString jsPartialPath = jsFullPath.mid(localDir.length() + 1); // + 1 to skip a separator
_treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath, SCRIPT_ORIGIN_DEFAULT));
}
} else {
QUrlQuery query;
query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);

7
libraries/shared/src/PathUtils.cpp
View file

@ -56,11 +56,10 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector<QSt
QString defaultScriptsLocation() {
#ifdef Q_OS_WIN
// return "file:///" + QCoreApplication::applicationDirPath() + "/scripts";
return "http://s3.amazonaws.com/hifi-public/scripts";
return "file:///" + QCoreApplication::applicationDirPath();
#elif defined(Q_OS_OSX)
return "file:///" + QCoreApplication::applicationDirPath() + "/../../scripts";
return "file:///" + QCoreApplication::applicationDirPath() + "/../..";
#else
return "http://s3.amazonaws.com/hifi-public/scripts";
return "http://s3.amazonaws.com/hifi-public";
#endif
}