summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <mbrasser@ford.com>2019-07-09 09:41:13 -0500
committerMichael Brasser <mbrasser@ford.com>2019-07-15 16:45:02 -0500
commitb63aaf574c6b4b5a40e2f137f077c694bcf79ae0 (patch)
tree1ffeee2a1f3bbbda96e588ffa57bdaabfb664959
parentc9eb1f347a501c6915595bfb705af3aecc2fbadd (diff)
Document an example of how textureScale might be used
Change-Id: Iead857526a06b104080ab843b26c49efc22f05cc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/doc/src/qmlextramaterials.qdoc20
-rw-r--r--src/extras/defaults/qdiffusemapmaterial.cpp3
-rw-r--r--src/extras/defaults/qdiffusespecularmapmaterial.cpp4
-rw-r--r--src/extras/defaults/qdiffusespecularmaterial.cpp8
-rw-r--r--src/extras/defaults/qmetalroughmaterial.cpp8
-rw-r--r--src/extras/defaults/qnormaldiffusemapmaterial.cpp4
-rw-r--r--src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp4
7 files changed, 51 insertions, 0 deletions
diff --git a/src/doc/src/qmlextramaterials.qdoc b/src/doc/src/qmlextramaterials.qdoc
index c54cc948b..e0a2e9edf 100644
--- a/src/doc/src/qmlextramaterials.qdoc
+++ b/src/doc/src/qmlextramaterials.qdoc
@@ -69,6 +69,10 @@
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with WrapMode.Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
/*!
\qmlproperty TextureImage DiffuseMapMaterial::diffuse
@@ -152,6 +156,10 @@
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with WrapMode.Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
/*!
@@ -292,6 +300,10 @@
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with WrapMode.Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
/*!
@@ -366,6 +378,10 @@
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with WrapMode.Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
/*!
@@ -449,6 +465,10 @@
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with WrapMode.Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
/*!
diff --git a/src/extras/defaults/qdiffusemapmaterial.cpp b/src/extras/defaults/qdiffusemapmaterial.cpp
index d5e729b8e..83eec26a8 100644
--- a/src/extras/defaults/qdiffusemapmaterial.cpp
+++ b/src/extras/defaults/qdiffusemapmaterial.cpp
@@ -296,6 +296,9 @@ QAbstractTexture *QDiffuseMapMaterial::diffuse() const
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+ When used in conjunction with QTextureWrapMode::Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
float QDiffuseMapMaterial::textureScale() const
{
diff --git a/src/extras/defaults/qdiffusespecularmapmaterial.cpp b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
index e1d23622c..9a1092fbc 100644
--- a/src/extras/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
@@ -314,6 +314,10 @@ float QDiffuseSpecularMapMaterial::shininess() const
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with QTextureWrapMode::Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
float QDiffuseSpecularMapMaterial::textureScale() const
{
diff --git a/src/extras/defaults/qdiffusespecularmaterial.cpp b/src/extras/defaults/qdiffusespecularmaterial.cpp
index be187b46a..8938ce19a 100644
--- a/src/extras/defaults/qdiffusespecularmaterial.cpp
+++ b/src/extras/defaults/qdiffusespecularmaterial.cpp
@@ -385,12 +385,20 @@ QVariant QDiffuseSpecularMaterial::normal() const
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with QTextureWrapMode::Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
/*!
\qmlproperty real DiffuseSpecularMaterial::textureScale
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with WrapMode.Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
float QDiffuseSpecularMaterial::textureScale() const
{
diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp
index d404f03de..572bfecfd 100644
--- a/src/extras/defaults/qmetalroughmaterial.cpp
+++ b/src/extras/defaults/qmetalroughmaterial.cpp
@@ -306,12 +306,20 @@ QVariant QMetalRoughMaterial::normal() const
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with QTextureWrapMode::Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
/*!
\qmlproperty real Qt3D.Extras::MetalRoughMaterial::textureScale
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with WrapMode.Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
float QMetalRoughMaterial::textureScale() const
{
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
index 7c8260084..9d41ddb32 100644
--- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
@@ -338,6 +338,10 @@ float QNormalDiffuseMapMaterial::shininess() const
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with QTextureWrapMode::Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
float QNormalDiffuseMapMaterial::textureScale() const
{
diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
index 5fb2b7e9e..a76d9856b 100644
--- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -355,6 +355,10 @@ float QNormalDiffuseSpecularMapMaterial::shininess() const
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
+
+ When used in conjunction with QTextureWrapMode::Repeat, textureScale provides a simple
+ way to tile a texture across a surface. For example, a texture scale of \c 4.0
+ would result in 16 (4x4) tiles.
*/
float QNormalDiffuseSpecularMapMaterial::textureScale() const
{