Merge pull request #47 from Yoshubs/revert-46-master

revert hayas thingies 1
SomeKitten · Sep 25, 2021 · a0d3301 · a0d3301
2 parents 47739a0 + 087d0c2
commit a0d3301
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/source/gameFolder/meta/shaders/PerspectiveShader.hx b/source/gameFolder/meta/shaders/PerspectiveShader.hx
@@ -2,7 +2,6 @@ package gameFolder.meta.shaders;
 
 import flixel.math.FlxAngle;
 import flixel.system.FlxAssets.FlxShader;
-import openfl.display.GraphicsShader;
 
 class PerspectiveHelper
 {
@@ -14,48 +13,48 @@ class PerspectiveHelper
 
 	public function new()
 	{
-		shader.data.rotX.value = [0];
-		shader.data.rotY.value = [0];
-		shader.data.skewX.value = [0];
-		shader.data.skewY.value = [0];
+		shader.rotX.value = [0];
+		shader.rotY.value = [0];
+		shader.skewX.value = [0];
+		shader.skewY.value = [0];
 	}
 
 	function set_rotX(value:Float):Float
 	{
 		rotX = value;
-		shader.data.rotX.value = [value * FlxAngle.TO_RAD];
+		shader.rotX.value = [value * FlxAngle.TO_RAD];
 
 		return value;
 	}
 
 	function set_rotY(value:Float):Float
 	{
 		rotY = value;
-		shader.data.rotY.value = [value * FlxAngle.TO_RAD];
+		shader.rotY.value = [value * FlxAngle.TO_RAD];
 
 		return value;
 	}
 
 	function set_skewX(value:Float):Float
 	{
 		skewX = value;
-		shader.data.skewX.value = [value * FlxAngle.TO_RAD];
+		shader.skewX.value = [value * FlxAngle.TO_RAD];
 
 		return value;
 	}
 
 	function set_skewY(value:Float):Float
 	{
 		skewY = value;
-		shader.data.skewY.value = [value * FlxAngle.TO_RAD];
+		shader.skewY.value = [value * FlxAngle.TO_RAD];
 
 		return value;
 	}
 }
 
-class PerspectiveShader extends GraphicsShader
+class PerspectiveShader extends FlxShader
 {
-	var frag = '
+	@:glFragmentSource('
         #pragma header
 
         uniform float rotX;
@@ -125,10 +124,9 @@ class PerspectiveShader extends GraphicsShader
             gl_FragColor = vec4(texture(bitmap, uv) + vec4(uv.x, uv.y, 0.0, 0.1) * 0.0);
             //gl_FragColor = vec4(uv.x, uv.y, 0.0, 1.0);
             }
-        }';
-
+        }')
 	public function new()
 	{
-		super("", frag);
+		super();
 	}
 }
diff --git a/source/gameFolder/meta/state/PlayState.hx b/source/gameFolder/meta/state/PlayState.hx
@@ -384,9 +384,9 @@ class PlayState extends MusicBeatState
 		// Uncomment the code below to apply the effect
 
 		/*
-			var shader:GraphicsShader = new GraphicsShader("", File.getContent("./assets/shaders/vhs.frag"));
-			FlxG.camera.setFilters([new ShaderFilter(shader)]);
-		 */
+		var shader:GraphicsShader = new GraphicsShader("", File.getContent("./assets/shaders/vhs.frag"));
+		FlxG.camera.setFilters([new ShaderFilter(shader)]);
+		*/
 	}
 
 	var staticDisplace:Int = 0;