diff options
Diffstat (limited to 'particles_tutorial')
| -rw-r--r-- | particles_tutorial/introduction.rst | 6 | ||||
| -rw-r--r-- | particles_tutorial/particles.rst | 2 | ||||
| -rw-r--r-- | particles_tutorial/shaders.rst | 2 | ||||
| -rw-r--r-- | particles_tutorial/tutorial.rst | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/particles_tutorial/introduction.rst b/particles_tutorial/introduction.rst index 0a17f67..170cb9b 100644 --- a/particles_tutorial/introduction.rst +++ b/particles_tutorial/introduction.rst @@ -34,11 +34,11 @@ A .zip file that contains the full code source of the tutorial's examples is pro The guide is available in the following formats: - :download:`PDF <qteffects/ParticlesTutorial.pdf>` + * :download:`PDF <qteffects/ParticlesTutorial.pdf>` - :download:`ePub <qteffects/ParticlesTutorial.epub>` for ebook readers. Further details can be found `here <http://en.wikipedia.org/wiki/EPUB#Software_reading_systems>`_. + * :download:`ePub <qteffects/ParticlesTutorial.epub>` for ebook readers. - :download:`Qt Help <qteffects/ParticlesTutorial.qch>` for Qt Assistant and Qt Creator. In Qt Assistant, in the :qt:`Preferences Dialog <assistant-details.html#preferences-dialog>` under the `Documentation` tab (in a collapsible menu for Mac users), you click on the `Add` button in order to add this guide in .qch format. We do the same in Qt Creator under the `Options` dialog in the `Help` section. Here you can add this guide in the `Documentation` tab. + * :download:`Qt Help <qteffects/ParticlesTutorial.qch>` for Qt Assistant and Qt Creator. License diff --git a/particles_tutorial/particles.rst b/particles_tutorial/particles.rst index c7e8c76..c28e435 100644 --- a/particles_tutorial/particles.rst +++ b/particles_tutorial/particles.rst @@ -17,7 +17,7 @@ Overview Qt Quick 2 comes with the `Particles` module for making nice visual particle effects, which can be used by many applications that require a lot of tiny moving particles such as fire simualtion, smoke, stars, music visualization, and so on. -The :qt5:`Particles <qtquick/qtquick-particles2-qml-particlesystem.html>` module is based on four major components: +The :qt5:`Particles <qtquick/qtquick-particles2-qtquick-effects-particles.html>` module is based on four major components: .. image:: images/particles-module.png :align: center diff --git a/particles_tutorial/shaders.rst b/particles_tutorial/shaders.rst index c5db6fe..8592cc2 100644 --- a/particles_tutorial/shaders.rst +++ b/particles_tutorial/shaders.rst @@ -16,7 +16,7 @@ Overview In order to perform advanced graphical effects, Qt Quick 2 enables you to use vertex and fragment shader programs with your QML local properties via the :qt5:`ShaderEffect <qtquick/qml-qtquick2-shadereffect.html>` QML type. -This type enables you to combine your GLSL program with your QML code to control the graphics at a much lower level using custom shaders. `ShaderEffect` enables you to implement a vertex or fragment shader program in your QML code via the :qt5-snapshot:`vertexShader <qml-qtquick2-shadereffect.html#vertexShader-prop>` and :qt5:`fragmentShader <qtquick/qml-qtquick2-shadereffect.html#fragmentShader-prop>` properties. When you specify a QML item as variant property in your `ShaderEffect`, the item is provided to your vertex or fragment shader as `Sampler2D`. +This type enables you to combine your GLSL program with your QML code to control the graphics at a much lower level using custom shaders. `ShaderEffect` enables you to implement a vertex or fragment shader program in your QML code via the :qt5:`vertexShader <qml-qtquick2-shadereffect.html#vertexShader-prop>` and :qt5:`fragmentShader <qtquick/qml-qtquick2-shadereffect.html#fragmentShader-prop>` properties. When you specify a QML item as variant property in your `ShaderEffect`, the item is provided to your vertex or fragment shader as `Sampler2D`. Consider the following example: diff --git a/particles_tutorial/tutorial.rst b/particles_tutorial/tutorial.rst index ca65251..21aa717 100644 --- a/particles_tutorial/tutorial.rst +++ b/particles_tutorial/tutorial.rst @@ -557,7 +557,7 @@ Shader Effect Now we want to display a hot air balloon moving up from the bottom of the window and have a flag attached to it. For this we need two images: - One to simulate the hot air balloon with a ``NumberAnimation`` to make it move from the bottom to the top of the window: +One to simulate the hot air balloon with a ``NumberAnimation`` to make it move from the bottom to the top of the window: .. code-block:: js |