gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed fonts + more customizable stuff

Browse Source
This commit is contained in:
Yoshman29
2022-12-03 17:05:57 +01:00
parent 1fc8ce3df2
commit efccfa37ac
6 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/system/Main.hx
+7 -3
View File
@@ -125,14 +125,18 @@ class Main extends Sprite
#if sys
if (Sys.args().contains("-livereload")) {
#if USE_SOURCE_ASSETS
trace("Used lime test windows. Switching into source assets.");
ModsFolder.loadLibraryFromFolder('sourceassets', './../../../../assets/');
@:privateAccess
Paths.__useSourceAssets = true;
ModsFolder.loadLibraryFromFolder('default', './../../../../assets/', true, true);
#end
var buildNum:Int = Std.parseInt(File.getContent("./../../../../buildnumber.txt"));
buildNum++;
File.saveContent("./../../../../buildnumber.txt", Std.string(buildNum));
} else {
#if USE_ADAPTED_ASSETS
ModsFolder.loadLibraryFromFolder('default', './assets/', true, true);
#end
}
#end
source/funkin/system/Paths.hx
+5 -6
View File
@@ -18,7 +18,6 @@ class Paths
* Currently is set to `mp3` for web targets, and `ogg` for other targets.
*/
inline public static var SOUND_EXT = #if web "mp3" #else "ogg" #end;
private static var __useSourceAssets = false;
public static function getPath(file:String, type:AssetType, library:Null<String>, skipModsVerification:Bool = false)
{
@@ -32,16 +31,16 @@ class Paths
if (library != null)
return getLibraryPath(file, library);
return getPreloadPath(file);
return getAssetsPath(file);
}
static public function video(key:String) {
return getPath('videos/$key.mp4', BINARY, null);
}
static public function getLibraryPath(file:String, library = "preload")
static public function getLibraryPath(file:String, library = "default")
{
return if (library == "preload" || library == "default") getPreloadPath(file); else getLibraryPathForce(file, library);
return if (library == "preload" || library == "default") getAssetsPath(file); else getLibraryPathForce(file, library);
}
inline static function getLibraryPathForce(file:String, library:String)
@@ -50,9 +49,9 @@ class Paths
return '$library:assets/$library/$file';
}
inline static function getPreloadPath(file:String)
inline static function getAssetsPath(file:String)
{
return (__useSourceAssets) ? getLibraryPathForce(file, 'sourceassets') : 'assets/$file';
return 'assets/$file';
}
inline static public function file(file:String, type:AssetType = TEXT, ?library:String)