summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/exampleresources
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@theqtcompany.com>2015-08-20 11:45:05 +0200
committerAndy Nichols <andy.nichols@theqtcompany.com>2015-08-20 12:29:36 +0000
commita30f089e82c726e5fd28bd3869571a615c8f5d6e (patch)
treeeedd6588aaedebfc464f0b62bb59bdb46dc6583d /examples/qt3d/exampleresources
parenta9ce667b7116950ada2d41fe8bcba5e6f9f9ba57 (diff)
Always Flip UV Coordinates in Objloader
Currently if you use a QMesh that has its geometry loaded from an obj file, the UV coordinates are such that the default loading behavior for textures is inversed over the Y axis, and now any textures provide must be preprocessed to be inversed over the Y axis as well. This is not consistent with the behavior of our scene loaders which allow for Textures to be loaded normally (right-side-up) and still get sampled correctly. This is because the scene loaders make sure to flip the UV coordinates when loading the asset. To be consistent, we now the UV coordinates when loading QMesh geometry with the Objloader. [ChangeLog][Qt3DRenderer][Objloader] UV Coordinates are now always flipped when loading QMesh Geometry from an obj source. Task-number: QTBUG-46815 Change-Id: I8c3ee5de5c8bbaf5967ef81059ed97eb85901ac2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/exampleresources')
-rw-r--r--examples/qt3d/exampleresources/assets/chest/diffuse.webpbin74100 -> 70980 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/diffus_black.webpbin197350 -> 162040 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webpbin144490 -> 101158 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/diffus_green.webpbin97406 -> 74498 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/diffus_red.webpbin129352 -> 86874 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webpbin306702 -> 254934 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webpbin6590 -> 6042 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webpbin156118 -> 101134 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webpbin36686 -> 29446 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webpbin31604 -> 25560 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webpbin25252 -> 21544 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webpbin27926 -> 23620 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/specular.webpbin473208 -> 420416 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/specular_rust.webpbin377262 -> 330298 bytes
-rw-r--r--examples/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webpbin252690 -> 220224 bytes
15 files changed, 0 insertions, 0 deletions
diff --git a/examples/qt3d/exampleresources/assets/chest/diffuse.webp b/examples/qt3d/exampleresources/assets/chest/diffuse.webp
index 00904a881..ce985c1ca 100644
--- a/examples/qt3d/exampleresources/assets/chest/diffuse.webp
+++ b/examples/qt3d/exampleresources/assets/chest/diffuse.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_black.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_black.webp
index 92643c57a..5e5e0832d 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_black.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_black.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webp
index 33a3ec65b..194d63b02 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_blue.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_green.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_green.webp
index 03648226a..32bb9c10d 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_green.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_green.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_red.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_red.webp
index 95679aaa4..b01cf79e5 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_red.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_red.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webp
index 593b4a63a..302242bb0 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_rust.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp
index cd7fc78bc..20ee66d79 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_stainless_steel.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webp b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webp
index a4661d153..b53a92410 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/diffus_yellow.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webp
index 3f1d22214..ef7407f16 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_hard_bumps.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp
index 35d81c62e..cfb2c583c 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_middle_bumps.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webp
index da270474f..cc9274549 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_no_bumps.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webp b/examples/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webp
index b271b9868..757dc1d31 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/normal_soft_bumps.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/specular.webp b/examples/qt3d/exampleresources/assets/metalbarrel/specular.webp
index 87d8cdec3..50fbd9210 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/specular.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/specular.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/specular_rust.webp b/examples/qt3d/exampleresources/assets/metalbarrel/specular_rust.webp
index 529ae65bd..8527b3e74 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/specular_rust.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/specular_rust.webp
Binary files differ
diff --git a/examples/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webp b/examples/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webp
index 530ce593b..c05a79705 100644
--- a/examples/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webp
+++ b/examples/qt3d/exampleresources/assets/metalbarrel/specular_stainless_steel.webp
Binary files differ