From 46234d3d9d9a63b37c79379beb023dca36f8c10f Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 4 Nov 2023 17:45:31 +0900 Subject: [PATCH] assets updates for randomised tiling --- assets/mods/basegame/blocks/144.tga | 2 +- assets/mods/basegame/blocks/16.tga | 2 +- assets/mods/basegame/blocks/17.tga | 2 +- assets/mods/basegame/blocks/20.tga | 2 +- assets/mods/basegame/blocks/21.tga | 2 +- assets/mods/basegame/blocks/32.tga | 2 +- src/shaders/tiling.frag | 33 ++++++------------- .../graphics/terrain/terrain_mask_type01.kra | 4 +-- 8 files changed, 18 insertions(+), 31 deletions(-) diff --git a/assets/mods/basegame/blocks/144.tga b/assets/mods/basegame/blocks/144.tga index c3a05177d..b00854602 100644 --- a/assets/mods/basegame/blocks/144.tga +++ b/assets/mods/basegame/blocks/144.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1e90dc4a907cef0d10b34d3092cd01ae8504dcf4ffea9b78a4b28c96f51f80e +oid sha256:b072a12d6a1ae5b036673ce6a1790c9afb9ca646ebd98e4a408fb79a907da381 size 50194 diff --git a/assets/mods/basegame/blocks/16.tga b/assets/mods/basegame/blocks/16.tga index 1425d5d0c..261510952 100644 --- a/assets/mods/basegame/blocks/16.tga +++ b/assets/mods/basegame/blocks/16.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ce5d1a3223a2f5635722cff91b44e9b65ed4069f4b5e950d5a7f5d42667b3ce +oid sha256:5060816006d7d7115877f16206493e228be92c2b87ef520ffbf004cdd0544187 size 50194 diff --git a/assets/mods/basegame/blocks/17.tga b/assets/mods/basegame/blocks/17.tga index 7c32449b0..dbd66fd67 100644 --- a/assets/mods/basegame/blocks/17.tga +++ b/assets/mods/basegame/blocks/17.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2e9f0736173cbd347201db6ef546e269a5214974491461ccd15f554e0acc2b3 +oid sha256:f4724d66cbe578c7c9173294728b6c30b141d5b5f0e3c59d006bf99414b03779 size 50194 diff --git a/assets/mods/basegame/blocks/20.tga b/assets/mods/basegame/blocks/20.tga index cc7236448..10d67b29e 100755 --- a/assets/mods/basegame/blocks/20.tga +++ b/assets/mods/basegame/blocks/20.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79b978764c4d98d19e707dd9c8d0fc93757cb1f902802ea137d32efda9a65853 +oid sha256:0dea822005706beeaa28e7ecc1112132256760b4418efebdf218c670481642c8 size 50194 diff --git a/assets/mods/basegame/blocks/21.tga b/assets/mods/basegame/blocks/21.tga index 3f0eddf64..6ebaf6d89 100755 --- a/assets/mods/basegame/blocks/21.tga +++ b/assets/mods/basegame/blocks/21.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:384f476add66d8f0d0c9a7952cc8e2ff5c86c9a24280e49c683be6d36b174c62 +oid sha256:e860276c372aa1a5c63c4a15f9df7231f3181a783946b68059870235b6e86585 size 50194 diff --git a/assets/mods/basegame/blocks/32.tga b/assets/mods/basegame/blocks/32.tga index 7ba771272..b578a97da 100644 --- a/assets/mods/basegame/blocks/32.tga +++ b/assets/mods/basegame/blocks/32.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b76d8561040b80b80c2f327ec16161a2ba6bd25f9cf78473cd42bddd7256b02b +oid sha256:4ff304b93508bb18393095deb56df4257f9f476d81a3fe5f4c62b6b3411b2f27 size 50194 diff --git a/src/shaders/tiling.frag b/src/shaders/tiling.frag index 43ad16e65..c41cb4dce 100644 --- a/src/shaders/tiling.frag +++ b/src/shaders/tiling.frag @@ -72,32 +72,19 @@ int getTileFlipRotFromColor(vec4 color) { } -mat2[] flipRotMat = mat2[]( -mat2( 1.0, 0.0, 0.0, 1.0), -mat2(-1.0, 0.0, 0.0, 1.0), -mat2( 0.0, -1.0, 1.0, 0.0), -mat2( 0.0, 1.0, 1.0, 0.0), - -mat2(-1.0, 0.0, 0.0, -1.0), -mat2( 1.0, 0.0, 0.0, -1.0), -mat2( 0.0, 1.0, -1.0, 0.0), -mat2( 0.0, -1.0, -1.0, 0.0) -); - -vec2[] flipRotOffset = vec2[]( -vec2(0, 0), -vec2(1, 0), -vec2(0, 1), -vec2(0, 0), - -vec2(1, 1), -vec2(0, 1), -vec2(1, 0), -vec2(1, 1) +mat3x2[] flipRotMat = mat3x2[]( +mat3x2( 1.0, 0.0, 0.0, 1.0, tileSizeInPx.x*0.0, tileSizeInPx.y*0.0), +mat3x2(-1.0, 0.0, 0.0, 1.0, tileSizeInPx.x*1.0, tileSizeInPx.y*0.0), +mat3x2( 0.0, -1.0, 1.0, 0.0, tileSizeInPx.x*0.0, tileSizeInPx.y*1.0), +mat3x2( 0.0, 1.0, 1.0, 0.0, tileSizeInPx.x*0.0, tileSizeInPx.y*0.0), +mat3x2(-1.0, 0.0, 0.0, -1.0, tileSizeInPx.x*1.0, tileSizeInPx.y*1.0), +mat3x2( 1.0, 0.0, 0.0, -1.0, tileSizeInPx.x*0.0, tileSizeInPx.y*1.0), +mat3x2( 0.0, 1.0, -1.0, 0.0, tileSizeInPx.x*1.0, tileSizeInPx.y*0.0), +mat3x2( 0.0, -1.0, -1.0, 0.0, tileSizeInPx.x*1.0, tileSizeInPx.y*1.0) ); vec2 uvFlipRot(int op, vec2 uv) { - return flipRotMat[op] * uv + flipRotOffset[op] * tileSizeInPx; + return (flipRotMat[op] * vec3(uv, 1.0)).xy; } void main() { diff --git a/work_files/graphics/terrain/terrain_mask_type01.kra b/work_files/graphics/terrain/terrain_mask_type01.kra index 8a9552914..471648d48 100644 --- a/work_files/graphics/terrain/terrain_mask_type01.kra +++ b/work_files/graphics/terrain/terrain_mask_type01.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6edb87ac0ff89e898fc30bbad1c2e5e08d17034d46b3de332f008778e737cf3d -size 237761 +oid sha256:40854aae84e39d7e365106afe00a1ae0c4e26f5fc939469b8dab58cfce6380be +size 200255