summaryrefslogtreecommitdiff
path: root/assets/models
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2023-09-14 19:24:43 -0400
committerJonathan Bradley <jcb@pikum.xyz>2023-09-14 19:41:41 -0400
commit2eb22f8debec811cdea32ed7b8cf3ec98c752f7c (patch)
tree2fb1181c8b1ab0c741db5d408fb9bffe9300f47e /assets/models
parentd7ce568e2baacc68424eae4adbb98ac5b126af21 (diff)
Load model textures checkpoint.
Refactors some Vulkan items related to CompGrBinds and EntityTypes. Adds some Vulkan globals related to textures. Adds a number of placeholder items: - Iffy use of setting Vulkan globals on instanced structs. - Unimplemented and inaccurate shaders - Iffy gltf sub-buffer logic (ignores vertex color data) - MipMap TODOs - TextureArray TODOs
Diffstat (limited to 'assets/models')
-rw-r--r--assets/models/cube.binbin840 -> 1224 bytes
-rw-r--r--assets/models/cube.gltf69
-rw-r--r--assets/models/cube.pngbin0 -> 182802 bytes
3 files changed, 49 insertions, 20 deletions
diff --git a/assets/models/cube.bin b/assets/models/cube.bin
index c59221c..6223cf0 100644
--- a/assets/models/cube.bin
+++ b/assets/models/cube.bin
Binary files differ
diff --git a/assets/models/cube.gltf b/assets/models/cube.gltf
index 5077394..9bc8a22 100644
--- a/assets/models/cube.gltf
+++ b/assets/models/cube.gltf
@@ -21,14 +21,11 @@
"materials":[
{
"doubleSided":true,
- "name":"Material",
+ "name":"Material.001",
"pbrMetallicRoughness":{
- "baseColorFactor":[
- 0.800000011920929,
- 0.800000011920929,
- 0.800000011920929,
- 1
- ],
+ "baseColorTexture":{
+ "index":0
+ },
"metallicFactor":0,
"roughnessFactor":0.5
}
@@ -36,25 +33,45 @@
],
"meshes":[
{
- "name":"Cube",
+ "name":"Cube.001",
"primitives":[
{
"attributes":{
- "POSITION":0,
- "NORMAL":1,
- "TEXCOORD_0":2
+ "COLOR_0":0,
+ "POSITION":1,
+ "NORMAL":2,
+ "TEXCOORD_0":3
},
- "indices":3,
+ "indices":4,
"material":0
}
]
}
],
+ "textures":[
+ {
+ "sampler":0,
+ "source":0
+ }
+ ],
+ "images":[
+ {
+ "mimeType":"image/png",
+ "name":"cube",
+ "uri":"cube.png"
+ }
+ ],
"accessors":[
{
"bufferView":0,
"componentType":5126,
"count":24,
+ "type":"VEC4"
+ },
+ {
+ "bufferView":1,
+ "componentType":5126,
+ "count":24,
"max":[
1,
1,
@@ -68,19 +85,19 @@
"type":"VEC3"
},
{
- "bufferView":1,
+ "bufferView":2,
"componentType":5126,
"count":24,
"type":"VEC3"
},
{
- "bufferView":2,
+ "bufferView":3,
"componentType":5126,
"count":24,
"type":"VEC2"
},
{
- "bufferView":3,
+ "bufferView":4,
"componentType":5123,
"count":36,
"type":"SCALAR"
@@ -89,32 +106,44 @@
"bufferViews":[
{
"buffer":0,
- "byteLength":288,
+ "byteLength":384,
"byteOffset":0,
"target":34962
},
{
"buffer":0,
"byteLength":288,
- "byteOffset":288,
+ "byteOffset":384,
+ "target":34962
+ },
+ {
+ "buffer":0,
+ "byteLength":288,
+ "byteOffset":672,
"target":34962
},
{
"buffer":0,
"byteLength":192,
- "byteOffset":576,
+ "byteOffset":960,
"target":34962
},
{
"buffer":0,
"byteLength":72,
- "byteOffset":768,
+ "byteOffset":1152,
"target":34963
}
],
+ "samplers":[
+ {
+ "magFilter":9729,
+ "minFilter":9987
+ }
+ ],
"buffers":[
{
- "byteLength":840,
+ "byteLength":1224,
"uri":"cube.bin"
}
]
diff --git a/assets/models/cube.png b/assets/models/cube.png
new file mode 100644
index 0000000..74a7e29
--- /dev/null
+++ b/assets/models/cube.png
Binary files differ