diff --git a/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl b/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl
index 52b67c0..8aa6426 100644
--- a/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl
+++ b/app/build/intermediates/assets/debug/shader/entityFragmentShader.glsl
@@ -20,6 +20,7 @@ void main() {
vec2 texAtlasCoords = getTexCoordsInAtlas(clampedTexCoords, texAtlasIndex);
gl_FragColor = texture2D(texture, texAtlasCoords);
gl_FragColor.a = min(gl_FragColor.a, alpha);
+ gl_FragColor.rgb = gl_FragColor.rgb / gl_FragColor.a;
}
diff --git a/app/build/intermediates/assets/debug/shader/particleFragmentShader.glsl b/app/build/intermediates/assets/debug/shader/particleFragmentShader.glsl
index 9ee3829..b4d9426 100644
--- a/app/build/intermediates/assets/debug/shader/particleFragmentShader.glsl
+++ b/app/build/intermediates/assets/debug/shader/particleFragmentShader.glsl
@@ -11,7 +11,9 @@ vec3 saturateColor(in vec3 color, in float a);
void main() {
float a = texture2D(texture, pass_TexCoords).a * alpha;
- gl_FragColor = vec4(saturateColor(color, a), a);
+ gl_FragColor = vec4(color, a);
+ vec3 black = vec3(0.0, 0.0, 0.0);
+ gl_FragColor.rgb = mix(color, black, 1.0 - gl_FragColor.a);
}
diff --git a/app/build/intermediates/assets/debug/shader/simpleFragmentShader.glsl b/app/build/intermediates/assets/debug/shader/simpleFragmentShader.glsl
index a51d212..a60842a 100644
--- a/app/build/intermediates/assets/debug/shader/simpleFragmentShader.glsl
+++ b/app/build/intermediates/assets/debug/shader/simpleFragmentShader.glsl
@@ -7,5 +7,6 @@ varying vec2 pass_TexCoords;
void main() {
gl_FragColor = texture2D(texture, pass_TexCoords);
+ gl_FragColor.rgb = gl_FragColor.rgb / gl_FragColor.a;
}
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 77f9e88..7e2f6cc 100644
--- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/assets/shader/entityFragmentShader.glsl b/app/src/main/assets/shader/entityFragmentShader.glsl
index 52b67c0..8aa6426 100644
--- a/app/src/main/assets/shader/entityFragmentShader.glsl
+++ b/app/src/main/assets/shader/entityFragmentShader.glsl
@@ -20,6 +20,7 @@ void main() {
vec2 texAtlasCoords = getTexCoordsInAtlas(clampedTexCoords, texAtlasIndex);
gl_FragColor = texture2D(texture, texAtlasCoords);
gl_FragColor.a = min(gl_FragColor.a, alpha);
+ gl_FragColor.rgb = gl_FragColor.rgb / gl_FragColor.a;
}
diff --git a/app/src/main/assets/shader/obstacleFragmentShader.glsl b/app/src/main/assets/shader/obstacleFragmentShader.glsl
index 3b9f57c..7cc00ea 100644
--- a/app/src/main/assets/shader/obstacleFragmentShader.glsl
+++ b/app/src/main/assets/shader/obstacleFragmentShader.glsl
@@ -57,6 +57,7 @@ void main() {
vec2 texCoordsInAtlas = getTexCoordsInAtlas(texCoordsInGridSquare, index);
gl_FragColor = texture2D(texture, texCoordsInAtlas);
gl_FragColor.a = min(gl_FragColor.a, alpha);
+ gl_FragColor.rgb = gl_FragColor.rgb / gl_FragColor.a;
}
diff --git a/app/src/main/assets/shader/particleFragmentShader.glsl b/app/src/main/assets/shader/particleFragmentShader.glsl
index 9ee3829..b4d9426 100644
--- a/app/src/main/assets/shader/particleFragmentShader.glsl
+++ b/app/src/main/assets/shader/particleFragmentShader.glsl
@@ -11,7 +11,9 @@ vec3 saturateColor(in vec3 color, in float a);
void main() {
float a = texture2D(texture, pass_TexCoords).a * alpha;
- gl_FragColor = vec4(saturateColor(color, a), a);
+ gl_FragColor = vec4(color, a);
+ vec3 black = vec3(0.0, 0.0, 0.0);
+ gl_FragColor.rgb = mix(color, black, 1.0 - gl_FragColor.a);
}
diff --git a/app/src/main/assets/shader/simpleFragmentShader.glsl b/app/src/main/assets/shader/simpleFragmentShader.glsl
index a51d212..a60842a 100644
--- a/app/src/main/assets/shader/simpleFragmentShader.glsl
+++ b/app/src/main/assets/shader/simpleFragmentShader.glsl
@@ -7,5 +7,6 @@ varying vec2 pass_TexCoords;
void main() {
gl_FragColor = texture2D(texture, pass_TexCoords);
+ gl_FragColor.rgb = gl_FragColor.rgb / gl_FragColor.a;
}
\ No newline at end of file
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
index 158037a..18ece2c 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
@@ -17,8 +17,10 @@ public class Stasis extends Tool {
private ParticleSource particleSource;
public Stasis(Vector position, ParticleSystem particleSystem) {
- super(ToolType.STASIS, position, .6f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100, .6f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100, false, false);
- animation.disable();
+ super(ToolType.STASIS, position, .7f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100, .7f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100, false, false);
+ animation.setLooping(true);
+ animation.setRequiredDelta(300);
+ animation.setIndexSequence(new int[]{1, 1, 2, 3, 2, 4, 4, 3, 2, 2, 3, 3});
super.setFloating(true);
particleSource = new ParticleSource(new Vector(position), particleSystem.magnet);
particleSource.start();
diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java b/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
index 7476c85..47f4f6d 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
@@ -1,7 +1,11 @@
package de.frajul.endlessroll.main.game;
+import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.Entity;
import de.frajul.endlessroll.entities.Obstacle;
+import de.frajul.endlessroll.entities.particles.Firework;
+import de.frajul.endlessroll.entities.particles.ParticleEffect;
+import de.frajul.endlessroll.entities.particles.ParticleSource;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.levels.ObstacleData;
@@ -9,26 +13,10 @@ import de.frajul.endlessroll.levels.worlds.World;
public class TestScreenScene extends Scene {
- private Obstacle testObstacle;
-
public TestScreenScene(TexturePack texturePack, ParticleSystem particleSystem) {
super(texturePack, particleSystem);
- terrain.createEndless(World.ICY_MOUNTAINS, -.8f);
-
- testObstacle = createObstacle(-1f, 1.139f, 0, 0.217f, true, false);
- obstacles.add(testObstacle);
- obstacles.add(createObstacle(-1f, 1.139f, 0, 0.217f, false, false));
- }
-
- private Obstacle createObstacle(float leftEdge, float rightEdge, float y, float height, boolean floating, boolean deadly){
- ObstacleData data = new ObstacleData();
- data.setLeftEdge(leftEdge);
- data.setRightEdge(rightEdge);
- data.setY(y);
- data.setHeight(height);
- data.setFloating(floating);
- data.setDeadly(deadly);
- return new Obstacle(World.GRASSLANDS, data, -.8f);
+ terrain.createEndless(World.ICY_MOUNTAINS, -1.0f);
+ new ParticleSource(new Vector(0, -0.5f), particleSystem.testFire).start();
}
}
\ No newline at end of file
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java
index 8322d2f..319fffd 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java
@@ -24,11 +24,11 @@ public class GLTestScreen extends GLScreen {
@Override
public void prepareToBeShown() {
- flipToCaller();
+ glView.setCurrentRendering(rendering);
}
@Override
public void onBackKeyDown() {
- gameActivity.flipToScreen(ScreenType.START);
+ flipToCaller();
}
}
diff --git a/app/src/main/res/drawable/tools_stasis.png b/app/src/main/res/drawable/tools_stasis.png
index b73f576..7915a02 100644
Binary files a/app/src/main/res/drawable/tools_stasis.png and b/app/src/main/res/drawable/tools_stasis.png differ