From 8eef111021d6470c8d604f9f57ca0cf44edbc5be Mon Sep 17 00:00:00 2001 From: Eric Myllyoja Date: Tue, 1 Mar 2022 20:57:05 -0500 Subject: [PATCH] Fixed shaders on schoolEvil --- source/PlayState.hx | 8 ++------ source/shaderslmfao/WiggleEffect.hx | 11 ++++++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 72a6de6cc..9b3d607bb 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1,5 +1,6 @@ package; +import shaderslmfao.WiggleEffect; import play.stage.StageData; import play.stage.Stage; import Note; @@ -571,12 +572,7 @@ class PlayState extends MusicBeatState // evilTrail.changeValuesEnabled(false, false, false, false); // evilTrail.changeGraphic() add(evilTrail); - // evilTrail.scrollFactor.set(1.1, 1.1); - - boyfriend.x += 200; - boyfriend.y += 220; - gf.x += 180; - gf.y += 300; + // evilTrail.scrollFactor.set(1.1, 1.1); case "tank": gf.y += 10; gf.x -= 30; diff --git a/source/shaderslmfao/WiggleEffect.hx b/source/shaderslmfao/WiggleEffect.hx index 9d58c591f..ad0438b9b 100644 --- a/source/shaderslmfao/WiggleEffect.hx +++ b/source/shaderslmfao/WiggleEffect.hx @@ -20,9 +20,13 @@ class WiggleEffect public var waveFrequency(default, set):Float = 0; public var waveAmplitude(default, set):Float = 0; - public function new():Void + public function new(speed:Float, freq:Float, amplitude:Float, effect:WiggleEffectType = DREAMY):Void { shader.uTime.value = [0]; + this.waveSpeed = speed; + this.waveFrequency = freq; + this.waveAmplitude = amplitude; + this.effectType = effect; } public function update(elapsed:Float):Void @@ -57,6 +61,11 @@ class WiggleEffect shader.uWaveAmplitude.value = [waveAmplitude]; return v; } + + function toString() + { + return 'WiggleEffect(${shader.uTime.value[0]})'; + } } class WiggleShader extends FlxShader