From 294616ccdbc57ba7bb4d745b6176ae9b17f99571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Susanne=20D=C3=B6tsch?= <susannedoetsch@uni-koblenz.de>
Date: Wed, 16 Jun 2021 09:35:52 +0200
Subject: [PATCH] [#63] First Scene WIP
Also added some test files
---
include/vkcv/VertexLayout.hpp | 3 ++-
modules/asset_loader/src/vkcv/asset/asset_loader.cpp | 2 ++
.../resources/Cutlery/Cutlery_chrome_BaseColor.png | 3 +++
.../first_scene/resources/Cutlery/Cutlery_chrome_Normal.png | 3 +++
.../resources/Cutlery/Cutlery_details_BaseColor.png | 3 +++
.../first_scene/resources/Cutlery/Cutlery_details_Normal.png | 3 +++
.../Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png | 3 +++
.../resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png | 3 +++
.../Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png | 3 +++
.../Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png | 3 +++
.../resources/Cutlery/Plates_Ceramic_BaseColor.png | 3 +++
.../first_scene/resources/Cutlery/Plates_Ceramic_Normal.png | 3 +++
.../Plates_Details_BaseColor-Plates_Details_BaseColor.png | 3 +++
.../first_scene/resources/Cutlery/Plates_Details_Normal.png | 3 +++
.../resources/Cutlery/ToffeeJar_Label_BaseColor.png | 3 +++
.../first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png | 3 +++
.../resources/Cutlery/TransparentGlass_BaseColor.png | 3 +++
.../first_scene/resources/Cutlery/TransparentGlass_Normal.png | 3 +++
projects/first_scene/resources/Cutlery/cutlerySzene.bin | 3 +++
projects/first_scene/resources/Cutlery/cutlerySzene.glb | 3 +++
projects/first_scene/resources/Cutlery/cutlerySzene.gltf | 3 +++
.../first_scene/resources/Sponza/Sponta_20_keine_blumen.bin | 3 +++
.../first_scene/resources/Sponza/Sponta_20_keine_blumen.gltf | 3 +++
projects/first_scene/resources/Sponza/Sponza.bin | 3 +++
projects/first_scene/resources/Sponza/Sponza.gltf | 3 +++
projects/first_scene/resources/Sponza/background.png | 3 +++
projects/first_scene/resources/Sponza/chain_texture.png | 3 +++
projects/first_scene/resources/Sponza/lion.png | 3 +++
projects/first_scene/resources/Sponza/spnza_bricks_a_diff.png | 3 +++
projects/first_scene/resources/Sponza/sponza_arch_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_ceiling_a_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_column_a_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_column_b_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_column_c_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_curtain_blue_diff.png | 3 +++
projects/first_scene/resources/Sponza/sponza_curtain_diff.png | 3 +++
.../resources/Sponza/sponza_curtain_green_diff.png | 3 +++
projects/first_scene/resources/Sponza/sponza_details_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_fabric_blue_diff.png | 3 +++
projects/first_scene/resources/Sponza/sponza_fabric_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_fabric_green_diff.png | 3 +++
.../first_scene/resources/Sponza/sponza_flagpole_diff.png | 3 +++
projects/first_scene/resources/Sponza/sponza_floor_a_diff.png | 3 +++
projects/first_scene/resources/Sponza/sponza_roof_diff.png | 3 +++
projects/first_scene/resources/Sponza/sponza_thorn_diff.png | 3 +++
projects/first_scene/resources/Sponza/vase_dif.png | 3 +++
projects/first_scene/resources/Sponza/vase_hanging.png | 3 +++
projects/first_scene/resources/Sponza/vase_plant.png | 3 +++
projects/first_scene/resources/Sponza/vase_round.png | 3 +++
projects/first_scene/resources/cube/boards2_vcyc_jpg.jpg | 3 ---
projects/first_scene/resources/cube/cube.bin | 3 ---
projects/first_scene/resources/cube/cube.blend | 3 ---
projects/first_scene/resources/cube/cube.blend1 | 3 ---
projects/first_scene/resources/cube/cube.glb | 3 ---
projects/first_scene/resources/cube/cube.gltf | 3 ---
projects/first_scene/resources/triangle/Triangle.bin | 3 ---
projects/first_scene/resources/triangle/Triangle.blend | 3 ---
projects/first_scene/resources/triangle/Triangle.glb | 3 ---
projects/first_scene/resources/triangle/Triangle.gltf | 3 ---
projects/first_scene/src/main.cpp | 4 ++--
60 files changed, 147 insertions(+), 33 deletions(-)
create mode 100644 projects/first_scene/resources/Cutlery/Cutlery_chrome_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/Cutlery_chrome_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/Cutlery_details_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/Cutlery_details_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/Plates_Ceramic_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/Plates_Ceramic_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/Plates_Details_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/ToffeeJar_Label_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/TransparentGlass_BaseColor.png
create mode 100644 projects/first_scene/resources/Cutlery/TransparentGlass_Normal.png
create mode 100644 projects/first_scene/resources/Cutlery/cutlerySzene.bin
create mode 100644 projects/first_scene/resources/Cutlery/cutlerySzene.glb
create mode 100644 projects/first_scene/resources/Cutlery/cutlerySzene.gltf
create mode 100644 projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.bin
create mode 100644 projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.gltf
create mode 100644 projects/first_scene/resources/Sponza/Sponza.bin
create mode 100644 projects/first_scene/resources/Sponza/Sponza.gltf
create mode 100644 projects/first_scene/resources/Sponza/background.png
create mode 100644 projects/first_scene/resources/Sponza/chain_texture.png
create mode 100644 projects/first_scene/resources/Sponza/lion.png
create mode 100644 projects/first_scene/resources/Sponza/spnza_bricks_a_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_arch_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_ceiling_a_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_column_a_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_column_b_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_column_c_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_curtain_blue_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_curtain_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_curtain_green_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_details_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_fabric_blue_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_fabric_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_fabric_green_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_flagpole_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_floor_a_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_roof_diff.png
create mode 100644 projects/first_scene/resources/Sponza/sponza_thorn_diff.png
create mode 100644 projects/first_scene/resources/Sponza/vase_dif.png
create mode 100644 projects/first_scene/resources/Sponza/vase_hanging.png
create mode 100644 projects/first_scene/resources/Sponza/vase_plant.png
create mode 100644 projects/first_scene/resources/Sponza/vase_round.png
delete mode 100644 projects/first_scene/resources/cube/boards2_vcyc_jpg.jpg
delete mode 100644 projects/first_scene/resources/cube/cube.bin
delete mode 100644 projects/first_scene/resources/cube/cube.blend
delete mode 100644 projects/first_scene/resources/cube/cube.blend1
delete mode 100644 projects/first_scene/resources/cube/cube.glb
delete mode 100644 projects/first_scene/resources/cube/cube.gltf
delete mode 100644 projects/first_scene/resources/triangle/Triangle.bin
delete mode 100644 projects/first_scene/resources/triangle/Triangle.blend
delete mode 100644 projects/first_scene/resources/triangle/Triangle.glb
delete mode 100644 projects/first_scene/resources/triangle/Triangle.gltf
diff --git a/include/vkcv/VertexLayout.hpp b/include/vkcv/VertexLayout.hpp
index 247bb478..c9388d9d 100644
--- a/include/vkcv/VertexLayout.hpp
+++ b/include/vkcv/VertexLayout.hpp
@@ -12,7 +12,8 @@ enum class PrimitiveType : uint32_t {
UNDEFINED = 0,
POSITION = 1,
NORMAL = 2,
- TEXCOORD_0 = 3
+ TEXCOORD_0 = 3,
+ TEXCOORD_1 = 4
};
/* These integer values are used the same way in OpenGL, Vulkan and glTF. This
diff --git a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
index 41002a3c..6f664931 100644
--- a/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
+++ b/modules/asset_loader/src/vkcv/asset/asset_loader.cpp
@@ -354,6 +354,8 @@ int loadScene(const std::string &path, Scene &scene){
attribute.type = PrimitiveType::NORMAL;
} else if (attrib.first == "TEXCOORD_0") {
attribute.type = PrimitiveType::TEXCOORD_0;
+ } else if (attrib.first == "TEXCOORD_1") {
+ attribute.type = PrimitiveType::TEXCOORD_1;
} else {
return 0;
}
diff --git a/projects/first_scene/resources/Cutlery/Cutlery_chrome_BaseColor.png b/projects/first_scene/resources/Cutlery/Cutlery_chrome_BaseColor.png
new file mode 100644
index 00000000..8258525f
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Cutlery_chrome_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ce87f6407ee40ffa60983587aeb52333d59b4b1c01a53e11f4bb227ba1099d9
+size 109
diff --git a/projects/first_scene/resources/Cutlery/Cutlery_chrome_Normal.png b/projects/first_scene/resources/Cutlery/Cutlery_chrome_Normal.png
new file mode 100644
index 00000000..620fe762
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Cutlery_chrome_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68a0064d457a6f7994814b07d943deda778754128935689874334300ede6161d
+size 2332064
diff --git a/projects/first_scene/resources/Cutlery/Cutlery_details_BaseColor.png b/projects/first_scene/resources/Cutlery/Cutlery_details_BaseColor.png
new file mode 100644
index 00000000..5570e88c
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Cutlery_details_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42c2715635081eb29c4489ce631798b0e9c881460efc0aa63d0e81641a0dcfe9
+size 108
diff --git a/projects/first_scene/resources/Cutlery/Cutlery_details_Normal.png b/projects/first_scene/resources/Cutlery/Cutlery_details_Normal.png
new file mode 100644
index 00000000..d07681f5
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Cutlery_details_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15b0133e140899c47ccf35b0f99a7e337e3110ae089f45d27faf9983f3e0a1f7
+size 770758
diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png
new file mode 100644
index 00000000..1845e8a7
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea7c82c0f9e25afa401470df1fb6903f508fa138d21ad30f57a9153b0395b198
+size 521315
diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png
new file mode 100644
index 00000000..1c800c04
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:119efbbc020244ff9b7ff16ac9795a6d4b1808d1b90d81d20d2c874d0dc8a924
+size 1693468
diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png
new file mode 100644
index 00000000..36f46ebf
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99896468c7d47dd5391d585eecf149f420eca3bfec31923c21fa86c45fe02d0f
+size 108
diff --git a/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png
new file mode 100644
index 00000000..28c205d4
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Glass_Wine_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b31618aa5adce4ad476bec2c03718c5ae097250e784344f2d298b8a74c3bfd46
+size 90
diff --git a/projects/first_scene/resources/Cutlery/Plates_Ceramic_BaseColor.png b/projects/first_scene/resources/Cutlery/Plates_Ceramic_BaseColor.png
new file mode 100644
index 00000000..e0104189
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Plates_Ceramic_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6eff6ccd12d8b39d60ae5ee91edd73d4d7838fcb5d9bc6ff0e671bdf009134e9
+size 109
diff --git a/projects/first_scene/resources/Cutlery/Plates_Ceramic_Normal.png b/projects/first_scene/resources/Cutlery/Plates_Ceramic_Normal.png
new file mode 100644
index 00000000..fa13483d
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Plates_Ceramic_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe92c40ff4032fdaf10eeafd943657a0c6e0bfb3f38770f5654aa943a660f421
+size 59419
diff --git a/projects/first_scene/resources/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png b/projects/first_scene/resources/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png
new file mode 100644
index 00000000..b91d0ac6
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Plates_Details_BaseColor-Plates_Details_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ca7d436a68a2a1237aee6e763b2954f01666b21f1dbd46929a322ea277483d2
+size 779227
diff --git a/projects/first_scene/resources/Cutlery/Plates_Details_Normal.png b/projects/first_scene/resources/Cutlery/Plates_Details_Normal.png
new file mode 100644
index 00000000..6efd9679
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/Plates_Details_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b01fc6482054c64d7407b283731e57fce0601a8db28b6781c14fae3c6b30b0fe
+size 504362
diff --git a/projects/first_scene/resources/Cutlery/ToffeeJar_Label_BaseColor.png b/projects/first_scene/resources/Cutlery/ToffeeJar_Label_BaseColor.png
new file mode 100644
index 00000000..d0e0c4f4
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/ToffeeJar_Label_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df138ee68c1d455652d1b9ae3dd03e93fcd2f6a0d8a1f12e3710f39143088674
+size 1593466
diff --git a/projects/first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png b/projects/first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png
new file mode 100644
index 00000000..9f310653
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6af5da97cbb25d79aea2dde8dd71ecbd495334fe34e99497ba17821be93fd7fd
+size 2696676
diff --git a/projects/first_scene/resources/Cutlery/TransparentGlass_BaseColor.png b/projects/first_scene/resources/Cutlery/TransparentGlass_BaseColor.png
new file mode 100644
index 00000000..4e4f0fcb
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/TransparentGlass_BaseColor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2796affdfdcf6bc805176d9f85505680b5ee52eeec625e9eaeea4f0ff3854883
+size 108
diff --git a/projects/first_scene/resources/Cutlery/TransparentGlass_Normal.png b/projects/first_scene/resources/Cutlery/TransparentGlass_Normal.png
new file mode 100644
index 00000000..28c205d4
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/TransparentGlass_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b31618aa5adce4ad476bec2c03718c5ae097250e784344f2d298b8a74c3bfd46
+size 90
diff --git a/projects/first_scene/resources/Cutlery/cutlerySzene.bin b/projects/first_scene/resources/Cutlery/cutlerySzene.bin
new file mode 100644
index 00000000..ab9a0aa4
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/cutlerySzene.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f545b986e0a1ac5bff5d49693a52042aa37878425818f72c69c243da20d1f99d
+size 183324
diff --git a/projects/first_scene/resources/Cutlery/cutlerySzene.glb b/projects/first_scene/resources/Cutlery/cutlerySzene.glb
new file mode 100644
index 00000000..b0c5f345
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/cutlerySzene.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb1bad604192ca36222c0ca485ba87b846ecbd11ee8254327e04e3c993b00116
+size 11150396
diff --git a/projects/first_scene/resources/Cutlery/cutlerySzene.gltf b/projects/first_scene/resources/Cutlery/cutlerySzene.gltf
new file mode 100644
index 00000000..53e339cd
--- /dev/null
+++ b/projects/first_scene/resources/Cutlery/cutlerySzene.gltf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c77cd60e2327daca1a01044e45f2c38655f7b781bd07985fc0135328a8a96b57
+size 34312
diff --git a/projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.bin b/projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.bin
new file mode 100644
index 00000000..bf792432
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:389b0f08cf80a8d6efcc67fb51fc2dd1a078783719a1de516c3c462bd6dc62d2
+size 428636
diff --git a/projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.gltf b/projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.gltf
new file mode 100644
index 00000000..7b6aa24c
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/Sponta_20_keine_blumen.gltf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e92e01711b44f4345b2c19df51fcdc69834f425277b7d7cdec9bc5f7b063f61
+size 41102
diff --git a/projects/first_scene/resources/Sponza/Sponza.bin b/projects/first_scene/resources/Sponza/Sponza.bin
new file mode 100644
index 00000000..1e9e8d5e
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/Sponza.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8201cff0dda3905de8032e03b86f51e609c34882b8ebd2d69c8a138e0b3d345e
+size 5758512
diff --git a/projects/first_scene/resources/Sponza/Sponza.gltf b/projects/first_scene/resources/Sponza/Sponza.gltf
new file mode 100644
index 00000000..d8e5491c
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/Sponza.gltf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65179ea2afaee94d2e369ca423a295580b41d68a5d68f972777d7118e86d856d
+size 767861
diff --git a/projects/first_scene/resources/Sponza/background.png b/projects/first_scene/resources/Sponza/background.png
new file mode 100644
index 00000000..b64def12
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/background.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5b5f900ff8ed83a31750ec8e428b5b91273794ddcbfc4e4b8a6a7e781f8c686
+size 1417666
diff --git a/projects/first_scene/resources/Sponza/chain_texture.png b/projects/first_scene/resources/Sponza/chain_texture.png
new file mode 100644
index 00000000..c1e1768c
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/chain_texture.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8362cfd472880daeaea37439326a4651d1338680ae69bb2513fc6b17c8de7d4
+size 490895
diff --git a/projects/first_scene/resources/Sponza/lion.png b/projects/first_scene/resources/Sponza/lion.png
new file mode 100644
index 00000000..c49c7f0e
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/lion.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f882f746c3a9cd51a9c6eedc1189b97668721d91a3fe49232036e789912c652
+size 2088728
diff --git a/projects/first_scene/resources/Sponza/spnza_bricks_a_diff.png b/projects/first_scene/resources/Sponza/spnza_bricks_a_diff.png
new file mode 100644
index 00000000..cde4c7a6
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/spnza_bricks_a_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b94219c2f5f943f3f4715c74e7d1038bf0ab3b3b3216a758eaee67f875df0851
+size 1928829
diff --git a/projects/first_scene/resources/Sponza/sponza_arch_diff.png b/projects/first_scene/resources/Sponza/sponza_arch_diff.png
new file mode 100644
index 00000000..bcd9bda2
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_arch_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0df2c8a01b2843b1c792b494f7173cdbc4f834840fc2177af3e5d690fceda57
+size 1596151
diff --git a/projects/first_scene/resources/Sponza/sponza_ceiling_a_diff.png b/projects/first_scene/resources/Sponza/sponza_ceiling_a_diff.png
new file mode 100644
index 00000000..59de631f
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_ceiling_a_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab6c187a81aa68f4eba30119e17fce2e4882a9ec320f70c90482dbe9da82b1c6
+size 1872074
diff --git a/projects/first_scene/resources/Sponza/sponza_column_a_diff.png b/projects/first_scene/resources/Sponza/sponza_column_a_diff.png
new file mode 100644
index 00000000..01a82432
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_column_a_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c291507e2808bb83e160ab4b020689817df273baad3713a9ad19ac15fac6826
+size 1840992
diff --git a/projects/first_scene/resources/Sponza/sponza_column_b_diff.png b/projects/first_scene/resources/Sponza/sponza_column_b_diff.png
new file mode 100644
index 00000000..10a660cc
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_column_b_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2820b0267c4289c6cedbb42721792a57ef244ec2d0935941011c2a7d3fe88a9b
+size 2170433
diff --git a/projects/first_scene/resources/Sponza/sponza_column_c_diff.png b/projects/first_scene/resources/Sponza/sponza_column_c_diff.png
new file mode 100644
index 00000000..bc46fd97
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_column_c_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0bc993ff59865468ef4530798930c7dfefb07482d71db45bc2a520986b27735
+size 2066950
diff --git a/projects/first_scene/resources/Sponza/sponza_curtain_blue_diff.png b/projects/first_scene/resources/Sponza/sponza_curtain_blue_diff.png
new file mode 100644
index 00000000..384c8c2c
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_curtain_blue_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b85c6bb3cd5105f48d3812ec8e7a1068521ce69e917300d79e136e19d45422fb
+size 9510905
diff --git a/projects/first_scene/resources/Sponza/sponza_curtain_diff.png b/projects/first_scene/resources/Sponza/sponza_curtain_diff.png
new file mode 100644
index 00000000..af842e9f
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_curtain_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:563c56bdbbee395a6ef7f0c51c8ac9223c162e517b4cdba0d4654e8de27c98d8
+size 9189263
diff --git a/projects/first_scene/resources/Sponza/sponza_curtain_green_diff.png b/projects/first_scene/resources/Sponza/sponza_curtain_green_diff.png
new file mode 100644
index 00000000..6c9b6391
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_curtain_green_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:238fe1c7f481388d1c1d578c2da8d411b99e8f0030ab62060a306db333124476
+size 8785458
diff --git a/projects/first_scene/resources/Sponza/sponza_details_diff.png b/projects/first_scene/resources/Sponza/sponza_details_diff.png
new file mode 100644
index 00000000..12656686
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_details_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb1223b3bb82f8757e7df25a6891f1239cdd7ec59990340e952fb2d6b7ea570c
+size 1522643
diff --git a/projects/first_scene/resources/Sponza/sponza_fabric_blue_diff.png b/projects/first_scene/resources/Sponza/sponza_fabric_blue_diff.png
new file mode 100644
index 00000000..879d16ef
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_fabric_blue_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:467d290bf5d4b2a017da140ba9e244ed8a8a9be5418a9ac9bcb4ad572ae2d7ab
+size 2229440
diff --git a/projects/first_scene/resources/Sponza/sponza_fabric_diff.png b/projects/first_scene/resources/Sponza/sponza_fabric_diff.png
new file mode 100644
index 00000000..3311287a
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_fabric_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1594f59cc2848db26add47361f4e665e3d8afa147760ed915d839fea42b20287
+size 2267382
diff --git a/projects/first_scene/resources/Sponza/sponza_fabric_green_diff.png b/projects/first_scene/resources/Sponza/sponza_fabric_green_diff.png
new file mode 100644
index 00000000..de110f36
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_fabric_green_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:902b87faab221173bf370cea7c74cb9060b4d870ac6316b190dafded1cb12993
+size 2258220
diff --git a/projects/first_scene/resources/Sponza/sponza_flagpole_diff.png b/projects/first_scene/resources/Sponza/sponza_flagpole_diff.png
new file mode 100644
index 00000000..5f6e0812
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_flagpole_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfffb62e770959c725d0f3db6dc7dbdd46a380ec55ef884dab94d44ca017b438
+size 1425673
diff --git a/projects/first_scene/resources/Sponza/sponza_floor_a_diff.png b/projects/first_scene/resources/Sponza/sponza_floor_a_diff.png
new file mode 100644
index 00000000..788ed764
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_floor_a_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a16f9230fa91f9f31dfca6216ce205f1ef132d44f3b012fbf6efc0fba69770ab
+size 1996838
diff --git a/projects/first_scene/resources/Sponza/sponza_roof_diff.png b/projects/first_scene/resources/Sponza/sponza_roof_diff.png
new file mode 100644
index 00000000..c5b84261
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_roof_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fc412138c20da19f8173e53545e771f4652558dff624d4dc67143e40efe562b
+size 2320533
diff --git a/projects/first_scene/resources/Sponza/sponza_thorn_diff.png b/projects/first_scene/resources/Sponza/sponza_thorn_diff.png
new file mode 100644
index 00000000..7a914267
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/sponza_thorn_diff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a73a17c883cd0d0d67cfda2dc4118400a916366c05b9a5ac465f0c8b30fd9c8e
+size 635001
diff --git a/projects/first_scene/resources/Sponza/vase_dif.png b/projects/first_scene/resources/Sponza/vase_dif.png
new file mode 100644
index 00000000..61236a81
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/vase_dif.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53d06f52bf9e59df4cf00237707cca76c4f692bda61a62b06a30d321311d6dd9
+size 1842101
diff --git a/projects/first_scene/resources/Sponza/vase_hanging.png b/projects/first_scene/resources/Sponza/vase_hanging.png
new file mode 100644
index 00000000..36a3cee7
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/vase_hanging.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9d10b4f27a3c9a78d5bac882fdd4b6a6987c262f48fa490670fe5e235951e31
+size 1432804
diff --git a/projects/first_scene/resources/Sponza/vase_plant.png b/projects/first_scene/resources/Sponza/vase_plant.png
new file mode 100644
index 00000000..7ad95e70
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/vase_plant.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2087371ff02212fb7014b6daefa191cf5676d2227193fff261a5d02f554cb8e
+size 998089
diff --git a/projects/first_scene/resources/Sponza/vase_round.png b/projects/first_scene/resources/Sponza/vase_round.png
new file mode 100644
index 00000000..c17953ab
--- /dev/null
+++ b/projects/first_scene/resources/Sponza/vase_round.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa23d48d492d5d4ada2ddb27d1ef22952b214e6eb3b301c65f9d88442723d20a
+size 1871399
diff --git a/projects/first_scene/resources/cube/boards2_vcyc_jpg.jpg b/projects/first_scene/resources/cube/boards2_vcyc_jpg.jpg
deleted file mode 100644
index 2636039e..00000000
--- a/projects/first_scene/resources/cube/boards2_vcyc_jpg.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cca33a6e58ddd1b37a6e6853a9aa0e7b15ca678937119194752393dd2a0a0564
-size 1192476
diff --git a/projects/first_scene/resources/cube/cube.bin b/projects/first_scene/resources/cube/cube.bin
deleted file mode 100644
index 3303cd86..00000000
--- a/projects/first_scene/resources/cube/cube.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9bb9b6b8bbe50a0aaa517057f245ee844f80afa7426dacb2aed4128f71629ce4
-size 840
diff --git a/projects/first_scene/resources/cube/cube.blend b/projects/first_scene/resources/cube/cube.blend
deleted file mode 100644
index 62ccb2c7..00000000
--- a/projects/first_scene/resources/cube/cube.blend
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6c1e245f259c610528c9485db6688928faac0ab2addee9e3c2dde7740e4dd09
-size 774920
diff --git a/projects/first_scene/resources/cube/cube.blend1 b/projects/first_scene/resources/cube/cube.blend1
deleted file mode 100644
index 13f21dcc..00000000
--- a/projects/first_scene/resources/cube/cube.blend1
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4496f423569b8ca81f3b3a55fad00f925557e0193fb9dbe6cdce7e71fb48f7b
-size 774920
diff --git a/projects/first_scene/resources/cube/cube.glb b/projects/first_scene/resources/cube/cube.glb
deleted file mode 100644
index 66a42c65..00000000
--- a/projects/first_scene/resources/cube/cube.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:198568b715f397d78f7c358c0f709a419e7fd677e54cdec7c19f71b5ed264897
-size 1194508
diff --git a/projects/first_scene/resources/cube/cube.gltf b/projects/first_scene/resources/cube/cube.gltf
deleted file mode 100644
index 42817614..00000000
--- a/projects/first_scene/resources/cube/cube.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f82f455647a84ca6242882ae26a79a499d3ce594f8de317ab89488c5b79721ac
-size 2823
diff --git a/projects/first_scene/resources/triangle/Triangle.bin b/projects/first_scene/resources/triangle/Triangle.bin
deleted file mode 100644
index 57f26ad9..00000000
--- a/projects/first_scene/resources/triangle/Triangle.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:412ebd5f7242c266b4957e7e26be13aa331dbcb7bbb854ab334a2437ae8ed959
-size 104
diff --git a/projects/first_scene/resources/triangle/Triangle.blend b/projects/first_scene/resources/triangle/Triangle.blend
deleted file mode 100644
index 2421dc5e..00000000
--- a/projects/first_scene/resources/triangle/Triangle.blend
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:387e544df173219fbf292a64a6656d1d782bbf71a5a9e9fdef0a308f47b05477
-size 758144
diff --git a/projects/first_scene/resources/triangle/Triangle.glb b/projects/first_scene/resources/triangle/Triangle.glb
deleted file mode 100644
index 4148620c..00000000
--- a/projects/first_scene/resources/triangle/Triangle.glb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4be087a605212d139416b5352a018283b26b99260cbcddb7013a1beeb331227
-size 980
diff --git a/projects/first_scene/resources/triangle/Triangle.gltf b/projects/first_scene/resources/triangle/Triangle.gltf
deleted file mode 100644
index a188e6ee..00000000
--- a/projects/first_scene/resources/triangle/Triangle.gltf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5fc354e040f79cff329e919677b194c75e3a522c6406f75c1108ad9575f12ec
-size 2202
diff --git a/projects/first_scene/src/main.cpp b/projects/first_scene/src/main.cpp
index f7f4aaea..69fe5bb3 100644
--- a/projects/first_scene/src/main.cpp
+++ b/projects/first_scene/src/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, const char** argv) {
vkcv::asset::Scene scene;
- const char* path = argc > 1 ? argv[1] : "resources/Szene/Szene.gltf";
+ const char* path = argc > 1 ? argv[1] : "resources/Cutlery/cutlerySzene.gltf";
int result = vkcv::asset::loadScene(path, scene);
if (result == 1) {
@@ -160,7 +160,7 @@ int main(int argc, const char** argv) {
// FIXME There should be a test here to make sure there is at least 1
// texture in the scene.
- vkcv::asset::Texture &tex = scene.textures[2];
+ vkcv::asset::Texture &tex = scene.textures[0];
vkcv::Image texture = core.createImage(vk::Format::eR8G8B8A8Srgb, tex.w, tex.h);
texture.fill(tex.data.data());
--
GitLab