Skip to content

Commit 12405ec

Browse files
committed
Started chapter 9
1 parent 808d5d2 commit 12405ec

32 files changed

+3366
-291
lines changed

08-markers.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ __ https://www.shadertoy.com/view/4tsyWn
106106

107107
Figure
108108

109-
| Difference (A not B)
109+
| Difference (B not A)
110110
| `CSG-difference-2.py <code/chapter-08/csg-difference-2.py>`_ / `Shadertoy`__
111111
112112
__ https://www.shadertoy.com/view/XtsyWn
@@ -116,7 +116,7 @@ __ https://www.shadertoy.com/view/XtsyWn
116116

117117
Figure
118118

119-
| Difference (B not A)
119+
| Difference (A not B)
120120
| `CSG-difference-1.py <code/chapter-08/csg-difference-1.py>`_ / `Shadertoy`__
121121
122122
__ https://www.shadertoy.com/view/4llyWn
@@ -495,17 +495,18 @@ to say that the precision of the distance is directly correlated with the size
495495
of your texture...
496496

497497

498-
.. figure:: movies/chapter-08/sdf-marker.mp4
498+
.. figure:: movies/chapter-08/texture-marker.mp4
499499
:loop:
500500
:autoplay:
501501
:controls:
502502
:figwidth: 30%
503503

504504
Figure
505505

506-
SDF marker (see `sdf-marker.py <code/chapter-08/sdf-marker.py>`_)
506+
SDF textured marker (see `texture-marker.py
507+
<code/chapter-08/texture-marker.py>`_)
507508

508-
The fragment shader reads (see also `sdf-marker.py <code/chapter-08/sdf-marker.py>`_):
509+
The fragment shader reads (see also `texture-marker.py <code/chapter-08/texture-marker.py>`_):
509510

510511
.. code:: glsl
511512
@@ -551,7 +552,6 @@ the right, there is a smarter solution using only two triangles.
551552

552553
Solution: `quiver.py <code/chapter-08/quiver.py>`_
553554

554-
SDF-light-shadow.webm
555555

556556
Light and shadows
557557
+++++++++++++++++
@@ -569,9 +569,9 @@ Light and shadows
569569

570570

571571
As explained before, the `shadertoy <https://www.shadertoy.com>`_ website is a
572-
great teaching resources and you can learn a lot by reading the sources
573-
accompanying a demo. As an exercise, have a look at this `wonderful demo
574-
<https://www.shadertoy.com/view/4dfXDn>`_ by Marteen that show two dimensional
572+
great resource and you can learn a lot by reading the sources accompanying each
573+
demo. As an exercise, have a look at this `wonderful demo
574+
<https://www.shadertoy.com/view/4dfXDn>`_ by Marteen that shows two dimensional
575575
signed distance field functions with light and shadows.
576576

577-
Simply gorgeous.
577+
Simply gorgeous...

0 commit comments

Comments
 (0)