From 0222ea00a7e4ae79daf3c6b516bf388be0d2ad6c Mon Sep 17 00:00:00 2001 From: Recrown Date: Wed, 7 Jun 2017 00:21:25 -0500 Subject: [PATCH] shader test changes --- android/assets/shaders/default_vertex.glsl | 3 --- core/src/zero1hd/polyjet/screens/MainMenu.java | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/android/assets/shaders/default_vertex.glsl b/android/assets/shaders/default_vertex.glsl index 75fd649..314a6c7 100755 --- a/android/assets/shaders/default_vertex.glsl +++ b/android/assets/shaders/default_vertex.glsl @@ -9,8 +9,5 @@ varying vec2 v_texCoords; void main() { - v_color = a_color; - v_color.a = v_color.a * (256.0/255.0); - v_texCoords = a_texCoord + 0; gl_Position = u_projTrans * a_position; } diff --git a/core/src/zero1hd/polyjet/screens/MainMenu.java b/core/src/zero1hd/polyjet/screens/MainMenu.java index 5755b51..a10b70e 100755 --- a/core/src/zero1hd/polyjet/screens/MainMenu.java +++ b/core/src/zero1hd/polyjet/screens/MainMenu.java @@ -108,6 +108,7 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter { Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); stage.act(); + stage.getBatch().setShader(core.defaultShader); stage.draw(); if (stage.getCamera().position.x != targetPosition.x || stage.getCamera().position.y != targetPosition.y) { stage.getCamera().position.lerp(targetPosition, 0.25f);