summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/materials
diff options
context:
space:
mode:
Diffstat (limited to 'examples/qt3d/materials')
-rw-r--r--examples/qt3d/materials/Barrel.qml12
-rw-r--r--examples/qt3d/materials/Chest.qml2
-rw-r--r--examples/qt3d/materials/HousePlant.qml12
-rw-r--r--examples/qt3d/materials/main.qml6
4 files changed, 15 insertions, 17 deletions
diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml
index c68cab657..31abd329f 100644
--- a/examples/qt3d/materials/Barrel.qml
+++ b/examples/qt3d/materials/Barrel.qml
@@ -74,13 +74,11 @@ Entity {
material: NormalDiffuseSpecularMapMaterial {
id: material
ambient: "black"
- diffuse: "assets/metalbarrel/diffus_" + root.diffuseColor + ".webp"
- normal: "assets/metalbarrel/normal_" + root.bump + ".webp"
- specular: {
- if (root.specular !== "" )
- return "assets/metalbarrel/specular_" + root.specular + ".webp"
- else
- return "assets/metalbarrel/specular.webp"
+ diffuse: TextureLoader { source: "assets/metalbarrel/diffus_" + root.diffuseColor + ".webp" } //TextureLoader { source: ("assets/metalbarrel/diffus_" + root.diffuseColor + ".webp") }
+ normal: TextureLoader { source: "assets/metalbarrel/normal_" + root.bump + ".webp" }
+ specular: TextureLoader {
+ source: root.specular !== "" ? "assets/metalbarrel/specular_" + root.specular + ".webp"
+ : "assets/metalbarrel/specular.webp"
}
shininess: 5.0
diff --git a/examples/qt3d/materials/Chest.qml b/examples/qt3d/materials/Chest.qml
index 879ebb26f..227e32864 100644
--- a/examples/qt3d/materials/Chest.qml
+++ b/examples/qt3d/materials/Chest.qml
@@ -68,7 +68,7 @@ Entity {
material: DiffuseMapMaterial {
id: material
- diffuse: "assets/chest/diffuse.webp"
+ diffuse: TextureLoader { source: "assets/chest/diffuse.webp" }
specular: Qt.rgba( 0.2, 0.2, 0.2, 1.0 )
shininess: 2.0
}
diff --git a/examples/qt3d/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml
index 6505ab171..7ee810d7f 100644
--- a/examples/qt3d/materials/HousePlant.qml
+++ b/examples/qt3d/materials/HousePlant.qml
@@ -70,8 +70,8 @@ Entity {
position: Qt.vector3d(root.x, root.y, root.z)
material: NormalDiffuseMapMaterial {
- diffuse: "assets/houseplants/pot.webp"
- normal: "assets/houseplants/pot_normal.webp"
+ diffuse: TextureLoader { source: "assets/houseplants/pot.webp" }
+ normal: TextureLoader { source: "assets/houseplants/pot_normal.webp" }
specular: Qt.rgba( 0.75, 0.75, 0.75, 1.0 )
shininess: 5.0
}
@@ -79,8 +79,8 @@ Entity {
RenderableEntity {
source: "assets/houseplants/" + root.potShape + "-" + root.plantType + ".obj"
material: NormalDiffuseMapAlphaMaterial {
- diffuse: "assets/houseplants/" + root.plantType + ".webp"
- normal: "assets/houseplants/" + root.plantType + "_normal.webp"
+ diffuse: TextureLoader { source: "assets/houseplants/" + root.plantType + ".webp" }
+ normal: TextureLoader { source: "assets/houseplants/" + root.plantType + "_normal.webp" }
shininess: 10.0
}
}
@@ -88,8 +88,8 @@ Entity {
RenderableEntity {
source: "assets/houseplants/" + root.potShape + "-pot-cover.obj"
material: NormalDiffuseMapMaterial {
- diffuse: "assets/houseplants/cover.webp"
- normal: "assets/houseplants/cover_normal.webp"
+ diffuse: TextureLoader { source: "assets/houseplants/cover.webp" }
+ normal: TextureLoader { source: "assets/houseplants/cover_normal.webp" }
specular: Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
shininess: 5.0
}
diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml
index 9ed9bd219..c09454065 100644
--- a/examples/qt3d/materials/main.qml
+++ b/examples/qt3d/materials/main.qml
@@ -96,9 +96,9 @@ Entity {
material: NormalDiffuseSpecularMapMaterial {
ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 )
- diffuse: "assets/textures/pattern_09/diffuse.webp"
- specular: "assets/textures/pattern_09/specular.webp"
- normal: "assets/textures/pattern_09/normal.webp"
+ diffuse: TextureLoader { source: "assets/textures/pattern_09/diffuse.webp" }
+ specular: TextureLoader { source: "assets/textures/pattern_09/specular.webp" }
+ normal: TextureLoader { source: "assets/textures/pattern_09/normal.webp" }
textureScale: 10.0
shininess: 10.0
}