From 0747e5e880de3f1558c7aa168a3a128df8e46c01 Mon Sep 17 00:00:00 2001 From: Szymon Nowakowski Date: Thu, 27 Nov 2025 18:49:18 +0100 Subject: [PATCH] Legalize materials, add many more --- assets/materials/Andesite.json | 5 +++++ assets/materials/Bricks.json | 4 +--- assets/materials/ChiseledStoneBricks.json | 5 +++++ assets/materials/CoalBlock.json | 5 +++++ assets/materials/CoalOre.json | 4 ++++ assets/materials/Cobblestone.json | 5 +++++ assets/materials/DiamondBlock.json | 5 +++++ assets/materials/DiamondOre.json | 4 ++++ assets/materials/Diorite.json | 5 +++++ assets/materials/Dirt.json | 5 ++--- assets/materials/Glass.json | 4 ++++ assets/materials/Gold.json | 6 ------ assets/materials/GoldBlock.json | 5 +++++ assets/materials/GoldOre.json | 4 ++++ assets/materials/Granite.json | 5 +++++ assets/materials/Gravel.json | 5 +++++ assets/materials/IronBlock.json | 5 +++++ assets/materials/IronOre.json | 4 ++++ assets/materials/OakLog.json | 5 +++++ assets/materials/OakLogTop.json | 5 +++++ assets/materials/OakPlanks.json | 5 +++++ assets/materials/Sand.json | 5 +++++ assets/materials/SmoothStone.json | 5 +++++ assets/materials/Stone.json | 5 ++--- assets/materials/StoneBricks.json | 5 +++++ assets/textures/Andesite_BaseColor.png | 3 +++ assets/textures/Bricks_BaseColor.png | 4 ++-- assets/textures/Bricks_Normal.png | 3 --- assets/textures/Bricks_OcclusionRoughnessMetallic.png | 3 +++ assets/textures/ChiseledStoneBricks_BaseColor.png | 3 +++ assets/textures/CoalBlock_BaseColor.png | 3 +++ assets/textures/CoalOre_BaseColor.png | 3 +++ assets/textures/CoalOre_OcclusionRoughnessMetallic.png | 3 +++ assets/textures/Cobblestone.png | 3 +++ assets/textures/DiamondBlock_BaseColor.png | 3 +++ assets/textures/DiamondOre_BaseColor.png | 3 +++ assets/textures/DiamondOre_OcclusionRoughnessMetallic.png | 3 +++ assets/textures/Diorite_BaseColor.png | 3 +++ assets/textures/Dirt_BaseColor.png | 4 ++-- assets/textures/Dirt_Normal.png | 3 --- assets/textures/Glass_BaseColor.png | 3 +++ assets/textures/Glass_OcclusionRoughnessMetallic.png | 3 +++ assets/textures/GoldBlock_BaseColor.png | 3 +++ assets/textures/GoldOre_BaseColor.png | 3 +++ assets/textures/GoldOre_OcclusionRoughnessMetallic.png | 3 +++ assets/textures/Gold_BaseColor.png | 3 --- assets/textures/Gold_Normal.png | 3 --- assets/textures/Granite_BaseColor.png | 3 +++ assets/textures/Gravel_BaseColor.png | 3 +++ assets/textures/IronBlock_BaseColor.png | 3 +++ assets/textures/IronOre_BaseColor.png | 3 +++ assets/textures/IronOre_OcclusionRoughnessMetallic.png | 3 +++ assets/textures/OakLogTop_BaseColor.png | 3 +++ assets/textures/OakLog_BaseColor.png | 3 +++ assets/textures/OakPlanks_BaseColor.png | 3 +++ assets/textures/Sand_BaseColor.png | 3 +++ assets/textures/SmoothStone_BaseColor.png | 3 +++ assets/textures/StoneBricks_BaseColor.png | 3 +++ assets/textures/Stone_BaseColor.png | 4 ++-- assets/textures/Stone_Normal.png | 3 --- src/Game.zig | 5 +---- 61 files changed, 193 insertions(+), 40 deletions(-) create mode 100644 assets/materials/Andesite.json create mode 100644 assets/materials/ChiseledStoneBricks.json create mode 100644 assets/materials/CoalBlock.json create mode 100644 assets/materials/CoalOre.json create mode 100644 assets/materials/Cobblestone.json create mode 100644 assets/materials/DiamondBlock.json create mode 100644 assets/materials/DiamondOre.json create mode 100644 assets/materials/Diorite.json create mode 100644 assets/materials/Glass.json delete mode 100644 assets/materials/Gold.json create mode 100644 assets/materials/GoldBlock.json create mode 100644 assets/materials/GoldOre.json create mode 100644 assets/materials/Granite.json create mode 100644 assets/materials/Gravel.json create mode 100644 assets/materials/IronBlock.json create mode 100644 assets/materials/IronOre.json create mode 100644 assets/materials/OakLog.json create mode 100644 assets/materials/OakLogTop.json create mode 100644 assets/materials/OakPlanks.json create mode 100644 assets/materials/Sand.json create mode 100644 assets/materials/SmoothStone.json create mode 100644 assets/materials/StoneBricks.json create mode 100644 assets/textures/Andesite_BaseColor.png delete mode 100644 assets/textures/Bricks_Normal.png create mode 100644 assets/textures/Bricks_OcclusionRoughnessMetallic.png create mode 100644 assets/textures/ChiseledStoneBricks_BaseColor.png create mode 100644 assets/textures/CoalBlock_BaseColor.png create mode 100644 assets/textures/CoalOre_BaseColor.png create mode 100644 assets/textures/CoalOre_OcclusionRoughnessMetallic.png create mode 100644 assets/textures/Cobblestone.png create mode 100644 assets/textures/DiamondBlock_BaseColor.png create mode 100644 assets/textures/DiamondOre_BaseColor.png create mode 100644 assets/textures/DiamondOre_OcclusionRoughnessMetallic.png create mode 100644 assets/textures/Diorite_BaseColor.png delete mode 100644 assets/textures/Dirt_Normal.png create mode 100644 assets/textures/Glass_BaseColor.png create mode 100644 assets/textures/Glass_OcclusionRoughnessMetallic.png create mode 100644 assets/textures/GoldBlock_BaseColor.png create mode 100644 assets/textures/GoldOre_BaseColor.png create mode 100644 assets/textures/GoldOre_OcclusionRoughnessMetallic.png delete mode 100644 assets/textures/Gold_BaseColor.png delete mode 100644 assets/textures/Gold_Normal.png create mode 100644 assets/textures/Granite_BaseColor.png create mode 100644 assets/textures/Gravel_BaseColor.png create mode 100644 assets/textures/IronBlock_BaseColor.png create mode 100644 assets/textures/IronOre_BaseColor.png create mode 100644 assets/textures/IronOre_OcclusionRoughnessMetallic.png create mode 100644 assets/textures/OakLogTop_BaseColor.png create mode 100644 assets/textures/OakLog_BaseColor.png create mode 100644 assets/textures/OakPlanks_BaseColor.png create mode 100644 assets/textures/Sand_BaseColor.png create mode 100644 assets/textures/SmoothStone_BaseColor.png create mode 100644 assets/textures/StoneBricks_BaseColor.png delete mode 100644 assets/textures/Stone_Normal.png diff --git a/assets/materials/Andesite.json b/assets/materials/Andesite.json new file mode 100644 index 0000000..4be0a33 --- /dev/null +++ b/assets/materials/Andesite.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "Andesite_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/Bricks.json b/assets/materials/Bricks.json index d8f4aad..cd28a50 100644 --- a/assets/materials/Bricks.json +++ b/assets/materials/Bricks.json @@ -1,6 +1,4 @@ { "baseColorTexture": "Bricks_BaseColor.png", - "metallic": 0, - "normalTexture": "Bricks_Normal.png", - "roughness": 1 + "occlusionRoughnessMetallicTexture": "Bricks_OcclusionRoughnessMetallic.png" } diff --git a/assets/materials/ChiseledStoneBricks.json b/assets/materials/ChiseledStoneBricks.json new file mode 100644 index 0000000..2bfa1c4 --- /dev/null +++ b/assets/materials/ChiseledStoneBricks.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "ChiseledStoneBricks_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/CoalBlock.json b/assets/materials/CoalBlock.json new file mode 100644 index 0000000..d5b3210 --- /dev/null +++ b/assets/materials/CoalBlock.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "CoalBlock_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/CoalOre.json b/assets/materials/CoalOre.json new file mode 100644 index 0000000..4b2a8b1 --- /dev/null +++ b/assets/materials/CoalOre.json @@ -0,0 +1,4 @@ +{ + "baseColorTexture": "CoalOre_BaseColor.png", + "occlusionRoughnessMetallicTexture": "CoalOre_OcclusionRoughnessMetallic.png" +} diff --git a/assets/materials/Cobblestone.json b/assets/materials/Cobblestone.json new file mode 100644 index 0000000..90da4e8 --- /dev/null +++ b/assets/materials/Cobblestone.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "Cobblestone_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/DiamondBlock.json b/assets/materials/DiamondBlock.json new file mode 100644 index 0000000..9344c6a --- /dev/null +++ b/assets/materials/DiamondBlock.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "DiamonBlock_BaseColor.png", + "roughness": 0, + "metallic": 1 +} diff --git a/assets/materials/DiamondOre.json b/assets/materials/DiamondOre.json new file mode 100644 index 0000000..273875c --- /dev/null +++ b/assets/materials/DiamondOre.json @@ -0,0 +1,4 @@ +{ + "baseColorTexture": "DiamondOre_BaseColor.png", + "oclussionRoughnessMetallicTexture": "DiamondOre_OcclusionRoughnessMetallic.png" +} diff --git a/assets/materials/Diorite.json b/assets/materials/Diorite.json new file mode 100644 index 0000000..874a4c6 --- /dev/null +++ b/assets/materials/Diorite.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "Diorite_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/Dirt.json b/assets/materials/Dirt.json index 3ff81e5..de2331e 100644 --- a/assets/materials/Dirt.json +++ b/assets/materials/Dirt.json @@ -1,6 +1,5 @@ { "baseColorTexture": "Dirt_BaseColor.png", - "metallic": 0, - "normalTexture": "Dirt_Normal.png", - "roughness": 1 + "roughness": 1, + "metallic": 0 } diff --git a/assets/materials/Glass.json b/assets/materials/Glass.json new file mode 100644 index 0000000..fa46cbf --- /dev/null +++ b/assets/materials/Glass.json @@ -0,0 +1,4 @@ +{ + "baseColorTexture": "Glass_BaseColor.png", + "occlusionRoughnessMetallicTexture": "Glass_OcclusionRoughnessMetallic.png" +} diff --git a/assets/materials/Gold.json b/assets/materials/Gold.json deleted file mode 100644 index a071cf2..0000000 --- a/assets/materials/Gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "baseColorTexture": "Gold_BaseColor.png", - "metallic": 1, - "normalTexture": "Gold_Normal.png", - "roughness": 0 -} diff --git a/assets/materials/GoldBlock.json b/assets/materials/GoldBlock.json new file mode 100644 index 0000000..0bff4c5 --- /dev/null +++ b/assets/materials/GoldBlock.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "GoldBlock_BaseColor.png", + "roughness": 0, + "metallic": 1 +} diff --git a/assets/materials/GoldOre.json b/assets/materials/GoldOre.json new file mode 100644 index 0000000..fd34ae9 --- /dev/null +++ b/assets/materials/GoldOre.json @@ -0,0 +1,4 @@ +{ + "baseColorTexture": "GoldOre_BaseColor.png", + "occlusionRoughnessMetallicTexture": "GoldOre_OcclusionRoughnessMetallic.png" +} diff --git a/assets/materials/Granite.json b/assets/materials/Granite.json new file mode 100644 index 0000000..fbe3cd0 --- /dev/null +++ b/assets/materials/Granite.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "Granite_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/Gravel.json b/assets/materials/Gravel.json new file mode 100644 index 0000000..817114c --- /dev/null +++ b/assets/materials/Gravel.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "Gravel_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/IronBlock.json b/assets/materials/IronBlock.json new file mode 100644 index 0000000..ebcadff --- /dev/null +++ b/assets/materials/IronBlock.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "IronBlock_BaseColor.png", + "roughness": 0, + "metallic": 1 +} diff --git a/assets/materials/IronOre.json b/assets/materials/IronOre.json new file mode 100644 index 0000000..c0b5087 --- /dev/null +++ b/assets/materials/IronOre.json @@ -0,0 +1,4 @@ +{ + "baseColorTexture": "IronOre_BaseColor.png", + "occlusionRoughnessMetallicTexture": "IronOre_OcclusionRoughnessMetallic.png" +} diff --git a/assets/materials/OakLog.json b/assets/materials/OakLog.json new file mode 100644 index 0000000..a762662 --- /dev/null +++ b/assets/materials/OakLog.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "OakLog_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/OakLogTop.json b/assets/materials/OakLogTop.json new file mode 100644 index 0000000..bed819f --- /dev/null +++ b/assets/materials/OakLogTop.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "OakLogTop_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/OakPlanks.json b/assets/materials/OakPlanks.json new file mode 100644 index 0000000..f8d39f7 --- /dev/null +++ b/assets/materials/OakPlanks.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "OakPlanks_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/Sand.json b/assets/materials/Sand.json new file mode 100644 index 0000000..d305746 --- /dev/null +++ b/assets/materials/Sand.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "Sand_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/SmoothStone.json b/assets/materials/SmoothStone.json new file mode 100644 index 0000000..e89407b --- /dev/null +++ b/assets/materials/SmoothStone.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "SmoothStone_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/materials/Stone.json b/assets/materials/Stone.json index a84773f..a674f8d 100644 --- a/assets/materials/Stone.json +++ b/assets/materials/Stone.json @@ -1,6 +1,5 @@ { "baseColorTexture": "Stone_BaseColor.png", - "metallic": 0, - "normalTexture": "Stone_Normal.png", - "roughness": 1 + "roughness": 1, + "metallic": 0 } diff --git a/assets/materials/StoneBricks.json b/assets/materials/StoneBricks.json new file mode 100644 index 0000000..c2eabed --- /dev/null +++ b/assets/materials/StoneBricks.json @@ -0,0 +1,5 @@ +{ + "baseColorTexture": "StoneBricks_BaseColor.png", + "roughness": 1, + "metallic": 0 +} diff --git a/assets/textures/Andesite_BaseColor.png b/assets/textures/Andesite_BaseColor.png new file mode 100644 index 0000000..7a3225e --- /dev/null +++ b/assets/textures/Andesite_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e835e98fb27f197309ae232335f80992a7830d373bc992ca6c499a0c385bb500 +size 279 diff --git a/assets/textures/Bricks_BaseColor.png b/assets/textures/Bricks_BaseColor.png index c11867d..1105a35 100644 --- a/assets/textures/Bricks_BaseColor.png +++ b/assets/textures/Bricks_BaseColor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95b3ec12069aaac729e25355a68664910c65cf61b0cb405e408d6a67dd217532 -size 498 +oid sha256:e01eea2bda1a0341e0adf4da82cc926ed453f858082087d77554e018a0f10638 +size 389 diff --git a/assets/textures/Bricks_Normal.png b/assets/textures/Bricks_Normal.png deleted file mode 100644 index 31481e1..0000000 --- a/assets/textures/Bricks_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7b1dc10fe620efdc035e4814e6f60b8154ea4f602861099776d2d7cfae45982 -size 2268 diff --git a/assets/textures/Bricks_OcclusionRoughnessMetallic.png b/assets/textures/Bricks_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..7e0f1bf --- /dev/null +++ b/assets/textures/Bricks_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a58538267835d8a9e5061cbb7744ffb49cc699593b2961603af9a888d51cc18 +size 125 diff --git a/assets/textures/ChiseledStoneBricks_BaseColor.png b/assets/textures/ChiseledStoneBricks_BaseColor.png new file mode 100644 index 0000000..92bdb28 --- /dev/null +++ b/assets/textures/ChiseledStoneBricks_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de82d7397574abc3ea59cb82cd016c935a92b45464998a1d4afac820c639eeb7 +size 464 diff --git a/assets/textures/CoalBlock_BaseColor.png b/assets/textures/CoalBlock_BaseColor.png new file mode 100644 index 0000000..e634706 --- /dev/null +++ b/assets/textures/CoalBlock_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d1ea73d3e781c06b3c3e5066e1944f0131634cb774cd3493bdc1416d8de46fe +size 601 diff --git a/assets/textures/CoalOre_BaseColor.png b/assets/textures/CoalOre_BaseColor.png new file mode 100644 index 0000000..71c6264 --- /dev/null +++ b/assets/textures/CoalOre_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:421cfd8fec55b5fb050a1704fe5dc36b03a25a8cbc84fa9b16c3e405d86b847a +size 540 diff --git a/assets/textures/CoalOre_OcclusionRoughnessMetallic.png b/assets/textures/CoalOre_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..a6cba29 --- /dev/null +++ b/assets/textures/CoalOre_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9551669297c4473a6f2d457820191cd4fda3bd92d7d71a36ddf851bd6cd0d766 +size 182 diff --git a/assets/textures/Cobblestone.png b/assets/textures/Cobblestone.png new file mode 100644 index 0000000..13fdd5d --- /dev/null +++ b/assets/textures/Cobblestone.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:510fbc62c0a4f76dc1ba9e8c6035366787e198b0a4b1fdbeb2bb68b8c6adcf4b +size 429 diff --git a/assets/textures/DiamondBlock_BaseColor.png b/assets/textures/DiamondBlock_BaseColor.png new file mode 100644 index 0000000..567ef4d --- /dev/null +++ b/assets/textures/DiamondBlock_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d6696563dd0580425ed20e9dc6560689c93bfbdb4360062bb4146581bbd4817 +size 294 diff --git a/assets/textures/DiamondOre_BaseColor.png b/assets/textures/DiamondOre_BaseColor.png new file mode 100644 index 0000000..c00e3ad --- /dev/null +++ b/assets/textures/DiamondOre_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff89cec82f149890f13d79e4e2fe1030d771f00b5b85cfea9cd6328db359efb2 +size 589 diff --git a/assets/textures/DiamondOre_OcclusionRoughnessMetallic.png b/assets/textures/DiamondOre_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..8ac59f2 --- /dev/null +++ b/assets/textures/DiamondOre_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca51bb279036da72c008580f3e30151c7f5a67986d596bc29d89746f984a305d +size 170 diff --git a/assets/textures/Diorite_BaseColor.png b/assets/textures/Diorite_BaseColor.png new file mode 100644 index 0000000..db0c7c5 --- /dev/null +++ b/assets/textures/Diorite_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7c356040683fa6b74d74e30842c32c06f7023465499f2ac40451c1df476d1f4 +size 280 diff --git a/assets/textures/Dirt_BaseColor.png b/assets/textures/Dirt_BaseColor.png index e1becfd..71ee276 100644 --- a/assets/textures/Dirt_BaseColor.png +++ b/assets/textures/Dirt_BaseColor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11b76f8a6f2bd32e734b41d030be8dc0a90fc7cc60930f081704108b82941110 -size 506 +oid sha256:2d30da51cbdc90d8f506f5735b80c0c186e36f185f1faffed6e2b826741baf55 +size 546 diff --git a/assets/textures/Dirt_Normal.png b/assets/textures/Dirt_Normal.png deleted file mode 100644 index 73e26c5..0000000 --- a/assets/textures/Dirt_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3efdf4e5c3f71c7579589d05da08ecd78a00d997dfc15ce7ee9bdb5085562394 -size 3263 diff --git a/assets/textures/Glass_BaseColor.png b/assets/textures/Glass_BaseColor.png new file mode 100644 index 0000000..a0d9036 --- /dev/null +++ b/assets/textures/Glass_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74be03edad3a104acbaf92b996d04a1c5a9ed9723cd7014a3409458a34373581 +size 369 diff --git a/assets/textures/Glass_OcclusionRoughnessMetallic.png b/assets/textures/Glass_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..91988f1 --- /dev/null +++ b/assets/textures/Glass_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a50b5918e6008b40565c68513df24b7852c38927c7a6bf7464fc7985a637579 +size 204 diff --git a/assets/textures/GoldBlock_BaseColor.png b/assets/textures/GoldBlock_BaseColor.png new file mode 100644 index 0000000..883fa6c --- /dev/null +++ b/assets/textures/GoldBlock_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32e8f2de221bc5cbc1f6988a57da09fb2c6d3cf8036ce7c768ffca1c31e0469a +size 238 diff --git a/assets/textures/GoldOre_BaseColor.png b/assets/textures/GoldOre_BaseColor.png new file mode 100644 index 0000000..8352512 --- /dev/null +++ b/assets/textures/GoldOre_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a99c56a3cd82120b2783401ce9f98f775660d10defefc10a72d1a9197863b005 +size 478 diff --git a/assets/textures/GoldOre_OcclusionRoughnessMetallic.png b/assets/textures/GoldOre_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..94c2238 --- /dev/null +++ b/assets/textures/GoldOre_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab35b5bc2141e53f67725cd286110210cbe4bf2e48993346661f55bdaaec68fd +size 161 diff --git a/assets/textures/Gold_BaseColor.png b/assets/textures/Gold_BaseColor.png deleted file mode 100644 index 1b6b737..0000000 --- a/assets/textures/Gold_BaseColor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c158e6647b2978e3b4f777f72845ccd3c8ab74a2a6d444b5604dc98519046d1a -size 502 diff --git a/assets/textures/Gold_Normal.png b/assets/textures/Gold_Normal.png deleted file mode 100644 index 7338cd7..0000000 --- a/assets/textures/Gold_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0419332c00de9212b7bc72a614c29df0f1c37076b0f71ef7e88b8d4a3c2e518 -size 1929 diff --git a/assets/textures/Granite_BaseColor.png b/assets/textures/Granite_BaseColor.png new file mode 100644 index 0000000..a372aa2 --- /dev/null +++ b/assets/textures/Granite_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cf06a75786d71449155d9f4630eb61962618ff46f036f20112c49bcbb67a5cd +size 294 diff --git a/assets/textures/Gravel_BaseColor.png b/assets/textures/Gravel_BaseColor.png new file mode 100644 index 0000000..4a89af2 --- /dev/null +++ b/assets/textures/Gravel_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06d1c6c441f0d7638b17b244562e8ae6db3f8fb795c20269de97f834f72bd61a +size 776 diff --git a/assets/textures/IronBlock_BaseColor.png b/assets/textures/IronBlock_BaseColor.png new file mode 100644 index 0000000..2a8333d --- /dev/null +++ b/assets/textures/IronBlock_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71ace6464ca028eaf25c23337d69456cf29fb6b634cf062b0d2c20718eda059f +size 241 diff --git a/assets/textures/IronOre_BaseColor.png b/assets/textures/IronOre_BaseColor.png new file mode 100644 index 0000000..68e496e --- /dev/null +++ b/assets/textures/IronOre_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d011997bae5436a0a1dbf3d983ae319a633ff12667a11739a22a18a99fed9fe +size 509 diff --git a/assets/textures/IronOre_OcclusionRoughnessMetallic.png b/assets/textures/IronOre_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..9565955 --- /dev/null +++ b/assets/textures/IronOre_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c767982f98ad6733c066a9f5ae97f0b8607a0e772835a199bef74cff4ab4d65 +size 289 diff --git a/assets/textures/OakLogTop_BaseColor.png b/assets/textures/OakLogTop_BaseColor.png new file mode 100644 index 0000000..f033afb --- /dev/null +++ b/assets/textures/OakLogTop_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5c28563ec9d4cfc35ae4c0aa48e02108d1120ca92204a4c3048e004dc386997 +size 421 diff --git a/assets/textures/OakLog_BaseColor.png b/assets/textures/OakLog_BaseColor.png new file mode 100644 index 0000000..d9372e6 --- /dev/null +++ b/assets/textures/OakLog_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0628c12eb49a27e1aae2e7b5c717817cca1a7b91e2611e511f32d782badef9bb +size 429 diff --git a/assets/textures/OakPlanks_BaseColor.png b/assets/textures/OakPlanks_BaseColor.png new file mode 100644 index 0000000..8f00a59 --- /dev/null +++ b/assets/textures/OakPlanks_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e7bf7b283ec4be4c951c0fef26d305b01d1f4f4698ffbfb806495799def40d6 +size 346 diff --git a/assets/textures/Sand_BaseColor.png b/assets/textures/Sand_BaseColor.png new file mode 100644 index 0000000..837e4a2 --- /dev/null +++ b/assets/textures/Sand_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbc5c6fccf2c3f9289425288743a0a3fe6d658fa546c570b8d190510f6366d8f +size 485 diff --git a/assets/textures/SmoothStone_BaseColor.png b/assets/textures/SmoothStone_BaseColor.png new file mode 100644 index 0000000..8802afd --- /dev/null +++ b/assets/textures/SmoothStone_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2e7a73e647b19940974a55d09b9d4c4e012d7a536ba88e71b36b01f7404dcc8 +size 395 diff --git a/assets/textures/StoneBricks_BaseColor.png b/assets/textures/StoneBricks_BaseColor.png new file mode 100644 index 0000000..9310956 --- /dev/null +++ b/assets/textures/StoneBricks_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce3892320ef7e9571ed979dba013f08b6b207cfc7561aaf5afef0c461cd90ef9 +size 336 diff --git a/assets/textures/Stone_BaseColor.png b/assets/textures/Stone_BaseColor.png index 5190d8c..c2cfc26 100644 --- a/assets/textures/Stone_BaseColor.png +++ b/assets/textures/Stone_BaseColor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb5b9494439e1f369d005324bd37b6e507ba9fbdc7519cdf5506794aac633716 -size 485 +oid sha256:fdba44c62bd9f9795c651f235795897005b66e00910f57503b4a5d0016a6da61 +size 320 diff --git a/assets/textures/Stone_Normal.png b/assets/textures/Stone_Normal.png deleted file mode 100644 index 0432ea3..0000000 --- a/assets/textures/Stone_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b7d2ded276d27f4eba1dc53feac1df1be8860e5a9c766dd0e1a0171f75b380b -size 2431 diff --git a/src/Game.zig b/src/Game.zig index f70372d..d152248 100644 --- a/src/Game.zig +++ b/src/Game.zig @@ -157,10 +157,7 @@ pub fn init(allocator: std.mem.Allocator, engine: *Engine, swapchain: *Swapchain var textures = try Textures.init(engine, allocator); errdefer textures.deinit(engine, allocator); - _ = try materials.getOrLoadFilename(engine, &textures, "Bricks.json", allocator); - _ = try materials.getOrLoadFilename(engine, &textures, "Dirt.json", allocator); - _ = try materials.getOrLoadFilename(engine, &textures, "Gold.json", allocator); - _ = try materials.getOrLoadFilename(engine, &textures, "Stone.json", allocator); + materials.loadAll(engine, &textures, allocator); const sampler = try engine.createSampler(.{ .mag_filter = .linear,