aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/qtdesignstudio/images/area-light.pngbin14374 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/directional-light.pngbin10823 -> 0 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-3d-area-light.pngbin0 -> 21349 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-3d-directional-light.pngbin25743 -> 19122 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-3d-point-light.pngbin32931 -> 21503 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-3d-spot-light.pngbin0 -> 25519 bytes
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc19
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc2
8 files changed, 19 insertions, 2 deletions
diff --git a/doc/qtdesignstudio/images/area-light.png b/doc/qtdesignstudio/images/area-light.png
deleted file mode 100644
index 89d4c31dfa..0000000000
--- a/doc/qtdesignstudio/images/area-light.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/directional-light.png b/doc/qtdesignstudio/images/directional-light.png
deleted file mode 100644
index cf7a1214cb..0000000000
--- a/doc/qtdesignstudio/images/directional-light.png
+++ /dev/null
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-3d-area-light.png b/doc/qtdesignstudio/images/studio-3d-area-light.png
new file mode 100644
index 0000000000..d31661e992
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-area-light.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-3d-directional-light.png b/doc/qtdesignstudio/images/studio-3d-directional-light.png
index f5e16e8e40..e43f6ec541 100644
--- a/doc/qtdesignstudio/images/studio-3d-directional-light.png
+++ b/doc/qtdesignstudio/images/studio-3d-directional-light.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-3d-point-light.png b/doc/qtdesignstudio/images/studio-3d-point-light.png
index 9252f47c78..ac3b7f51f9 100644
--- a/doc/qtdesignstudio/images/studio-3d-point-light.png
+++ b/doc/qtdesignstudio/images/studio-3d-point-light.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-3d-spot-light.png b/doc/qtdesignstudio/images/studio-3d-spot-light.png
new file mode 100644
index 0000000000..cc678a801d
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-3d-spot-light.png
Binary files differ
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
index cfd19be883..361514e053 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc
@@ -42,6 +42,7 @@
\list
\li \l{DirectionalLight}{Light Directional}
\li \l{PointLight}{Light Point}
+ \li \l{SpotLight}{Light Spot}
\li \l{AreaLight}{Light Area}
\endlist
@@ -121,6 +122,22 @@
Aside from fade, a point light has the same properties as a directional
light.
+ \section1 Spot Light
+
+ A spot light emits light towards one direction in a cone shape.
+ The light intensity diminishes when approaching the value of the
+ \uicontrol {Cone angle} property. The angle at which the light
+ intensity starts to diminish is defined by the
+ \uicontrol {Inner cone angle} property. Both angles are defined in degrees.
+
+ Inside the inner cone angle, the spot light behaves similarly to the point
+ light. There the light intensity diminishes according to inverse-square-law.
+ However, the fade-off (and range) can be controlled with the
+ \uicontrol {Constant fade}, \uicontrol {Linear fade}, and
+ \uicontrol {Quadratic fade} properties.
+
+ \image studio-3d-spot-light.png
+
\section1 Area Light
An area light is similar to the directional light. However, instead of
@@ -135,7 +152,7 @@
The image below shows an example on how to light an object with different
colors using two different area lights.
- \image area-light.png
+ \image studio-3d-area-light.png
You can rotate, scale, and move area lights.
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
index bcef409407..54873e84d5 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc
@@ -159,7 +159,7 @@
an easy way to add a high-quality look at a relatively low cost.
To specify an image to use as the specular reflection map, set the
- \uicontrol {Light probe} property
+ \uicontrol {Light probe} property.
Crisp images cause your material to look very glossy. The more you
blur your image, the softer your material appears.