summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-05-18 15:27:48 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-06-04 15:43:42 +0200
commitc1ae8a2812349a2254b3c4a4a4eea23db5567302 (patch)
tree4079c8c65d2d8bf5fc93b0f8d35efe980f20766c
parentceb1dfb6264eb5f5ee7cac093d7c878eb59196a4 (diff)
Use fixed qt_add_resource BASE argument
Task-number: QTBUG-86726 Change-Id: I2a7748b67b55008962809ece1a34c6cf2a0617bb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--CMakeLists.txt3
-rw-r--r--examples/qt3d/anaglyph-rendering/CMakeLists.txt65
-rw-r--r--examples/qt3d/lights/CMakeLists.txt155
-rw-r--r--examples/qt3d/multiviewport/CMakeLists.txt5
-rw-r--r--examples/qt3d/pbr-materials/CMakeLists.txt195
-rw-r--r--examples/qt3d/phong-cubes/CMakeLists.txt130
-rw-r--r--examples/qt3d/qardboard/CMakeLists.txt25
-rw-r--r--examples/qt3d/shadow-map-qml/CMakeLists.txt25
-rw-r--r--examples/qt3d/wireframe/CMakeLists.txt25
-rw-r--r--src/render/CMakeLists.txt2
-rw-r--r--tests/manual/assimp/CMakeLists.txt30
-rw-r--r--tests/manual/clip-planes-qml/CMakeLists.txt25
-rw-r--r--tests/manual/gltf/CMakeLists.txt91
-rw-r--r--tests/manual/gooch-qml/CMakeLists.txt26
-rw-r--r--tests/manual/rigged-simple/CMakeLists.txt130
-rw-r--r--tests/manual/skinned-mesh/CMakeLists.txt130
-rw-r--r--tests/manual/skybox/CMakeLists.txt40
-rw-r--r--tests/manual/transforms-qml/CMakeLists.txt25
-rw-r--r--tests/manual/transparency-qml-scene3d/CMakeLists.txt40
19 files changed, 238 insertions, 929 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc3e925c9..35a6fafb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,9 @@ project(Qt3D # special case
# Make sure we only use latest private CMake API, aka no compatibility wrappers.
set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
+# Make sure we use the fixed BASE argument of qt_add_resource.
+set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
+
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS
Concurrent Widgets Qml Quick Gamepad OpenGL ShaderTools)
diff --git a/examples/qt3d/anaglyph-rendering/CMakeLists.txt b/examples/qt3d/anaglyph-rendering/CMakeLists.txt
index 809f2b97f..63ad4d90c 100644
--- a/examples/qt3d/anaglyph-rendering/CMakeLists.txt
+++ b/examples/qt3d/anaglyph-rendering/CMakeLists.txt
@@ -60,39 +60,15 @@ qt6_add_resources(anaglyph-rendering "resources"
FILES
${resources_resource_files}
)
-set_source_files_properties("../exampleresources/assets/cubemaps/default/default_irradiance.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_irradiance.dds"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/default/default_specular.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_specular.dds"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negx.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negy.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negz.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posx.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posy.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posz.webp"
-)
set(cubemaps_resource_files
- "assets/cubemaps/default/default_irradiance.dds"
- "assets/cubemaps/default/default_specular.dds"
- "assets/cubemaps/miramar/miramar_negx.webp"
- "assets/cubemaps/miramar/miramar_negy.webp"
- "assets/cubemaps/miramar/miramar_negz.webp"
- "assets/cubemaps/miramar/miramar_posx.webp"
- "assets/cubemaps/miramar/miramar_posy.webp"
- "assets/cubemaps/miramar/miramar_posz.webp"
+ "../exampleresources/assets/cubemaps/default/default_irradiance.dds"
+ "../exampleresources/assets/cubemaps/default/default_specular.dds"
+ "../exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
)
qt6_add_resources(anaglyph-rendering "cubemaps"
@@ -103,27 +79,12 @@ qt6_add_resources(anaglyph-rendering "cubemaps"
FILES
${cubemaps_resource_files}
)
-set_source_files_properties("../exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../exampleresources/assets/obj/ball.obj"
+ "../exampleresources/assets/obj/material-sphere.obj"
+ "../exampleresources/assets/obj/plane-10x10.obj"
+ "../exampleresources/assets/obj/toyplane.obj"
+ "../exampleresources/assets/obj/trefoil.obj"
)
qt6_add_resources(anaglyph-rendering "obj"
diff --git a/examples/qt3d/lights/CMakeLists.txt b/examples/qt3d/lights/CMakeLists.txt
index fba9f3cd1..96f678e50 100644
--- a/examples/qt3d/lights/CMakeLists.txt
+++ b/examples/qt3d/lights/CMakeLists.txt
@@ -58,27 +58,12 @@ qt6_add_resources(lights "lights"
FILES
${lights_resource_files}
)
-set_source_files_properties("../exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../exampleresources/assets/obj/ball.obj"
+ "../exampleresources/assets/obj/material-sphere.obj"
+ "../exampleresources/assets/obj/plane-10x10.obj"
+ "../exampleresources/assets/obj/toyplane.obj"
+ "../exampleresources/assets/obj/trefoil.obj"
)
qt6_add_resources(lights "obj"
@@ -89,111 +74,33 @@ qt6_add_resources(lights "obj"
FILES
${obj_resource_files}
)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/no-ao.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/no-ao.png"
-)
set(textures_resource_files
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- "assets/textures/copper_brushed/copper_brushed_basecolor.png"
- "assets/textures/copper_brushed/copper_brushed_metallic.png"
- "assets/textures/copper_brushed/copper_brushed_normal.png"
- "assets/textures/copper_brushed/copper_brushed_roughness.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- "assets/textures/no-ao.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
+ "../exampleresources/assets/textures/no-ao.png"
)
qt6_add_resources(lights "textures"
diff --git a/examples/qt3d/multiviewport/CMakeLists.txt b/examples/qt3d/multiviewport/CMakeLists.txt
index 753f4e413..d39589cb0 100644
--- a/examples/qt3d/multiviewport/CMakeLists.txt
+++ b/examples/qt3d/multiviewport/CMakeLists.txt
@@ -59,11 +59,8 @@ qt6_add_resources(multiviewport "multiviewport"
FILES
${multiviewport_resource_files}
)
-set_source_files_properties("../exampleresources/assets/test_scene.dae"
- PROPERTIES QT_RESOURCE_ALIAS "assets/test_scene.dae"
-)
set(test_scene_resource_files
- "assets/test_scene.dae"
+ "../exampleresources/assets/test_scene.dae"
)
qt6_add_resources(multiviewport "test_scene"
diff --git a/examples/qt3d/pbr-materials/CMakeLists.txt b/examples/qt3d/pbr-materials/CMakeLists.txt
index 76c5d8e45..df5cdd8da 100644
--- a/examples/qt3d/pbr-materials/CMakeLists.txt
+++ b/examples/qt3d/pbr-materials/CMakeLists.txt
@@ -59,39 +59,15 @@ qt6_add_resources(pbr-materials "materials"
FILES
${materials_resource_files}
)
-set_source_files_properties("../exampleresources/assets/cubemaps/default/default_irradiance.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_irradiance.dds"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/default/default_specular.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_specular.dds"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negx.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negy.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negz.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posx.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posy.webp"
-)
-set_source_files_properties("../exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posz.webp"
-)
set(cubemaps_resource_files
- "assets/cubemaps/default/default_irradiance.dds"
- "assets/cubemaps/default/default_specular.dds"
- "assets/cubemaps/miramar/miramar_negx.webp"
- "assets/cubemaps/miramar/miramar_negy.webp"
- "assets/cubemaps/miramar/miramar_negz.webp"
- "assets/cubemaps/miramar/miramar_posx.webp"
- "assets/cubemaps/miramar/miramar_posy.webp"
- "assets/cubemaps/miramar/miramar_posz.webp"
+ "../exampleresources/assets/cubemaps/default/default_irradiance.dds"
+ "../exampleresources/assets/cubemaps/default/default_specular.dds"
+ "../exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
+ "../exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
)
qt6_add_resources(pbr-materials "cubemaps"
@@ -102,27 +78,12 @@ qt6_add_resources(pbr-materials "cubemaps"
FILES
${cubemaps_resource_files}
)
-set_source_files_properties("../exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../exampleresources/assets/obj/ball.obj"
+ "../exampleresources/assets/obj/material-sphere.obj"
+ "../exampleresources/assets/obj/plane-10x10.obj"
+ "../exampleresources/assets/obj/toyplane.obj"
+ "../exampleresources/assets/obj/trefoil.obj"
)
qt6_add_resources(pbr-materials "obj"
@@ -133,111 +94,33 @@ qt6_add_resources(pbr-materials "obj"
FILES
${obj_resource_files}
)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/no-ao.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/no-ao.png"
-)
set(textures_resource_files
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- "assets/textures/copper_brushed/copper_brushed_basecolor.png"
- "assets/textures/copper_brushed/copper_brushed_metallic.png"
- "assets/textures/copper_brushed/copper_brushed_normal.png"
- "assets/textures/copper_brushed/copper_brushed_roughness.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- "assets/textures/no-ao.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
+ "../exampleresources/assets/textures/no-ao.png"
)
qt6_add_resources(pbr-materials "textures"
diff --git a/examples/qt3d/phong-cubes/CMakeLists.txt b/examples/qt3d/phong-cubes/CMakeLists.txt
index acae88f81..1fb1a9c30 100644
--- a/examples/qt3d/phong-cubes/CMakeLists.txt
+++ b/examples/qt3d/phong-cubes/CMakeLists.txt
@@ -57,111 +57,33 @@ qt6_add_resources(phong-cubes "phong-cubes"
FILES
${phong-cubes_resource_files}
)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/copper_brushed/copper_brushed_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
-)
-set_source_files_properties("../exampleresources/assets/textures/no-ao.png"
- PROPERTIES QT_RESOURCE_ALIAS "assets/textures/no-ao.png"
-)
set(textures_resource_files
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
- "assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
- "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
- "assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
- "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
- "assets/textures/copper_brushed/copper_brushed_basecolor.png"
- "assets/textures/copper_brushed/copper_brushed_metallic.png"
- "assets/textures/copper_brushed/copper_brushed_normal.png"
- "assets/textures/copper_brushed/copper_brushed_roughness.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
- "assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
- "assets/textures/no-ao.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_metallic.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_normal.png"
+ "../exampleresources/assets/textures/aluminium_random_brushed/aluminium_random_brushed_roughness.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_metallic.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_normal.png"
+ "../exampleresources/assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_roughness.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_ambient_occlusion.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_metallic.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_normal.png"
+ "../exampleresources/assets/textures/ceramic_small_diamond/ceramic_small_diamond_roughness.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_metallic.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_normal.png"
+ "../exampleresources/assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_roughness.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_basecolor.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_metallic.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_normal.png"
+ "../exampleresources/assets/textures/copper_brushed/copper_brushed_roughness.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_metallic.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_normal.png"
+ "../exampleresources/assets/textures/gold_leaf_waste/gold_leaf_waste_roughness.png"
+ "../exampleresources/assets/textures/no-ao.png"
)
qt6_add_resources(phong-cubes "textures"
diff --git a/examples/qt3d/qardboard/CMakeLists.txt b/examples/qt3d/qardboard/CMakeLists.txt
index 9374ca584..20ccbee8f 100644
--- a/examples/qt3d/qardboard/CMakeLists.txt
+++ b/examples/qt3d/qardboard/CMakeLists.txt
@@ -65,27 +65,12 @@ qt6_add_resources(qardboard "resources"
FILES
${resources_resource_files}
)
-set_source_files_properties("../exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../exampleresources/assets/obj/ball.obj"
+ "../exampleresources/assets/obj/material-sphere.obj"
+ "../exampleresources/assets/obj/plane-10x10.obj"
+ "../exampleresources/assets/obj/toyplane.obj"
+ "../exampleresources/assets/obj/trefoil.obj"
)
qt6_add_resources(qardboard "obj"
diff --git a/examples/qt3d/shadow-map-qml/CMakeLists.txt b/examples/qt3d/shadow-map-qml/CMakeLists.txt
index 7ad090091..1f6f1dd0c 100644
--- a/examples/qt3d/shadow-map-qml/CMakeLists.txt
+++ b/examples/qt3d/shadow-map-qml/CMakeLists.txt
@@ -75,27 +75,12 @@ qt6_add_resources(shadow-map-qml "shadow-map-qml"
FILES
${shadow-map-qml_resource_files}
)
-set_source_files_properties("../exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../exampleresources/assets/obj/ball.obj"
+ "../exampleresources/assets/obj/material-sphere.obj"
+ "../exampleresources/assets/obj/plane-10x10.obj"
+ "../exampleresources/assets/obj/toyplane.obj"
+ "../exampleresources/assets/obj/trefoil.obj"
)
qt6_add_resources(shadow-map-qml "obj"
diff --git a/examples/qt3d/wireframe/CMakeLists.txt b/examples/qt3d/wireframe/CMakeLists.txt
index 304757bf9..9bf89576e 100644
--- a/examples/qt3d/wireframe/CMakeLists.txt
+++ b/examples/qt3d/wireframe/CMakeLists.txt
@@ -63,27 +63,12 @@ qt6_add_resources(wireframe "wireframe"
FILES
${wireframe_resource_files}
)
-set_source_files_properties("../exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../exampleresources/assets/obj/ball.obj"
+ "../exampleresources/assets/obj/material-sphere.obj"
+ "../exampleresources/assets/obj/plane-10x10.obj"
+ "../exampleresources/assets/obj/toyplane.obj"
+ "../exampleresources/assets/obj/trefoil.obj"
)
qt6_add_resources(wireframe "obj"
diff --git a/src/render/CMakeLists.txt b/src/render/CMakeLists.txt
index 56a63ecd4..1b023239c 100644
--- a/src/render/CMakeLists.txt
+++ b/src/render/CMakeLists.txt
@@ -311,7 +311,7 @@ qt_internal_add_module(3DRender
# Resources:
set(materialsystem_resource_files
- "prototypes/default.json"
+ "materialsystem/prototypes/default.json"
)
qt_internal_add_resource(3DRender "materialsystem"
diff --git a/tests/manual/assimp/CMakeLists.txt b/tests/manual/assimp/CMakeLists.txt
index 3f5905ef0..9af0d646d 100644
--- a/tests/manual/assimp/CMakeLists.txt
+++ b/tests/manual/assimp/CMakeLists.txt
@@ -31,11 +31,8 @@ qt_internal_add_resource(assimp "assimp"
FILES
${assimp_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/test_scene.dae"
- PROPERTIES QT_RESOURCE_ALIAS "assets/test_scene.dae"
-)
set(test_scene_resource_files
- "assets/test_scene.dae"
+ "../../../examples/qt3d/exampleresources/assets/test_scene.dae"
)
qt_internal_add_resource(assimp "test_scene"
@@ -46,27 +43,12 @@ qt_internal_add_resource(assimp "test_scene"
FILES
${test_scene_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
)
qt_internal_add_resource(assimp "obj"
diff --git a/tests/manual/clip-planes-qml/CMakeLists.txt b/tests/manual/clip-planes-qml/CMakeLists.txt
index 5cd5c3c23..891d81ed3 100644
--- a/tests/manual/clip-planes-qml/CMakeLists.txt
+++ b/tests/manual/clip-planes-qml/CMakeLists.txt
@@ -45,27 +45,12 @@ qt_internal_add_resource(clip-planes-qml "clip-planes-qml"
FILES
${clip-planes-qml_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
)
qt_internal_add_resource(clip-planes-qml "obj"
diff --git a/tests/manual/gltf/CMakeLists.txt b/tests/manual/gltf/CMakeLists.txt
index 034d9d85c..935b112ca 100644
--- a/tests/manual/gltf/CMakeLists.txt
+++ b/tests/manual/gltf/CMakeLists.txt
@@ -31,79 +31,26 @@ qt_internal_add_resource(gltf "gltf_example"
FILES
${gltf_example_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/Wood_Cherry_Original_.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/artezin_bottle.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.dae"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.dae"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine0FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine0VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine1FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine1VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine2FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine2VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine3FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine3VS.glsl"
-)
+
set(gltf_resource_files
- "assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
- "assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
- "assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
- "assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
- "assets/gltf/wine/Wood_Cherry_Original_.jpg"
- "assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
- "assets/gltf/wine/artezin_bottle.jpg"
- "assets/gltf/wine/wine.bin"
- "assets/gltf/wine/wine.dae"
- "assets/gltf/wine/wine.gltf"
- "assets/gltf/wine/wine0FS.glsl"
- "assets/gltf/wine/wine0VS.glsl"
- "assets/gltf/wine/wine1FS.glsl"
- "assets/gltf/wine/wine1VS.glsl"
- "assets/gltf/wine/wine2FS.glsl"
- "assets/gltf/wine/wine2VS.glsl"
- "assets/gltf/wine/wine3FS.glsl"
- "assets/gltf/wine/wine3VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.dae"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3VS.glsl"
)
qt_internal_add_resource(gltf "gltf"
diff --git a/tests/manual/gooch-qml/CMakeLists.txt b/tests/manual/gooch-qml/CMakeLists.txt
index e287724ef..e865d5e0d 100644
--- a/tests/manual/gooch-qml/CMakeLists.txt
+++ b/tests/manual/gooch-qml/CMakeLists.txt
@@ -31,27 +31,13 @@ qt_internal_add_resource(gooch-qml "gooch-qml"
FILES
${gooch-qml_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
+
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
)
qt_internal_add_resource(gooch-qml "obj"
diff --git a/tests/manual/rigged-simple/CMakeLists.txt b/tests/manual/rigged-simple/CMakeLists.txt
index c8d716297..6123e8112 100644
--- a/tests/manual/rigged-simple/CMakeLists.txt
+++ b/tests/manual/rigged-simple/CMakeLists.txt
@@ -35,39 +35,15 @@ qt_internal_add_resource(rigged-simple "rigged-simple"
FILES
${rigged-simple_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_irradiance.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_specular.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negz.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posz.webp"
-)
set(cubemaps_resource_files
- "assets/cubemaps/default/default_irradiance.dds"
- "assets/cubemaps/default/default_specular.dds"
- "assets/cubemaps/miramar/miramar_negx.webp"
- "assets/cubemaps/miramar/miramar_negy.webp"
- "assets/cubemaps/miramar/miramar_negz.webp"
- "assets/cubemaps/miramar/miramar_posx.webp"
- "assets/cubemaps/miramar/miramar_posy.webp"
- "assets/cubemaps/miramar/miramar_posz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
)
qt_internal_add_resource(rigged-simple "cubemaps"
@@ -97,79 +73,25 @@ qt_internal_add_resource(rigged-simple "envmaps"
FILES
${envmaps_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/Wood_Cherry_Original_.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/artezin_bottle.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.dae"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.dae"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine0FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine0VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine1FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine1VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine2FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine2VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine3FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine3VS.glsl"
-)
set(gltf_resource_files
- "assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
- "assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
- "assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
- "assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
- "assets/gltf/wine/Wood_Cherry_Original_.jpg"
- "assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
- "assets/gltf/wine/artezin_bottle.jpg"
- "assets/gltf/wine/wine.bin"
- "assets/gltf/wine/wine.dae"
- "assets/gltf/wine/wine.gltf"
- "assets/gltf/wine/wine0FS.glsl"
- "assets/gltf/wine/wine0VS.glsl"
- "assets/gltf/wine/wine1FS.glsl"
- "assets/gltf/wine/wine1VS.glsl"
- "assets/gltf/wine/wine2FS.glsl"
- "assets/gltf/wine/wine2VS.glsl"
- "assets/gltf/wine/wine3FS.glsl"
- "assets/gltf/wine/wine3VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.dae"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3VS.glsl"
)
qt_internal_add_resource(rigged-simple "gltf"
diff --git a/tests/manual/skinned-mesh/CMakeLists.txt b/tests/manual/skinned-mesh/CMakeLists.txt
index e1c334d67..70e147859 100644
--- a/tests/manual/skinned-mesh/CMakeLists.txt
+++ b/tests/manual/skinned-mesh/CMakeLists.txt
@@ -36,39 +36,15 @@ qt_internal_add_resource(skinned-mesh "skinned-mesh"
FILES
${skinned-mesh_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_irradiance.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_specular.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negz.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posz.webp"
-)
set(cubemaps_resource_files
- "assets/cubemaps/default/default_irradiance.dds"
- "assets/cubemaps/default/default_specular.dds"
- "assets/cubemaps/miramar/miramar_negx.webp"
- "assets/cubemaps/miramar/miramar_negy.webp"
- "assets/cubemaps/miramar/miramar_negz.webp"
- "assets/cubemaps/miramar/miramar_posx.webp"
- "assets/cubemaps/miramar/miramar_posy.webp"
- "assets/cubemaps/miramar/miramar_posz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
)
qt_internal_add_resource(skinned-mesh "cubemaps"
@@ -98,79 +74,25 @@ qt_internal_add_resource(skinned-mesh "envmaps"
FILES
${envmaps_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/Wood_Cherry_Original_.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/artezin_bottle.jpg"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.bin"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.bin"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.dae"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.dae"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.gltf"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine.gltf"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine0FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine0VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine1FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine1VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine2FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine2VS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3FS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine3FS.glsl"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3VS.glsl"
- PROPERTIES QT_RESOURCE_ALIAS "assets/gltf/wine/wine3VS.glsl"
-)
set(gltf_resource_files
- "assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
- "assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
- "assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
- "assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
- "assets/gltf/wine/Wood_Cherry_Original_.jpg"
- "assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
- "assets/gltf/wine/artezin_bottle.jpg"
- "assets/gltf/wine/wine.bin"
- "assets/gltf/wine/wine.dae"
- "assets/gltf/wine/wine.gltf"
- "assets/gltf/wine/wine0FS.glsl"
- "assets/gltf/wine/wine0VS.glsl"
- "assets/gltf/wine/wine1FS.glsl"
- "assets/gltf/wine/wine1VS.glsl"
- "assets/gltf/wine/wine2FS.glsl"
- "assets/gltf/wine/wine2VS.glsl"
- "assets/gltf/wine/wine3FS.glsl"
- "assets/gltf/wine/wine3VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedFigure/RiggedFigure0.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/2.0/RiggedSimple/RiggedSimple0.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/Wood_Cherry_Original_.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/_2004_old_vine_zinfandel_btl_xlg.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/artezin_bottle.jpg"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.bin"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.dae"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine.gltf"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine0VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine1VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine2VS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3FS.glsl"
+ "../../../examples/qt3d/exampleresources/assets/gltf/wine/wine3VS.glsl"
)
qt_internal_add_resource(skinned-mesh "gltf"
diff --git a/tests/manual/skybox/CMakeLists.txt b/tests/manual/skybox/CMakeLists.txt
index ba4f848c9..28e311e42 100644
--- a/tests/manual/skybox/CMakeLists.txt
+++ b/tests/manual/skybox/CMakeLists.txt
@@ -31,39 +31,15 @@ qt_internal_add_resource(skybox "skybox"
FILES
${skybox_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_irradiance.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_specular.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negz.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posz.webp"
-)
set(cubemaps_resource_files
- "assets/cubemaps/default/default_irradiance.dds"
- "assets/cubemaps/default/default_specular.dds"
- "assets/cubemaps/miramar/miramar_negx.webp"
- "assets/cubemaps/miramar/miramar_negy.webp"
- "assets/cubemaps/miramar/miramar_negz.webp"
- "assets/cubemaps/miramar/miramar_posx.webp"
- "assets/cubemaps/miramar/miramar_posy.webp"
- "assets/cubemaps/miramar/miramar_posz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
)
qt_internal_add_resource(skybox "cubemaps"
diff --git a/tests/manual/transforms-qml/CMakeLists.txt b/tests/manual/transforms-qml/CMakeLists.txt
index 793afa72c..7d60e722d 100644
--- a/tests/manual/transforms-qml/CMakeLists.txt
+++ b/tests/manual/transforms-qml/CMakeLists.txt
@@ -33,27 +33,12 @@ qt_internal_add_resource(transforms-qml "transforms-qml"
FILES
${transforms-qml_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/ball.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/material-sphere.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/plane-10x10.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/toyplane.obj"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
- PROPERTIES QT_RESOURCE_ALIAS "assets/obj/trefoil.obj"
-)
set(obj_resource_files
- "assets/obj/ball.obj"
- "assets/obj/material-sphere.obj"
- "assets/obj/plane-10x10.obj"
- "assets/obj/toyplane.obj"
- "assets/obj/trefoil.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/ball.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/material-sphere.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/plane-10x10.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/toyplane.obj"
+ "../../../examples/qt3d/exampleresources/assets/obj/trefoil.obj"
)
qt_internal_add_resource(transforms-qml "obj"
diff --git a/tests/manual/transparency-qml-scene3d/CMakeLists.txt b/tests/manual/transparency-qml-scene3d/CMakeLists.txt
index 5adfe4a5e..b159330c5 100644
--- a/tests/manual/transparency-qml-scene3d/CMakeLists.txt
+++ b/tests/manual/transparency-qml-scene3d/CMakeLists.txt
@@ -31,39 +31,15 @@ qt_internal_add_resource(transparency-qml-scene3d "transparency-qml-scene3d"
FILES
${transparency-qml-scene3d_resource_files}
)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_irradiance.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/default/default_specular.dds"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_negz.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posx.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posy.webp"
-)
-set_source_files_properties("../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
- PROPERTIES QT_RESOURCE_ALIAS "assets/cubemaps/miramar/miramar_posz.webp"
-)
set(cubemaps_resource_files
- "assets/cubemaps/default/default_irradiance.dds"
- "assets/cubemaps/default/default_specular.dds"
- "assets/cubemaps/miramar/miramar_negx.webp"
- "assets/cubemaps/miramar/miramar_negy.webp"
- "assets/cubemaps/miramar/miramar_negz.webp"
- "assets/cubemaps/miramar/miramar_posx.webp"
- "assets/cubemaps/miramar/miramar_posy.webp"
- "assets/cubemaps/miramar/miramar_posz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_irradiance.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/default/default_specular.dds"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_negz.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posx.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posy.webp"
+ "../../../examples/qt3d/exampleresources/assets/cubemaps/miramar/miramar_posz.webp"
)
qt_internal_add_resource(transparency-qml-scene3d "cubemaps"