Path handling fixes

ZILtoid1991 · Feb 11, 2024 · e70b45b · e70b45b
1 parent 5f72dc5
commit e70b45b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/pixelperfectengine/src/pixelperfectengine/audio/base/config.d b/pixelperfectengine/src/pixelperfectengine/audio/base/config.d
@@ -4,6 +4,7 @@ import sdlang;
 
 import pixelperfectengine.audio.base.handler;
 import pixelperfectengine.audio.base.modulebase;
+import pixelperfectengine.system.file : getPathToAsset;
 
 import collections.commons : defaultHash;
 
@@ -262,6 +263,7 @@ public class ModuleConfig {
 	 */
 	protected void loadAudioFile(AudioModule mod, int waveID, string path, string dataPak = null) {
 		import std.path : extension;
+		path = getPathToAsset(path);
 		switch (extension(path)) {
 			case ".wav":
 				loadWaveFile(mod, waveID, path, dataPak);

diff --git a/pixelperfectengine/src/pixelperfectengine/system/config.d b/pixelperfectengine/src/pixelperfectengine/system/config.d
@@ -14,6 +14,7 @@ import std.conv;
 //import std.csv;
 
 import pixelperfectengine.system.input.handler;
+import pixelperfectengine.system.file;
 import pixelperfectengine.system.exc;
 import pixelperfectengine.system.etc;
 import pixelperfectengine.system.dictionary;
@@ -88,7 +89,7 @@ public class ConfigurationProfile {
 	public this() {
 		path = vaultPath ~ "config.sdl";
 		if(!exists(path))
-			std.file.copy("../system/defaultConfig.sdl",path);			
+			std.file.copy(getPathToAsset("%PATH%/system/defaultConfig.sdl"),path);			
 		restore();
 	}
 	/// Initializes a basic configuration profile with user supplied values. 
@@ -108,8 +109,8 @@ public class ConfigurationProfile {
 		devicetypeStrings = [Devicetype.Joystick: "joystick", Devicetype.Keyboard: "keyboard", Devicetype.Mouse: "mouse",
 				Devicetype.Touchscreen: "touchscreen" ];
 		//keyNameDict = new Dictionary("../system/keycodeNamings.sdl");
-		keyNameDict = new Dictionary(parseFile("../system/scancodes.sdl"));
-		Tag xinput = parseFile("../system/xinputCodes.sdl");
+		keyNameDict = new Dictionary(parseFile(getPathToAsset("%PATH%/system/scancodes.sdl")));
+		Tag xinput = parseFile(getPathToAsset("%PATH%/system/xinputCodes.sdl"));
 		joyButtonNameDict = new Dictionary(xinput.expectTag("button"));
 		joyAxisNameDict = new Dictionary(xinput.expectTag("axis"));
 	}
@@ -401,8 +402,9 @@ public class ConfigurationProfile {
 	 * If ../_debug/ folder exists, it'll be used instead for emulation purposes.
 	 */
 	public static void setVaultPath(const char* developer, const char* application){
-		if (exists("../_debug/")) {
-			vaultPath = "../_debug/" ~ fromStringz(developer).idup ~ "_" ~ fromStringz(application).idup ~ "/";
+		if (exists(getPathToAsset("%PATH%/_debug/"))) {
+			vaultPath = getPathToAsset("%PATH%/_debug/") ~ "/" ~ fromStringz(developer).idup ~ "_" ~ 
+					fromStringz(application).idup ~ "/";
 			if (!std.file.exists(vaultPath))
 				std.file.mkdir(vaultPath);
 		} else {

diff --git a/pixelperfectengine/src/pixelperfectengine/system/file.d b/pixelperfectengine/src/pixelperfectengine/system/file.d
@@ -289,7 +289,6 @@ public string getPathToAsset (string path) @safe pure {
 	if (startsWith(path, "%PATH%")) path = path[6..$];
 	else if (startsWith(path, "../", "..\\")) path = path[3..$];
 	//else if (startsWith(path, ["./", ".\\"])) path = path[2..$];
-
 	return buildNormalizedPath(pathRoot ~ dirSeparator ~ path);
 }
 /**

diff --git a/test1/app.d b/test1/app.d
@@ -271,6 +271,7 @@ public class AudioDevKit : InputListener, SystemEventListener {
 			ih.test();
 			timer.test();
 		}
+		version (linux) midiIn.stop();
 		if (mm !is null) {
 			synchronized
 				writeln(mm.suspendAudioThread());

diff --git a/test3/app.d b/test3/app.d
@@ -42,7 +42,7 @@ public class TestElements : InputListener, SystemEventListener {
 		outScrn = new OutputScreen("Test nr. 3",1696,960);
 		mainRaster = new Raster(848,480,outScrn,0,1);
 		mainRaster.addLayer(sprtL,0);
-        mainRaster.loadPalette(loadPaletteFromFile(getPathToAsset("/system/ConcreteGUIE1.tga")));
+        mainRaster.loadPalette(loadPaletteFromFile(getPathToAsset("/system/concreteGUIE1.tga")));
         wh = new WindowHandler(1696,960,848,480,sprtL);
         ih = new InputHandler();
         ih.inputListener = this;