mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-06 15:35:04 +00:00
Code Issues Projects Releases Wiki Activity

added: allow specifying datadir in settings on runtime

Browse Source
This commit is contained in:
Arne Morten Kvarving
2018-10-04 16:33:47 +02:00
parent a282403cac
commit 7bf0a3f35d
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libprojectM/Renderer/TextureManager.cpp
View File

@ -29,7 +29,7 @@
#define NUM_BLUR_TEX 6
TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX, const int texsizeY):
TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX, const int texsizeY, std::string datadir):
presetsURL(_presetsURL)
{
extensions.push_back(".jpg");
@ -40,9 +40,11 @@ TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX
extensions.push_back(".dib");
Preload();
if (datadir.empty())
datadir = DATADIR_PATH;
loadTextureDir(std::string(DATADIR_PATH) + "/presets");
loadTextureDir(std::string(DATADIR_PATH) + "/textures");
loadTextureDir(datadir + "/presets");
loadTextureDir(datadir + "/textures");
loadTextureDir(_presetsURL);
// Create main texture ans associated samplers