Clean up the glTF

bevyengine · Dec 11, 2024 · dfa2879 · dfa2879
1 parent 4506323
commit dfa2879
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 24 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3853,6 +3853,7 @@ wasm = false
 name = "mixed_lighting"
 path = "examples/3d/mixed_lighting.rs"
 doc-scrape-examples = true
+required-features = ["jpeg"]
 
 [package.metadata.example.mixed_lighting]
 name = "Mixed lighting"

diff --git a/assets/models/MixedLightingExample/Image_0.png b/assets/models/MixedLightingExample/Image_0.png
diff --git a/assets/models/MixedLightingExample/Image_1-Image_4.png b/assets/models/MixedLightingExample/Image_1-Image_4.png
diff --git a/assets/models/MixedLightingExample/Image_1-Image_6.png b/assets/models/MixedLightingExample/Image_1-Image_6.png
diff --git a/assets/models/MixedLightingExample/Image_1.png b/assets/models/MixedLightingExample/Image_1.png
diff --git a/assets/models/MixedLightingExample/Image_2.png b/assets/models/MixedLightingExample/Image_2.png
diff --git a/assets/models/MixedLightingExample/Image_3.png b/assets/models/MixedLightingExample/Image_3.png
diff --git a/assets/models/MixedLightingExample/Image_5.png b/assets/models/MixedLightingExample/Image_5.png
diff --git a/assets/models/MixedLightingExample/Image_6.png b/assets/models/MixedLightingExample/Image_6.png
diff --git a/assets/models/MixedLightingExample/MixedLightingExample.gltf b/assets/models/MixedLightingExample/MixedLightingExample.gltf
@@ -533,44 +533,44 @@
 	],
 	"images":[
 		{
-			"mimeType":"image/png",
-			"name":"Image_1",
-			"uri":"Image_1.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairOcclusion",
+			"uri":"SheenChairOcclusion.jpg"
 		},
 		{
-			"mimeType":"image/png",
-			"name":"Image_6",
-			"uri":"Image_6.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairBaseColor",
+			"uri":"SheenChairBaseColor.jpg"
 		},
 		{
-			"mimeType":"image/png",
-			"name":"Image_0",
-			"uri":"Image_0.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairFabricNormal",
+			"uri":"SheenChairFabricNormal.jpg"
 		},
 		{
-			"mimeType":"image/png",
-			"name":"Image_2",
-			"uri":"Image_2.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairFabricOcclusion",
+			"uri":"SheenChairFabricOcclusion.jpg"
 		},
 		{
-			"mimeType":"image/png",
-			"name":"Image_5",
-			"uri":"Image_5.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairLabelBaseColor",
+			"uri":"SheenChairLabelBaseColor.jpg"
 		},
 		{
-			"mimeType":"image/png",
-			"name":"Image_1-Image_4",
-			"uri":"Image_1-Image_4.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairOcclusion-SheenChairWoodMetallicRoughness",
+			"uri":"SheenChairOcclusion-SheenChairWoodMetallicRoughness.jpg"
 		},
 		{
-			"mimeType":"image/png",
-			"name":"Image_3",
-			"uri":"Image_3.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairWoodBaseColor",
+			"uri":"SheenChairWoodBaseColor.jpg"
 		},
 		{
-			"mimeType":"image/png",
-			"name":"Image_1-Image_6",
-			"uri":"Image_1-Image_6.png"
+			"mimeType":"image/jpeg",
+			"name":"SheenChairOcclusion-SheenChairBaseColor",
+			"uri":"SheenChairOcclusion-SheenChairBaseColor.jpg"
 		}
 	],
 	"accessors":[

diff --git a/assets/models/MixedLightingExample/SheenChairBaseColor.jpg b/assets/models/MixedLightingExample/SheenChairBaseColor.jpg
diff --git a/assets/models/MixedLightingExample/SheenChairFabricNormal.jpg b/assets/models/MixedLightingExample/SheenChairFabricNormal.jpg
diff --git a/assets/models/MixedLightingExample/SheenChairFabricOcclusion.jpg b/assets/models/MixedLightingExample/SheenChairFabricOcclusion.jpg
diff --git a/assets/models/MixedLightingExample/SheenChairLabelBaseColor.jpg b/assets/models/MixedLightingExample/SheenChairLabelBaseColor.jpg
diff --git a/assets/models/MixedLightingExample/SheenChairOcclusion-SheenChairBaseColor.jpg b/assets/models/MixedLightingExample/SheenChairOcclusion-SheenChairBaseColor.jpg
diff --git a/...ls/MixedLightingExample/SheenChairOcclusion-SheenChairWoodMetallicRoughness.jpg b/...ls/MixedLightingExample/SheenChairOcclusion-SheenChairWoodMetallicRoughness.jpg
diff --git a/assets/models/MixedLightingExample/SheenChairOcclusion.jpg b/assets/models/MixedLightingExample/SheenChairOcclusion.jpg
diff --git a/assets/models/MixedLightingExample/SheenChairWoodBaseColor.jpg b/assets/models/MixedLightingExample/SheenChairWoodBaseColor.jpg