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

make any asset path relative to assets dir

Browse source
This commit is contained in:
Stephen Birarda 2016-02-11 15:49:13 -08:00
parent 8c2d69f865
commit 27d338e81c
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/assets/AssetServer.cpp
View file

@ -89,7 +89,7 @@ void AssetServer::completeSetup() {
if (assetsPath.isRelative()) { if (assetsPath.isRelative()) {
// if the domain settings passed us a relative path, make an absolute path that is relative to the // if the domain settings passed us a relative path, make an absolute path that is relative to the
// default data directory // default data directory
absoluteFilePath = ServerPathUtils::getDataFilePath(assetsPathString); absoluteFilePath = ServerPathUtils::getDataFilePath("assets/" + assetsPathString);
} }
_resourcesDirectory = QDir(absoluteFilePath); _resourcesDirectory = QDir(absoluteFilePath);

3
domain-server/resources/describe-settings.json
View file

@ -184,8 +184,7 @@
"type": "string", "type": "string",
"label": "Assets Path", "label": "Assets Path",
"help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.", "help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
"placeholder": "assets", "default": "",
"default": "assets",
"advanced": true "advanced": true
} }
] ]