annotate tests/test_gltf.nim @ 1448:96753bec055c default tip

add: support for "name" and "extras" on gltf nodes
author sam <sam@basx.dev>
date Sun, 09 Mar 2025 22:59:34 +0700
parents 676fc13685a9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1299
6d0162bfe48a did: finish mentioned refactoring, no API changes still
sam <sam@basx.dev>
parents: 1283
diff changeset
1 import std/math
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
2 import std/sequtils
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
3 import std/monotimes
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
4 import std/times
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
5 import std/options
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
6
1267
4cf9872f7bb6 did: rename back to old name (no v2)
sam <sam@basx.dev>
parents: 1259
diff changeset
7 import ../semicongine
1427
676fc13685a9 did: restructure files and imports
sam <sam@basx.dev>
parents: 1423
diff changeset
8 import ../semicongine/rendering
676fc13685a9 did: restructure files and imports
sam <sam@basx.dev>
parents: 1423
diff changeset
9 import ../semicongine/loaders
676fc13685a9 did: restructure files and imports
sam <sam@basx.dev>
parents: 1423
diff changeset
10 import ../semicongine/input
1448
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
11 import ../semicongine/gltf
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
12
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
13 proc test_gltf(time: float32, renderPass: RenderPass) =
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
14 var renderdata = initRenderData()
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
15
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
16 type
1253
c4f98eb4bb05 fix: a few things
sam <sam@basx.dev>
parents: 1251
diff changeset
17 ObjectData = object
c4f98eb4bb05 fix: a few things
sam <sam@basx.dev>
parents: 1251
diff changeset
18 transform: Mat4
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
19 materialId: int32
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
20
1253
c4f98eb4bb05 fix: a few things
sam <sam@basx.dev>
parents: 1251
diff changeset
21 Camera = object
1258
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
22 view: Mat4
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
23 normal: Mat4
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
24 projection: Mat4
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
25
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
26 Material = object
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
27 color: Vec4f = vec4(1, 1, 1, 1)
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
28 # colorTexture: int32 = -1
1248
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
29 metallic: float32 = 0
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
30 roughness: float32 = 0
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
31 # metallicRoughnessTexture: int32 = -1
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
32 # normalTexture: int32 = -1
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
33 # occlusionTexture: int32 = -1
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
34 emissive: Vec4f = vec4(0, 0, 0, 0) # emissiveTexture: int32 = -1
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
35
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
36 MainDescriptors = object
1278
772bb32c4368 replcae lodepng with stb_image, some cleanup
sam <sam@basx.dev>
parents: 1267
diff changeset
37 materials: array[50, GPUValue[Material, UniformBuffer]]
1253
c4f98eb4bb05 fix: a few things
sam <sam@basx.dev>
parents: 1251
diff changeset
38 camera: GPUValue[Camera, UniformBufferMapped]
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
39
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
40 Shader = object
1323
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
41 objectData {.PushConstant.}: ObjectData
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
42 position {.VertexAttribute.}: Vec3f
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
43 color {.VertexAttribute.}: Vec4f
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
44 normal {.VertexAttribute.}: Vec3f
1258
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
45 fragmentPosition {.Pass.}: Vec3f
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
46 fragmentColor {.Pass.}: Vec4f
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
47 fragmentNormal {.Pass.}: Vec3f
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
48 outColor {.ShaderOutput.}: Vec4f
1323
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
49 descriptors {.DescriptorSet: 0.}: MainDescriptors
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
50 # code
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
51 vertexCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
52 """
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
53 void main() {
1258
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
54 mat4 modelView = objectData.transform * camera.view;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
55 mat3 normalMat = mat3(transpose(inverse(objectData.transform)));
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
56 vec4 posTransformed = vec4(position, 1) * modelView;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
57 fragmentPosition = posTransformed.xyz / posTransformed.w;
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
58 fragmentColor = color * materials[objectData.materialId].color;
1258
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
59 fragmentNormal = normal * normalMat;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
60 gl_Position = vec4(position, 1) * (modelView * camera.projection);
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
61 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
62 fragmentCode: string =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
63 """
1258
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
64 const vec3 lightPosition = vec3(7, 9, -12);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
65 const float shininess = 40;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
66 const vec3 ambientColor = vec3(0, 0, 0);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
67 const vec3 lightColor = vec3(1, 1, 1);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
68 // const vec3 specColor = vec3(1, 1, 1);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
69 const float lightPower = 20;
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
70 void main() {
1258
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
71 // some setup
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
72 vec3 normal = normalize(fragmentNormal);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
73 vec3 lightDir = lightPosition - fragmentPosition;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
74 float dist = length(lightDir);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
75 lightDir = normalize(lightDir);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
76
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
77 float lambertian = max(dot(lightDir, normal), 0);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
78 float specular = 0;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
79
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
80 // blinn-phong
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
81 if (lambertian > 0) {
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
82 vec3 viewDir = normalize(-fragmentPosition);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
83 vec3 halfDir = normalize(lightDir + viewDir);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
84 float specAngle = max(dot(halfDir, normal), 0.0);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
85 specular = pow(specAngle, shininess);
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
86 }
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
87
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
88 vec3 diffuseColor = fragmentColor.rgb;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
89 vec3 specColor = diffuseColor;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
90 vec3 color = ambientColor + diffuseColor * lambertian * lightColor * lightPower / dist + specColor * specular * lightColor * lightPower / dist;
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
91
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
92 outColor = vec4(color, fragmentColor.a);
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
93 }"""
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
94
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
95 Mesh = object
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
96 position: GPUArray[Vec3f, VertexBuffer]
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
97 color: GPUArray[Vec4f, VertexBuffer]
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
98 normal: GPUArray[Vec3f, VertexBuffer]
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
99 indices: GPUArray[uint32, IndexBuffer]
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
100
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
101 var gltfData = loadMeshes[Mesh, Material](
1259
a13509ede62a fix: use old model for test, for now
sam <sam@basx.dev>
parents: 1258
diff changeset
102 "town.glb",
a13509ede62a fix: use old model for test, for now
sam <sam@basx.dev>
parents: 1258
diff changeset
103 # "forest.glb",
1248
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
104 MeshAttributeNames(
1448
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
105 POSITION: "position", COLOR: @["color"], NORMAL: "normal", indices: "indices"
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
106 ),
1248
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
107 MaterialAttributeNames(
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
108 baseColorFactor: "color",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
109 baseColorTexture: "colorTexture",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
110 metallicFactor: "metallic",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
111 roughnessFactor: "roughness",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
112 metallicRoughnessTexture: "metallicRoughnessTexture",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
113 normalTexture: "normalTexture",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
114 occlusionTexture: "occlusionTexture",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
115 emissiveTexture: "emissiveTexture",
317bb5a73606 did: continue on gltf importer
sam <sam@basx.dev>
parents: 1247
diff changeset
116 emissiveFactor: "emissive",
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
117 ),
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
118 )
1323
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
119 var descriptors = asDescriptorSetData(
1253
c4f98eb4bb05 fix: a few things
sam <sam@basx.dev>
parents: 1251
diff changeset
120 MainDescriptors(
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
121 camera: asGPUValue(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
122 Camera(view: Unit4, normal: Unit4, projection: Unit4), UniformBufferMapped
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
123 )
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
124 )
1253
c4f98eb4bb05 fix: a few things
sam <sam@basx.dev>
parents: 1251
diff changeset
125 )
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
126 for i in 0 ..< gltfData.materials.len:
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
127 descriptors.data.materials[i] = asGPUValue(gltfData.materials[i], UniformBuffer)
1251
3f98ad20a9d3 add: render by-node instead of by-mesh
sam <sam@basx.dev>
parents: 1249
diff changeset
128 for mesh in mitems(gltfData.meshes):
1448
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
129 for primitive in mitems(mesh.primitives):
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
130 primitive.data.color = asGPUArray(
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
131 newSeqWith(primitive.data.position.data.len, vec4(1, 1, 1, 1)), VertexBuffer
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
132 )
1448
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
133 renderdata.assignBuffers(primitive.data)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
134 renderdata.assignBuffers(descriptors)
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
135
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
136 var pipeline = createPipeline(Shader(), renderPass = renderPass, cullMode = [])
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
137 initDescriptorSet(renderdata, pipeline.descriptorSetLayouts[0], descriptors)
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
138
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
139 renderdata.flushAllMemory()
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
140
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
141 proc drawNode(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
142 commandbuffer: VkCommandBuffer, pipeline: Pipeline, nodeId: int, transform: Mat4
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
143 ) =
1251
3f98ad20a9d3 add: render by-node instead of by-mesh
sam <sam@basx.dev>
parents: 1249
diff changeset
144 let nodeTransform = gltfData.nodes[nodeId].transform * transform
3f98ad20a9d3 add: render by-node instead of by-mesh
sam <sam@basx.dev>
parents: 1249
diff changeset
145 if gltfData.nodes[nodeId].mesh >= 0:
1448
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
146 for primitive in gltfData.meshes[gltfData.nodes[nodeId].mesh].primitives:
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
147 renderWithPushConstant(
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
148 commandbuffer = commandbuffer,
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
149 pipeline = pipeline,
1448
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
150 mesh = primitive.data,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
151 pushConstant =
1448
96753bec055c add: support for "name" and "extras" on gltf nodes
sam <sam@basx.dev>
parents: 1427
diff changeset
152 ObjectData(transform: nodeTransform, materialId: primitive.material.int32),
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
153 )
1251
3f98ad20a9d3 add: render by-node instead of by-mesh
sam <sam@basx.dev>
parents: 1249
diff changeset
154 for childNode in gltfData.nodes[nodeId].children:
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
155 drawNode(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
156 commandbuffer = commandbuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
157 pipeline = pipeline,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
158 nodeId = childNode,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
159 transform = nodeTransform,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
160 )
1251
3f98ad20a9d3 add: render by-node instead of by-mesh
sam <sam@basx.dev>
parents: 1249
diff changeset
161
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
162 var camPos: Vec3f
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
163 var camYaw: float32
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
164 var camPitch: float32
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
165
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
166 discard updateInputs() # clear inputs, otherwise MouseMove will have stuff
1251
3f98ad20a9d3 add: render by-node instead of by-mesh
sam <sam@basx.dev>
parents: 1249
diff changeset
167
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
168 var start = getMonoTime()
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
169 var lastT = getMonoTime()
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
170 while ((getMonoTime() - start).inMilliseconds().int / 1000) < time and updateInputs():
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
171 let dt = ((getMonoTime() - lastT).inNanoseconds().int / 1_000_000_000).float32
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
172 lastT = getMonoTime()
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
173
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
174 camYaw += mouseMove().x.float32 / 1000'f32
1306
7be3628298f5 did: reworked locked mouse
sam <sam@basx.dev>
parents: 1305
diff changeset
175 camPitch += mouseMove().y.float32 / 1000'f32
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
176 var
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
177 forward = 0'f32
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
178 sideward = 0'f32
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
179 if keyIsDown(W):
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
180 forward += 2
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
181 if keyIsDown(S):
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
182 forward -= 2
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
183 if keyIsDown(A):
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
184 sideward -= 2
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
185 if keyIsDown(D):
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
186 sideward += 2
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
187
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
188 let camDir = (rotate(camYaw, Y) * rotate(camPitch, X)) * Z
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
189 let camDirSide = camDir.cross(-Y).normalized
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
190 camPos += camDir * forward * dt
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
191 camPos += camDirSide * sideward * dt
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
192
1280
a89a70ea3da2 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1277
diff changeset
193 let view = rotate(-camPitch, X) * rotate(-camYaw, Y) * translate(-camPos)
1258
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
194 descriptors.data.camera.data.view = view
5442d0e9d8ff did: improve testing lighting, try new glb model (need to add jpeg support first)
sam <sam@basx.dev>
parents: 1257
diff changeset
195 descriptors.data.camera.data.normal = view
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
196 descriptors.data.camera.data.projection =
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
197 projection(PI / 2, aspect = getAspectRatio(), zNear = 0.01, zFar = 20)
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
198
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
199 updateGPUBuffer(descriptors.data.camera)
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
200
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
201 withNextFrame(framebuffer, commandbuffer):
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
202 withRenderPass(
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
203 renderPass,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
204 framebuffer,
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
205 commandbuffer,
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
206 frameWidth(),
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
207 frameHeight(),
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
208 vec4(0, 0, 0, 0),
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
209 ):
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
210 withPipeline(commandbuffer, pipeline):
1323
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
211 bindDescriptorSet(commandbuffer, descriptors, 0, pipeline)
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
212 for nodeId in gltfData.scenes[0]:
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
213 drawNode(
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
214 commandbuffer = commandbuffer,
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
215 pipeline = pipeline,
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
216 nodeId = nodeId,
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
217 transform = rotate(PI / 2, Z),
1323
3ba2c180e52c fix: missing changes in tests
sam <sam@basx.dev>
parents: 1321
diff changeset
218 )
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
219
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
220 # cleanup
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
221 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
222 destroyPipeline(pipeline)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
223 destroyRenderData(renderdata)
1255
2b5ca798f6d6 did: make example town loadable and renderable, yay!
sam <sam@basx.dev>
parents: 1254
diff changeset
224
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
225 when isMainModule:
1254
b0f4c8ccd49a did: stuff to test gltf importer
sam <sam@basx.dev>
parents: 1253
diff changeset
226 var time = 1000'f32
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
227 initEngine("Test glTF")
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
228
1332
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
229 var renderpass = createDirectPresentationRenderPass(
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
230 depthBuffer = true, samples = VK_SAMPLE_COUNT_4_BIT
df3c075e5dea did: formatting
sam <sam@basx.dev>
parents: 1323
diff changeset
231 )
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
232 setupSwapchain(renderpass = renderpass)
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
233 lockMouse(true)
1305
21c4e598d820 did: work on cursor issues, but now sync unfinished things to notebook
sam <sam@basx.dev>
parents: 1299
diff changeset
234 # showSystemCursor(false)
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
235
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
236 # tests a simple triangle with minimalistic shader and vertex format
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
237 test_gltf(time, renderpass)
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
238
1423
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
239 checkVkResult vkDeviceWaitIdle(engine().vulkan.device)
3b8a736c45a7 did: put almost all global state into a single struct
sam <sam@basx.dev>
parents: 1414
diff changeset
240 destroyRenderPass(renderpass)
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
241 clearSwapchain()
1247
c15770761865 add: gltf loading test, gltf loading for materials
sam <sam@basx.dev>
parents:
diff changeset
242
1283
0369fa1ffbd9 did: undo part of stupid API renaming a few weeks back ;(
sam <sam@basx.dev>
parents: 1281
diff changeset
243 destroyVulkan()