shaders now work

MaysLastPlaysThings · Oct 3, 2024 · 03e869d · 03e869d
1 parent d093e0a
commit 03e869d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 28 deletions.
diff --git a/assets/shared/data/expurgation/14a972af-27a4-4d21-8f15-dda6d74d1bc0_ac5060b7.webp b/assets/shared/data/expurgation/14a972af-27a4-4d21-8f15-dda6d74d1bc0_ac5060b7.webp
diff --git a/source/backend/Mods.hx b/source/backend/Mods.hx
@@ -93,7 +93,7 @@ class Mods
 	{
 		var foldersToCheck:Array<String> = [];
 		#if sys
-		if(FileSystem.exists(path + fileToFind))
+		if(openfl.utils.Assets.exists(path + fileToFind))
 		#end
 			foldersToCheck.push(path + fileToFind);
 

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -3710,40 +3710,47 @@ class PlayState extends MusicBeatState
 			return true;
 		}
 
-    for (folder in Assets.list().filter(file -> file.contains('assets/shared/shaders/'))) {
-			var frag:String = folder + name + '.frag';
-			var vert:String = folder + name + '.vert';
-			var found:Bool = false;
-			if(Assets.exists(frag))
-			{
-				frag = Assets.getText(frag);
-				found = true;
-			}
-			else frag = null;
+	//	for (folder in Assets.list().filter(file -> file.contains('assets/shared/shaders/'))) {
 
-			if(Assets.exists(vert))
+		var foldersToCheck:Array<String> = [Paths.getSharedPath('shaders/')]; // cheese burguer
+		for (folder in foldersToCheck)
+		{
+			for (file in Assets.list()) 
 			{
-				vert = Assets.getText(vert);
-				found = true;
-			}
-			else vert = null;
 
-			if(found)
-			{
-				runtimeShaders.set(name, [frag, vert]);
-				//trace('Found shader $name!');
-				return true;
-			}
-		}
+			   var frag:String = folder + name + '.frag';
+			   var vert:String = folder + name + '.vert';
+			   var found:Bool = false;
+			   if(Assets.exists(frag))
+			   {
+				  frag = Assets.getText(frag);
+				  found = true;
+			   }
+			   else frag = null;
+
+			   if(Assets.exists(vert))
+			   {
+				  vert = Assets.getText(vert);
+				  found = true;
+			   }
+			   else vert = null;
+
+			   if(found)
+			   {
+				 runtimeShaders.set(name, [frag, vert]);
+				 return true;
+			   }
+		  }   
+	   }
 			#if (LUA_ALLOWED || HSCRIPT_ALLOWED)
 			addTextToDebug('Missing shader $name .frag AND .vert files!', FlxColor.RED);
 			#else
 			FlxG.log.warn('Missing shader $name .frag AND .vert files!');
 			#end
-		#else
-		FlxG.log.warn('This platform doesn\'t support Runtime Shaders!');
-		#end
-		return false;
-	}
+	     	#else
+		    FlxG.log.warn('This platform doesn\'t support Runtime Shaders!');
+		    #end
+		        return false;
+	     }
 	#end
 }