diff --git a/config/graphics.toml b/config/graphics.toml index ce24e2b..cbbe4e8 100644 --- a/config/graphics.toml +++ b/config/graphics.toml @@ -1 +1 @@ -msaa_samples = 8 \ No newline at end of file +msaa_samples = 4 \ No newline at end of file diff --git a/models/box.blend b/models/box.blend index c71eb95..f394279 100644 Binary files a/models/box.blend and b/models/box.blend differ diff --git a/models/box.gltf b/models/box.gltf index da22ead..f0e511f 100644 --- a/models/box.gltf +++ b/models/box.gltf @@ -1,6 +1,6 @@ { "asset" : { - "generator" : "Khronos glTF Blender I/O v1.4.40", + "generator" : "Khronos glTF Blender I/O v1.5.17", "version" : "2.0" }, "scene" : 0, @@ -18,6 +18,22 @@ "name" : "Cube" } ], + "materials" : [ + { + "doubleSided" : true, + "name" : "Cube", + "normalTexture" : { + "index" : 0 + }, + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 1 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.5 + } + } + ], "meshes" : [ { "name" : "Cube", @@ -29,11 +45,34 @@ "TANGENT" : 2, "TEXCOORD_0" : 3 }, - "indices" : 4 + "indices" : 4, + "material" : 0 } ] } ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + }, + { + "sampler" : 0, + "source" : 1 + } + ], + "images" : [ + { + "mimeType" : "image/jpeg", + "name" : "cobblestone_large_01_nor_4k", + "uri" : "textures/cobblestone_large_01_nor_4k.jpg" + }, + { + "mimeType" : "image/jpeg", + "name" : "cobblestone_large_01_diff_4k", + "uri" : "textures/cobblestone_large_01_diff_4k.jpg" + } + ], "accessors" : [ { "bufferView" : 0, @@ -103,6 +142,12 @@ "byteOffset" : 1152 } ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], "buffers" : [ { "byteLength" : 1224,