From e42697007bdab07c637e4f0ba2297d2a70824734 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 5 Mar 2017 14:05:01 -0500 Subject: [PATCH] v0.6.0: improved fade in an out effects on title scene --- .../shatteredpixeldungeon/scenes/TitleScene.java | 3 ++- .../shatteredpixeldungeon/scenes/WelcomeScene.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 7a15a20e2..3827e3245 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -83,7 +83,8 @@ public class TitleScene extends PixelScene { @Override public void update() { super.update(); - am = (float)Math.sin( -(time += Game.elapsed) ); + am = Math.max(0f, (float)Math.sin( time += Game.elapsed )); + if (time >= 1.5f*Math.PI) time = 0; } @Override public void draw() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index d5549a428..0182f3e3f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -79,7 +79,8 @@ public class WelcomeScene extends PixelScene { @Override public void update() { super.update(); - am = (float)Math.sin( -(time += Game.elapsed) ); + am = Math.max(0f, (float)Math.sin( time += Game.elapsed )); + if (time >= 1.5f*Math.PI) time = 0; } @Override public void draw() {