diff --git a/android/assets/1280x720/cybercircle1.png b/android/assets/1280x720/cybercircle1.png index c40498d..856e312 100755 Binary files a/android/assets/1280x720/cybercircle1.png and b/android/assets/1280x720/cybercircle1.png differ diff --git a/android/assets/1280x720/cybercircle3B.png b/android/assets/1280x720/cybercircle3B.png index a8a2dd6..192fef2 100755 Binary files a/android/assets/1280x720/cybercircle3B.png and b/android/assets/1280x720/cybercircle3B.png differ diff --git a/android/assets/1280x800/cybercircle1.png b/android/assets/1280x800/cybercircle1.png index 2edc4d1..995b17d 100755 Binary files a/android/assets/1280x800/cybercircle1.png and b/android/assets/1280x800/cybercircle1.png differ diff --git a/android/assets/1280x800/cybercircle3B.png b/android/assets/1280x800/cybercircle3B.png index 6f5ab4e..375a7c7 100755 Binary files a/android/assets/1280x800/cybercircle3B.png and b/android/assets/1280x800/cybercircle3B.png differ diff --git a/android/assets/1366x768/cybercircle1.png b/android/assets/1366x768/cybercircle1.png index 2d205ef..7ebddf7 100755 Binary files a/android/assets/1366x768/cybercircle1.png and b/android/assets/1366x768/cybercircle1.png differ diff --git a/android/assets/1366x768/cybercircle3B.png b/android/assets/1366x768/cybercircle3B.png index 8af9f1e..ed57634 100755 Binary files a/android/assets/1366x768/cybercircle3B.png and b/android/assets/1366x768/cybercircle3B.png differ diff --git a/android/assets/1920x1080/cybercircle1.png b/android/assets/1920x1080/cybercircle1.png index f3c7512..aaf4d2b 100755 Binary files a/android/assets/1920x1080/cybercircle1.png and b/android/assets/1920x1080/cybercircle1.png differ diff --git a/android/assets/1920x1080/cybercircle3B.png b/android/assets/1920x1080/cybercircle3B.png index 13f13ef..a823234 100755 Binary files a/android/assets/1920x1080/cybercircle3B.png and b/android/assets/1920x1080/cybercircle3B.png differ diff --git a/android/assets/1920x1200/cybercircle1.png b/android/assets/1920x1200/cybercircle1.png index 6938404..05e8779 100755 Binary files a/android/assets/1920x1200/cybercircle1.png and b/android/assets/1920x1200/cybercircle1.png differ diff --git a/android/assets/1920x1200/cybercircle3B.png b/android/assets/1920x1200/cybercircle3B.png index de638f3..28fe987 100755 Binary files a/android/assets/1920x1200/cybercircle3B.png and b/android/assets/1920x1200/cybercircle3B.png differ diff --git a/android/assets/2560x1440/cybercircle1.png b/android/assets/2560x1440/cybercircle1.png index 2771c97..5e049ab 100755 Binary files a/android/assets/2560x1440/cybercircle1.png and b/android/assets/2560x1440/cybercircle1.png differ diff --git a/android/assets/2560x1440/cybercircle3B.png b/android/assets/2560x1440/cybercircle3B.png index f66907f..aa9a188 100755 Binary files a/android/assets/2560x1440/cybercircle3B.png and b/android/assets/2560x1440/cybercircle3B.png differ diff --git a/android/assets/3840x2160/cybercircle1.png b/android/assets/3840x2160/cybercircle1.png index 03c7b2c..d832826 100755 Binary files a/android/assets/3840x2160/cybercircle1.png and b/android/assets/3840x2160/cybercircle1.png differ diff --git a/android/assets/3840x2160/cybercircle3B.png b/android/assets/3840x2160/cybercircle3B.png index 8e7ef3a..b6c2f58 100755 Binary files a/android/assets/3840x2160/cybercircle3B.png and b/android/assets/3840x2160/cybercircle3B.png differ diff --git a/android/assets/800x480/cybercircle1.png b/android/assets/800x480/cybercircle1.png index 467fceb..0e3e546 100755 Binary files a/android/assets/800x480/cybercircle1.png and b/android/assets/800x480/cybercircle1.png differ diff --git a/android/assets/800x480/cybercircle3B.png b/android/assets/800x480/cybercircle3B.png index cf3174f..8a66c70 100755 Binary files a/android/assets/800x480/cybercircle3B.png and b/android/assets/800x480/cybercircle3B.png differ diff --git a/android/assets/shaders/default_frag.glsl b/android/assets/shaders/default_frag.glsl deleted file mode 100755 index 7d6f868..0000000 --- a/android/assets/shaders/default_frag.glsl +++ /dev/null @@ -1,16 +0,0 @@ -#ifdef GL_ES -#define LOWP lowp - precision mediump float; -#else - #define LOWP -#endif - -varying LOWP vec4 v_color; -varying vec2 v_texCoords; - -uniform sampler2D u_texture; - -void main() -{ - gl_FragColor = v_color * texture2D(u_texture, v_texCoords); -} diff --git a/android/assets/shaders/default_vertex.glsl b/android/assets/shaders/default_vertex.glsl deleted file mode 100755 index 314a6c7..0000000 --- a/android/assets/shaders/default_vertex.glsl +++ /dev/null @@ -1,13 +0,0 @@ -attribute vec4 a_position; -attribute vec4 a_color; -attribute vec2 a_texCoord; - -uniform mat4 u_projTrans; - -varying vec4 v_color; -varying vec2 v_texCoords; - -void main() -{ - gl_Position = u_projTrans * a_position; -} diff --git a/android/assets/shaders/invert_frag.glsl b/android/assets/shaders/invert_frag.glsl new file mode 100755 index 0000000..61a1480 --- /dev/null +++ b/android/assets/shaders/invert_frag.glsl @@ -0,0 +1,16 @@ +#ifdef GL_ES +#define LOWP lowp +precision mediump float; +#else +#define LOWP +#endif + +varying LOWP vec4 vColor; +varying vec2 vTexCoord; + +uniform sampler2D u_texture; +void main() { + vec4 texColor = texture2D(u_texture, vTexCoord); + texColor.rgb = 1.0 - texColor.rgb; + gl_FragColor = texColor * vColor; +} diff --git a/android/assets/shaders/invert_vert.glsl b/android/assets/shaders/invert_vert.glsl new file mode 100755 index 0000000..dd05e11 --- /dev/null +++ b/android/assets/shaders/invert_vert.glsl @@ -0,0 +1,15 @@ +attribute vec4 a_position; +attribute vec4 a_color; +attribute vec2 a_texCoord0; + +uniform mat4 u_projTrans; + +varying vec4 vColor; +varying vec2 vTexCoord; + +void main() { + vColor = a_color; + vTexCoord = a_texCoord0; + + gl_Position = u_projTrans * a_position; +} diff --git a/core/src/zero1hd/polyjet/Polyjet.java b/core/src/zero1hd/polyjet/Polyjet.java index cc81c55..e58c0d5 100755 --- a/core/src/zero1hd/polyjet/Polyjet.java +++ b/core/src/zero1hd/polyjet/Polyjet.java @@ -18,7 +18,6 @@ import com.badlogic.gdx.graphics.g2d.ParticleEffect; import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; -import com.badlogic.gdx.graphics.glutils.ShaderProgram; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle; import com.badlogic.gdx.scenes.scene2d.ui.CheckBox.CheckBoxStyle; @@ -51,7 +50,6 @@ public class Polyjet extends Game { TextureAtlas skinAtlas; private Preferences prefs; - public ShaderProgram defaultShader; @Override public void create() { @@ -89,8 +87,6 @@ public class Polyjet extends Game { assetManager.setLoader(ParticleEffect.class, new ParticleEffectLoader(genericFileFinder)); assetManager.setLoader(Sound.class, new SoundLoader(genericFileFinder)); - defaultShader = new ShaderProgram(Gdx.files.internal("shaders/default_vertex.glsl").readString(), Gdx.files.internal("shaders/default_frag.glsl").readString()); - default_fontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/Gasalt-Regular.ttf")); darktech_ldr_fontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/darktech_ldr.ttf")); diff --git a/core/src/zero1hd/polyjet/screens/MainMenu.java b/core/src/zero1hd/polyjet/screens/MainMenu.java index a10b70e..ff2fc8c 100755 --- a/core/src/zero1hd/polyjet/screens/MainMenu.java +++ b/core/src/zero1hd/polyjet/screens/MainMenu.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Screen; import com.badlogic.gdx.ScreenAdapter; import com.badlogic.gdx.graphics.GL20; +import com.badlogic.gdx.graphics.glutils.ShaderProgram; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; @@ -30,11 +31,23 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter { private CreditsPage creditsPage; private MoreOptionsPage moreOptionsPage; - Polyjet core; + private Polyjet core; + + private ShaderProgram invert; public MainMenu(final Polyjet core) { this.core = core; stage = new Stage(new ScreenViewport()); targetPosition = new Vector3(stage.getCamera().position); + invert = new ShaderProgram(Gdx.files.internal("shaders/invert_vert.glsl").readString(), Gdx.files.internal("shaders/invert_frag.glsl").readString()); + ShaderProgram.pedantic = false; + if (!invert.isCompiled()) { + System.err.println(invert.getLog()); + System.exit(0); + } + if (invert.getLog().length()!=0) + System.out.println(invert.getLog()); + + stage.getBatch().setShader(invert); } public Screen postTransition() { @@ -108,7 +121,6 @@ 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); diff --git a/core/src/zero1hd/polyjet/ui/pages/MainPage.java b/core/src/zero1hd/polyjet/ui/pages/MainPage.java index b222bd3..b479a1c 100755 --- a/core/src/zero1hd/polyjet/ui/pages/MainPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/MainPage.java @@ -1,6 +1,7 @@ package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.scenes.scene2d.Actor; @@ -39,7 +40,6 @@ public class MainPage extends Page { options.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { - // TODO Options screen targetPosition.x = 1.5f * getWidth(); } }); @@ -77,13 +77,11 @@ public class MainPage extends Page { cyberCircle = new Image(core.getAssetManager().get("Tech-Circle1.png", Texture.class)); cyberCircle.setOrigin(cyberCircle.getWidth() / 2, cyberCircle.getHeight() / 2); - cyberCircle.setColor(0.7f, 0.7f, 0.7f, 0.8f); cyberCircle.addAction(Actions.forever(Actions.rotateBy(-360f, 10f))); playButton.addActor(cyberCircle); playButton.setSize(cyberCircle.getWidth(), cyberCircle.getHeight()); begin = new Label("Play", core.getDefaultSkin(), "special-font", core.getDefaultSkin().getColor("default")); - begin.setColor(1f, 1f, 1f, 1f); playButton.addActor(begin); begin.setPosition(((playButton.getWidth() - begin.getWidth()) / 2)-10, (playButton.getHeight() - begin.getHeight()) / 2);