curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

changed shaders enough that the game now runs on Apple M2

Browse Source
This commit is contained in:
minjaesong
2023-02-28 17:47:09 +09:00
parent 2c86c6a461
commit cba24456e9
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/App.java
View File

@@ -313,6 +313,10 @@ public class App implements ApplicationListener {
return currentScreen; return currentScreen;
} }
public static ShapeRenderer makeShapeRenderer() {
return new ShapeRenderer(5000, MacosGL32Shaders.INSTANCE.createShapeRendererShader());
}
public static void main(String[] args) { public static void main(String[] args) {
// if -ea flag is set, turn on all the debug prints // 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())); camera = new OrthographicCamera((scr.getWf()), (scr.getHf()));
batch = new FlippingSpriteBatch(); batch = new FlippingSpriteBatch();
shapeRender = new ShapeRenderer(5000, MacosGL32Shaders.INSTANCE.createShapeRendererShader()); shapeRender = makeShapeRenderer();
initViewPort(scr.getWidth(), scr.getHeight()); initViewPort(scr.getWidth(), scr.getHeight());
@@ -465,7 +469,7 @@ public class App implements ApplicationListener {
); );
shaderHicolour = loadShaderFromClasspath("shaders/default.vert", "shaders/hicolour.frag"); shaderHicolour = loadShaderFromClasspath("shaders/default.vert", "shaders/hicolour.frag");
shaderDebugDiff = loadShaderFromClasspath("shaders/default.vert", "shaders/diff.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"); shaderColLUT = loadShaderFromClasspath("shaders/default.vert", "shaders/passthrurgb.frag");
shaderReflect = loadShaderFromClasspath("shaders/default.vert", "shaders/reflect.frag"); shaderReflect = loadShaderFromClasspath("shaders/default.vert", "shaders/reflect.frag");
shaderGhastlyWhite = loadShaderFromClasspath("shaders/default.vert", "shaders/ghastlywhite.frag"); shaderGhastlyWhite = loadShaderFromClasspath("shaders/default.vert", "shaders/ghastlywhite.frag");

2
src/net/torvald/terrarum/ColorLimiterTest.kt
View File

@@ -48,7 +48,7 @@ object ColorLimiterTest : ApplicationAdapter() {
img = Texture("assets/test_texture.tga") img = Texture("assets/test_texture.tga")
batch = SpriteBatch() batch = SpriteBatch()
shapeRenderer = ShapeRenderer() shapeRenderer = App.makeShapeRenderer()
font = TerrarumSansBitmap("assets/graphics/fonts/terrarum-sans-bitmap") font = TerrarumSansBitmap("assets/graphics/fonts/terrarum-sans-bitmap")

2
src/net/torvald/terrarum/TerrarumAppConfiguration.kt
View File

@@ -12,7 +12,7 @@ object TerrarumAppConfiguration {
// CONFIGURATION FOR THE APP ITSELF // // CONFIGURATION FOR THE APP ITSELF //
////////////////////////////////////// //////////////////////////////////////
const val GAME_NAME = "Terrarum" 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"] val COPYRIGHT_LICENSE: String; get() = Lang["COPYRIGHT_GNU_GPL_3"]
const val COPYRIGHT_LICENSE_ENGLISH = "Distributed under GNU GPL 3" const val COPYRIGHT_LICENSE_ENGLISH = "Distributed under GNU GPL 3"
const val COPYRIGHT_LICENSE_TERMS_SHORT = """ const val COPYRIGHT_LICENSE_TERMS_SHORT = """

2
src/net/torvald/terrarum/TerrarumPostProcessor.kt
View File

@@ -93,7 +93,7 @@ object TerrarumPostProcessor : Disposable {
batch.projectionMatrix = camera.combined batch.projectionMatrix = camera.combined
shapeRenderer = ShapeRenderer() shapeRenderer = App.makeShapeRenderer()
shapeRenderer.projectionMatrix = camera.combined shapeRenderer.projectionMatrix = camera.combined
Gdx.gl20.glViewport(0, 0, App.scr.width, App.scr.height) Gdx.gl20.glViewport(0, 0, App.scr.width, App.scr.height)

2
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
View File

@@ -71,7 +71,7 @@ class UIInventoryFull(
gdxBlendNormalStraightAlpha() gdxBlendNormalStraightAlpha()
if (shapeRenderer == null) { if (shapeRenderer == null) {
shapeRenderer = ShapeRenderer() shapeRenderer = App.makeShapeRenderer()
App.disposables.add(shapeRenderer) App.disposables.add(shapeRenderer)
} }

2
src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
View File

@@ -103,7 +103,7 @@ class UILoadDemoSavefiles(val remoCon: UIRemoCon) : UICanvas() {
override var openCloseTime: Second = OPENCLOSE_GENERIC override var openCloseTime: Second = OPENCLOSE_GENERIC
private val shapeRenderer = ShapeRenderer() private val shapeRenderer = App.makeShapeRenderer()
internal val uiWidth = SAVE_CELL_WIDTH internal val uiWidth = SAVE_CELL_WIDTH

4
src/shaders/boxdown.frag
View File

@@ -17,6 +17,8 @@ vec2 doubley = vec2(0.0, 2.0);
vec2 twister = vec2(1.0, -1.0); vec2 twister = vec2(1.0, -1.0);
vec2 boolean = vec2(1.0, 0.0); vec2 boolean = vec2(1.0, 0.0);
out vec4 fragColor;
void main() { void main() {
vec4 sum = texture(u_texture, v_texCoords) + vec4 sum = texture(u_texture, v_texCoords) +
texture(u_texture, v_texCoords + halfpixel) + 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) +
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;
} }