diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 985ffdfbf..ce0465d56 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -313,6 +313,10 @@ public class App implements ApplicationListener { return currentScreen; } + public static ShapeRenderer makeShapeRenderer() { + return new ShapeRenderer(5000, MacosGL32Shaders.INSTANCE.createShapeRendererShader()); + } + public static void main(String[] args) { // if -ea flag is set, turn on all the debug prints @@ -444,7 +448,7 @@ public class App implements ApplicationListener { camera = new OrthographicCamera((scr.getWf()), (scr.getHf())); batch = new FlippingSpriteBatch(); - shapeRender = new ShapeRenderer(5000, MacosGL32Shaders.INSTANCE.createShapeRendererShader()); + shapeRender = makeShapeRenderer(); initViewPort(scr.getWidth(), scr.getHeight()); @@ -465,7 +469,7 @@ public class App implements ApplicationListener { ); shaderHicolour = loadShaderFromClasspath("shaders/default.vert", "shaders/hicolour.frag"); shaderDebugDiff = loadShaderFromClasspath("shaders/default.vert", "shaders/diff.frag"); - shaderPassthruRGBA = SpriteBatch.createDefaultShader(); + shaderPassthruRGBA = loadShaderFromClasspath("shaders/gl32spritebatch.vert", "shaders/gl32spritebatch.frag"); shaderColLUT = loadShaderFromClasspath("shaders/default.vert", "shaders/passthrurgb.frag"); shaderReflect = loadShaderFromClasspath("shaders/default.vert", "shaders/reflect.frag"); shaderGhastlyWhite = loadShaderFromClasspath("shaders/default.vert", "shaders/ghastlywhite.frag"); diff --git a/src/net/torvald/terrarum/ColorLimiterTest.kt b/src/net/torvald/terrarum/ColorLimiterTest.kt index a6db94670..e4fbd5262 100644 --- a/src/net/torvald/terrarum/ColorLimiterTest.kt +++ b/src/net/torvald/terrarum/ColorLimiterTest.kt @@ -48,7 +48,7 @@ object ColorLimiterTest : ApplicationAdapter() { img = Texture("assets/test_texture.tga") batch = SpriteBatch() - shapeRenderer = ShapeRenderer() + shapeRenderer = App.makeShapeRenderer() font = TerrarumSansBitmap("assets/graphics/fonts/terrarum-sans-bitmap") diff --git a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt index be96b7b3e..35a26da55 100644 --- a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt +++ b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt @@ -12,7 +12,7 @@ object TerrarumAppConfiguration { // CONFIGURATION FOR THE APP ITSELF // ////////////////////////////////////// const val GAME_NAME = "Terrarum" - const val COPYRIGHT_DATE_NAME = "Copyright 2013-2022 CuriousToꝛvald (minjaesong)" + const val COPYRIGHT_DATE_NAME = "Copyright 2013-2023 CuriousToꝛvald (minjaesong)" val COPYRIGHT_LICENSE: String; get() = Lang["COPYRIGHT_GNU_GPL_3"] const val COPYRIGHT_LICENSE_ENGLISH = "Distributed under GNU GPL 3" const val COPYRIGHT_LICENSE_TERMS_SHORT = """ diff --git a/src/net/torvald/terrarum/TerrarumPostProcessor.kt b/src/net/torvald/terrarum/TerrarumPostProcessor.kt index dc44b7678..850e02a02 100644 --- a/src/net/torvald/terrarum/TerrarumPostProcessor.kt +++ b/src/net/torvald/terrarum/TerrarumPostProcessor.kt @@ -93,7 +93,7 @@ object TerrarumPostProcessor : Disposable { batch.projectionMatrix = camera.combined - shapeRenderer = ShapeRenderer() + shapeRenderer = App.makeShapeRenderer() shapeRenderer.projectionMatrix = camera.combined Gdx.gl20.glViewport(0, 0, App.scr.width, App.scr.height) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index 076a824ba..15c93e8df 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -71,7 +71,7 @@ class UIInventoryFull( gdxBlendNormalStraightAlpha() if (shapeRenderer == null) { - shapeRenderer = ShapeRenderer() + shapeRenderer = App.makeShapeRenderer() App.disposables.add(shapeRenderer) } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt index 136544b59..43349c51a 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt @@ -103,7 +103,7 @@ class UILoadDemoSavefiles(val remoCon: UIRemoCon) : UICanvas() { override var openCloseTime: Second = OPENCLOSE_GENERIC - private val shapeRenderer = ShapeRenderer() + private val shapeRenderer = App.makeShapeRenderer() internal val uiWidth = SAVE_CELL_WIDTH diff --git a/src/shaders/boxdown.frag b/src/shaders/boxdown.frag index 1b453ed12..8c0d06e5d 100644 --- a/src/shaders/boxdown.frag +++ b/src/shaders/boxdown.frag @@ -17,6 +17,8 @@ vec2 doubley = vec2(0.0, 2.0); vec2 twister = vec2(1.0, -1.0); vec2 boolean = vec2(1.0, 0.0); +out vec4 fragColor; + void main() { vec4 sum = texture(u_texture, v_texCoords) + texture(u_texture, v_texCoords + halfpixel) + @@ -28,5 +30,5 @@ void main() { texture(u_texture, v_texCoords + halfpixel * boolean.yx) + texture(u_texture, v_texCoords - halfpixel * boolean.yx) ; - gl_FragColor = sum / 9.0; + fragColor = sum / 9.0; } \ No newline at end of file