diff --git a/assets/modules/basegame/blocks/terrain.tga.gz b/assets/modules/basegame/blocks/terrain.tga.gz index d2a4a1c26..eb27800d5 100644 --- a/assets/modules/basegame/blocks/terrain.tga.gz +++ b/assets/modules/basegame/blocks/terrain.tga.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16e2f954dbd71e74bbf1f7772fdade8e77d99e67dc221d7252fd87324e6ab42c -size 3017046 +oid sha256:15ac4437fc478300464577b4975a11a013975350b5b95939452c96bfc6b299c6 +size 2693320 diff --git a/assets/tiling.frag b/assets/tiling.frag index 0f9691544..7e1f0ad64 100644 --- a/assets/tiling.frag +++ b/assets/tiling.frag @@ -35,7 +35,7 @@ ivec2 getTileXY(int tileNumber) { } int getTileFromColor(vec4 color) { - return int(color.b * 255) + (int(color.g * 255) * 256) + (int(color.r * 255) * 65536); + return int(color.b * 255) | (int(color.g * 255) << 8) | (int(color.r * 255) << 16); } void main() { diff --git a/src/net/torvald/terrarum/GlslTilingTest.kt b/src/net/torvald/terrarum/GlslTilingTest.kt index fbc8aa9cd..e4c961ee1 100644 --- a/src/net/torvald/terrarum/GlslTilingTest.kt +++ b/src/net/torvald/terrarum/GlslTilingTest.kt @@ -158,8 +158,9 @@ object GlslTilingTest : ApplicationAdapter() { tilesBufferAsTex.dispose() - cameraX += 160 * Gdx.graphics.deltaTime - cameraY += 160 * Gdx.graphics.deltaTime + cameraX = 6f + //cameraX += 160 * Gdx.graphics.deltaTime + //cameraY += 160 * Gdx.graphics.deltaTime } override fun dispose() { diff --git a/work_files/graphics/terrain/terrain.psd.gz b/work_files/graphics/terrain/terrain.psd.gz index c706894d5..9f8ef408f 100644 --- a/work_files/graphics/terrain/terrain.psd.gz +++ b/work_files/graphics/terrain/terrain.psd.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33179f8881fef09af983a226c879dbfd42ca70ea81b9b08a0426ba54479ed59c -size 529386 +oid sha256:e2f654b59d5fc27ccfa549bde9e259819307ad331101c52dc238c17c410525d2 +size 510387