diff --git a/assets/materials/DiamondBlock.json b/assets/materials/DiamondBlock.json index 9344c6a..ee352f9 100644 --- a/assets/materials/DiamondBlock.json +++ b/assets/materials/DiamondBlock.json @@ -1,5 +1,5 @@ { - "baseColorTexture": "DiamonBlock_BaseColor.png", + "baseColorTexture": "DiamondBlock_BaseColor.png", "roughness": 0, "metallic": 1 } diff --git a/assets/materials/DiamondOre.json b/assets/materials/DiamondOre.json index 273875c..20677a6 100644 --- a/assets/materials/DiamondOre.json +++ b/assets/materials/DiamondOre.json @@ -1,4 +1,4 @@ { "baseColorTexture": "DiamondOre_BaseColor.png", - "oclussionRoughnessMetallicTexture": "DiamondOre_OcclusionRoughnessMetallic.png" + "occlusionRoughnessMetallicTexture": "DiamondOre_OcclusionRoughnessMetallic.png" } diff --git a/assets/textures/Cobblestone.png b/assets/textures/Cobblestone_BaseColor.png similarity index 100% rename from assets/textures/Cobblestone.png rename to assets/textures/Cobblestone_BaseColor.png diff --git a/src/main.zig b/src/main.zig index de04af0..0a77c28 100644 --- a/src/main.zig +++ b/src/main.zig @@ -11,6 +11,10 @@ const Engine = @import("engine/Engine.zig"); const Swapchain = @import("engine/Swapchain.zig"); const Game = @import("Game.zig"); +pub const std_options: std.Options = .{ + .log_level = .info, +}; + pub fn main() !void { var gpa: std.heap.GeneralPurposeAllocator(.{}) = .init; defer _ = gpa.deinit(); diff --git a/src/voxel.zig b/src/voxel.zig index e769261..a15c74d 100644 --- a/src/voxel.zig +++ b/src/voxel.zig @@ -1,3 +1,5 @@ +const Materials = @import("assets/Materials.zig"); + pub const Orientation = enum(u4) { negative_x, positive_x, @@ -15,7 +17,7 @@ pub const Orientation = enum(u4) { // ┌┴─┐┌┴─┐ ┌┴─┐┌┴─┐ ┌┴──────────────┐ // 10987654 32109876 54321098 76543210 pub const Wall = packed struct(u32) { - material: u16, + material: Materials.Id, orientation: Orientation, z: u4, y: u4,