Legalize materials, add many more

assets/materials/Andesite.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "Andesite_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/Bricks.json

@@ -1,6 +1,4 @@
 {
     "baseColorTexture": "Bricks_BaseColor.png",
-    "metallic": 0,
-    "normalTexture": "Bricks_Normal.png",
-    "roughness": 1
+    "occlusionRoughnessMetallicTexture": "Bricks_OcclusionRoughnessMetallic.png"
 }

assets/materials/ChiseledStoneBricks.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "ChiseledStoneBricks_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/CoalBlock.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "CoalBlock_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/CoalOre.json

@@ -0,0 +1,4 @@
+{
+    "baseColorTexture": "CoalOre_BaseColor.png",
+    "occlusionRoughnessMetallicTexture": "CoalOre_OcclusionRoughnessMetallic.png"
+}

assets/materials/Cobblestone.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "Cobblestone_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/DiamondBlock.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "DiamonBlock_BaseColor.png",
+    "roughness": 0,
+    "metallic": 1
+}

assets/materials/DiamondOre.json

@@ -0,0 +1,4 @@
+{
+    "baseColorTexture": "DiamondOre_BaseColor.png",
+    "oclussionRoughnessMetallicTexture": "DiamondOre_OcclusionRoughnessMetallic.png"
+}

assets/materials/Diorite.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "Diorite_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/Dirt.json

@@ -1,6 +1,5 @@
 {
     "baseColorTexture": "Dirt_BaseColor.png",
-    "metallic": 0,
-    "normalTexture": "Dirt_Normal.png",
-    "roughness": 1
+    "roughness": 1,
+    "metallic": 0
 }

assets/materials/Glass.json

@@ -0,0 +1,4 @@
+{
+    "baseColorTexture": "Glass_BaseColor.png",
+    "occlusionRoughnessMetallicTexture": "Glass_OcclusionRoughnessMetallic.png"
+}

assets/materials/Gold.json

@@ -1,6 +0,0 @@
-{
-    "baseColorTexture": "Gold_BaseColor.png",
-    "metallic": 1,
-    "normalTexture": "Gold_Normal.png",
-    "roughness": 0
-}

assets/materials/GoldBlock.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "GoldBlock_BaseColor.png",
+    "roughness": 0,
+    "metallic": 1
+}

assets/materials/GoldOre.json

@@ -0,0 +1,4 @@
+{
+    "baseColorTexture": "GoldOre_BaseColor.png",
+    "occlusionRoughnessMetallicTexture": "GoldOre_OcclusionRoughnessMetallic.png"
+}

assets/materials/Granite.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "Granite_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/Gravel.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "Gravel_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/IronBlock.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "IronBlock_BaseColor.png",
+    "roughness": 0,
+    "metallic": 1
+}

assets/materials/IronOre.json

@@ -0,0 +1,4 @@
+{
+    "baseColorTexture": "IronOre_BaseColor.png",
+    "occlusionRoughnessMetallicTexture": "IronOre_OcclusionRoughnessMetallic.png"
+}

assets/materials/OakLog.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "OakLog_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/OakLogTop.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "OakLogTop_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/OakPlanks.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "OakPlanks_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/Sand.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "Sand_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/SmoothStone.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "SmoothStone_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

assets/materials/Stone.json

@@ -1,6 +1,5 @@
 {
     "baseColorTexture": "Stone_BaseColor.png",
-    "metallic": 0,
-    "normalTexture": "Stone_Normal.png",
-    "roughness": 1
+    "roughness": 1,
+    "metallic": 0
 }

assets/materials/StoneBricks.json

@@ -0,0 +1,5 @@
+{
+    "baseColorTexture": "StoneBricks_BaseColor.png",
+    "roughness": 1,
+    "metallic": 0
+}

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,