Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lighting support in the batch renderer #1970

Merged
merged 8 commits into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions data/test_assets/scenes/batch-four-squares-compressed.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"generator": "Magnum GltfSceneConverter"
},
"extensionsUsed": [
"KHR_materials_unlit",
"KHR_texture_ktx",
"KHR_texture_transform"
],
Expand Down Expand Up @@ -133,7 +134,10 @@
"index": 0
}
},
"name": "checkerboard"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat checkerboard"
},
{
"pbrMetallicRoughness": {
Expand All @@ -148,7 +152,10 @@
}
}
},
"name": "cyan"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat cyan"
},
{
"pbrMetallicRoughness": {
Expand All @@ -163,7 +170,10 @@
}
}
},
"name": "magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat magenta"
},
{
"pbrMetallicRoughness": {
Expand All @@ -177,7 +187,10 @@
}
}
},
"name": "yellow"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat yellow"
}
],
"samplers": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"generator": "Magnum GltfSceneConverter"
},
"extensionsUsed": [
"KHR_materials_unlit",
"KHR_texture_ktx",
"KHR_texture_transform"
],
Expand Down Expand Up @@ -138,7 +139,10 @@
"index": 0
}
},
"name": "checkerboard"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat checkerboard"
},
{
"pbrMetallicRoughness": {
Expand All @@ -153,7 +157,10 @@
}
}
},
"name": "cyan"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat cyan"
},
{
"pbrMetallicRoughness": {
Expand All @@ -168,7 +175,10 @@
}
}
},
"name": "magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat magenta"
},
{
"pbrMetallicRoughness": {
Expand All @@ -182,7 +192,10 @@
}
}
},
"name": "yellow"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat yellow"
}
],
"samplers": [
Expand Down
21 changes: 17 additions & 4 deletions data/test_assets/scenes/batch-four-squares.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"generator": "Magnum GltfSceneConverter"
},
"extensionsUsed": [
"KHR_materials_unlit",
"KHR_texture_ktx",
"KHR_texture_transform"
],
Expand Down Expand Up @@ -138,7 +139,10 @@
"index": 0
}
},
"name": "checkerboard"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat checkerboard"
},
{
"pbrMetallicRoughness": {
Expand All @@ -153,7 +157,10 @@
}
}
},
"name": "cyan"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat cyan"
},
{
"pbrMetallicRoughness": {
Expand All @@ -168,7 +175,10 @@
}
}
},
"name": "magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat magenta"
},
{
"pbrMetallicRoughness": {
Expand All @@ -182,7 +192,10 @@
}
}
},
"name": "yellow"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat yellow"
}
],
"samplers": [
Expand Down
26 changes: 21 additions & 5 deletions data/test_assets/scenes/batch-multiple-meshes.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"generator": "Magnum GltfSceneConverter"
},
"extensionsUsed": [
"KHR_materials_unlit",
"KHR_texture_ktx",
"KHR_texture_transform"
],
Expand Down Expand Up @@ -262,7 +263,10 @@
"index": 0
}
},
"name": "checkerboard"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat checkerboard"
},
{
"pbrMetallicRoughness": {
Expand All @@ -277,7 +281,10 @@
}
}
},
"name": "cyan"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat cyan"
},
{
"pbrMetallicRoughness": {
Expand All @@ -292,7 +299,10 @@
}
}
},
"name": "magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat magenta"
},
{
"pbrMetallicRoughness": {
Expand All @@ -306,7 +316,10 @@
}
}
},
"name": "yellow"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat yellow"
},
{
"pbrMetallicRoughness": {
Expand All @@ -320,7 +333,10 @@
}
}
},
"name": "vertex-color magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat vertex-color magenta"
}
],
"samplers": [
Expand Down
23 changes: 18 additions & 5 deletions data/test_assets/scenes/batch-multiple-textures.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"generator": "Magnum GltfSceneConverter"
},
"extensionsUsed": [
"MAGNUMX_mesh_views"
"MAGNUMX_mesh_views",
"KHR_materials_unlit"
],
"extensionsRequired": [
"MAGNUMX_mesh_views"
Expand Down Expand Up @@ -107,7 +108,10 @@
"index": 0
}
},
"name": "checkerboard"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat checkerboard"
},
{
"pbrMetallicRoughness": {
Expand All @@ -116,7 +120,10 @@
"index": 1
}
},
"name": "cyan"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat cyan"
},
{
"pbrMetallicRoughness": {
Expand All @@ -125,7 +132,10 @@
"index": 2
}
},
"name": "magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat magenta"
},
{
"pbrMetallicRoughness": {
Expand All @@ -134,7 +144,10 @@
"index": 3
}
},
"name": "yellow"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat yellow"
}
],
"samplers": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"generator": "Magnum GltfSceneConverter"
},
"extensionsUsed": [
"MAGNUMX_mesh_views"
"MAGNUMX_mesh_views",
"KHR_materials_unlit"
],
"extensionsRequired": [
"MAGNUMX_mesh_views"
Expand Down Expand Up @@ -87,19 +88,28 @@
"index": 0
}
},
"name": "checkerboard"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat checkerboard"
},
{
"pbrMetallicRoughness": {
"baseColorFactor": [0, 0.8, 0.8, 1]
},
"name": "cyan"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat cyan"
},
{
"pbrMetallicRoughness": {
"baseColorFactor": [0.8, 0, 0.8, 1]
},
"name": "magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat magenta"
}
],
"samplers": [
Expand Down
18 changes: 14 additions & 4 deletions data/test_assets/scenes/batch-square-circle-triangle.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"generator": "Magnum GltfSceneConverter"
},
"extensionsUsed": [
"MAGNUMX_mesh_views"
"MAGNUMX_mesh_views",
"KHR_materials_unlit"
],
"extensionsRequired": [
"MAGNUMX_mesh_views"
Expand Down Expand Up @@ -92,19 +93,28 @@
"index": 0
}
},
"name": "checkerboard"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat checkerboard"
},
{
"pbrMetallicRoughness": {
"baseColorFactor": [0, 0.8, 0.8, 1]
},
"name": "cyan"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat cyan"
},
{
"pbrMetallicRoughness": {
"baseColorFactor": [0.8, 0, 0.8, 1]
},
"name": "magenta"
"extensions": {
"KHR_materials_unlit": {}
},
"name": "flat magenta"
}
],
"samplers": [
Expand Down
Binary file modified data/test_assets/scenes/batch.bin
Binary file not shown.
Loading