Add meshoptimizer. GLTF fixes. Sponza almost works

CMakeLists.txt

@@ -228,6 +228,7 @@ set(ANKI_EXTERN_SUB_DIRS ${ANKI_EXTERN_SUB_DIRS} SPIRV-Cross)
 
 if(ANKI_BUILD_TOOLS)
 	set(ANKI_EXTERN_SUB_DIRS ${ANKI_EXTERN_SUB_DIRS} assimp)
+	set(ANKI_EXTERN_SUB_DIRS ${ANKI_EXTERN_SUB_DIRS} meshoptimizer)
 endif()
 
 # SDL

samples/sponza/assets/Icosphere.001sky-material.ankimdl

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<model>
-	<modelPatches>
-		<modelPatch>
-			<mesh>assets/Icosphere.001.ankimesh</mesh>
-			<material>assets/sky-material.ankimtl</material>
-		</modelPatch>
-	</modelPatches>
-</model>

samples/sponza/assets/arc_2arch-material.ankimdl → samples/sponza/assets/arc_2_arch.001.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/arc_2.ankimesh</mesh>
-			<material>assets/arch-material.ankimtl</material>
+			<material>assets/arch.001.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

samples/sponza/assets/arch-material.ankimtl → samples/sponza/assets/arch.001.ankimtl

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- This file is auto generated by ExporterMaterial.cpp -->
+<!-- This file is auto generated by ImporterMaterial.cpp -->
 <material shaderProgram="shaders/GBufferGeneric.glslp">
-
 	<mutators>
 		<mutator name="DIFFUSE_TEX" value="1"/>
 		<mutator name="SPECULAR_TEX" value="0"/>
@@ -19,11 +18,11 @@
 		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
 		
 
-		<input shaderInput="diffTex" value="assets/Sponza_Arch_diffuse.ankitex"/>
+		<input shaderInput="diffTex" value="assets/sponza_arch_diff.ankitex"/>
 		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
-		<input shaderInput="roughnessTex" value="assets/Sponza_Arch_roughness.ankitex"/>
-		<input shaderInput="metallic" value="0.500000"/>
-		<input shaderInput="normalTex" value="assets/Sponza_Arch_normal.ankitex"/>
+		<input shaderInput="roughnessTex" value="assets/sponza_arch_spec.ankitex"/>
+		<input shaderInput="metallic" value="0.000000" />
+		<input shaderInput="normalTex" value="assets/sponza_arch_ddn.ankitex"/>
 		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
 		<input shaderInput="subsurface" value="0.000000"/>
 		

samples/sponza/assets/arch.ankimtl

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This file is auto generated by ImporterMaterial.cpp -->
+<material shaderProgram="shaders/GBufferGeneric.glslp">
+	<mutators>
+		<mutator name="DIFFUSE_TEX" value="1"/>
+		<mutator name="SPECULAR_TEX" value="0"/>
+		<mutator name="ROUGHNESS_TEX" value="1"/>
+		<mutator name="METAL_TEX" value="0"/>
+		<mutator name="NORMAL_TEX" value="1"/>
+		<mutator name="PARALLAX" value="0"/>
+		<mutator name="EMISSIVE_TEX" value="0"/>
+	</mutators>
+
+	<inputs>
+		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
+		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
+		
+
+		<input shaderInput="diffTex" value="assets/sponza_arch_diff_tga.ankitex"/>
+		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderInput="roughnessTex" value="assets/sponza_arch_spec_tga.ankitex"/>
+		<input shaderInput="metallic" value="0.000000" />
+		<input shaderInput="normalTex" value="assets/sponza_arch_ddn_tga.ankitex"/>
+		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderInput="subsurface" value="0.000000"/>
+		
+	</inputs>
+</material>

samples/sponza/assets/arch_aarch-material.ankimdl → samples/sponza/assets/arch_a_arch.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/arch_a.ankimesh</mesh>
-			<material>assets/arch-material.ankimtl</material>
+			<material>assets/arch.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

samples/sponza/assets/arch_support_bigcolumn_c-material.ankimdl → samples/sponza/assets/arch_support_big_column_c.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/arch_support_big.ankimesh</mesh>
-			<material>assets/column_c-material.ankimtl</material>
+			<material>assets/column_c.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

samples/sponza/assets/arch_support_medcolumn_c-material.ankimdl → samples/sponza/assets/arch_support_med_column_c.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/arch_support_med.ankimesh</mesh>
-			<material>assets/column_c-material.ankimtl</material>
+			<material>assets/column_c.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

samples/sponza/assets/arch_support_tinycolumn_c-material.ankimdl → samples/sponza/assets/arch_support_tiny_column_c.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/arch_support_tiny.ankimesh</mesh>
-			<material>assets/column_c-material.ankimtl</material>
+			<material>assets/column_c.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

samples/sponza/assets/bricks.ankimtl

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This file is auto generated by ImporterMaterial.cpp -->
+<material shaderProgram="shaders/GBufferGeneric.glslp">
+	<mutators>
+		<mutator name="DIFFUSE_TEX" value="1"/>
+		<mutator name="SPECULAR_TEX" value="0"/>
+		<mutator name="ROUGHNESS_TEX" value="1"/>
+		<mutator name="METAL_TEX" value="0"/>
+		<mutator name="NORMAL_TEX" value="1"/>
+		<mutator name="PARALLAX" value="0"/>
+		<mutator name="EMISSIVE_TEX" value="0"/>
+	</mutators>
+
+	<inputs>
+		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="prevMvp" builtin="PREVIOUS_MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
+		<input shaderInput="globalSampler" builtin="GLOBAL_SAMPLER"/>
+		
+
+		<input shaderInput="diffTex" value="assets/sponza_bricks_a_diff_tga.ankitex"/>
+		<input shaderInput="specColor" value="0.040000 0.040000 0.040000"/>
+		<input shaderInput="roughnessTex" value="assets/sponza_arch_spec_tga.ankitex"/>
+		<input shaderInput="metallic" value="0.000000" />
+		<input shaderInput="normalTex" value="assets/sponza_bricks_a_ddn_tga.ankitex"/>
+		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderInput="subsurface" value="0.000000"/>
+		
+	</inputs>
+</material>

samples/sponza/assets/carpetfabric_d-material.ankimdl → samples/sponza/assets/carpet_fabric_a.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/carpet.ankimesh</mesh>
-			<material>assets/fabric_d-material.ankimtl</material>
+			<material>assets/fabric_a.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

samples/sponza/assets/carpetfabric_e-material.ankimdl → samples/sponza/assets/carpet_fabric_d.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/carpet.ankimesh</mesh>
-			<material>assets/fabric_e-material.ankimtl</material>
+			<material>assets/fabric_d.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>

samples/sponza/assets/carpetfabric_a-material.ankimdl → samples/sponza/assets/carpet_fabric_e.ankimdl

@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <model>
 	<modelPatches>
 		<modelPatch>
 			<mesh>assets/carpet.ankimesh</mesh>
-			<material>assets/fabric_a-material.ankimtl</material>
+			<material>assets/fabric_e.ankimtl</material>
 		</modelPatch>
 	</modelPatches>
 </model>