Finised chapter 08 and created a new chapter for markers

Author: rougier

07-points.rst

@@ -0,0 +1,170 @@
+Rendering markers
+===============================================================================
+
+.. contents:: .
+   :local:
+   :depth: 2
+   :class: toc chapter-08
+
+..
+   .. figure:: movies/chapter-07/triangles.mp4
+      :loop:
+      :autoplay:
+      :controls:
+      :figwidth: 30%
+      :figclass: right
+
+      Figure
+
+
+
+   .. figure:: movies/chapter-07/ellipses.mp4
+      :loop:
+      :autoplay:
+      :controls:
+      :figwidth: 30%
+      :figclass: right
+
+      Figure
+
+
+Constructive Solid Geometry
+-------------------------------------------------------------------------------
+
+
+.. figure:: images/chapter-07/CSG.png
+   :figwidth: 50%
+   :figclass: right
+              
+   Figure
+
+   Constructive solid geometry (CSG) allows a to create a complex object by using
+   Boolean operators to combine simpler objects.
+
+
+Constructive solid geometry (CSG) is a technique used for modeling in order to
+create a complex object by using Boolean operators to combine simpler objects
+(primitives). Resulting objects appear visually complex but are actually a
+cleverly combined or decombined objects. The teaser image in the `GLSL
+References`_ chapter is the result of `complex constructive geometry in 3D
+<http://iquilezles.org/www/articles/distfunctions/distfunctions.htm>`_. See
+also the Wikipedia entry on `Truth function
+<https://en.wikipedia.org/wiki/Truth_function>`_.
+
+This is the reason we did not bother to try to render complex shapes in the
+previous section. Using constructive solid geometry, we are free to model
+pretty much anything and we'll see that in the markers section below. In the
+meantime, we need to define our CSG operations in glsl. The good news is that
+it is incredibly simple, just read:
+
+.. code:: glsl
+
+   // Union (A or B)
+   float csg_union(float d1, float d2)
+   { return min(d1,d2); }
+
+   // Difference (A not B)
+   float csg_difference(float d1, float d2)
+   { return max(d1,-d2); }
+
+   // Intersection (A and B)
+   float csg_intersection(float d1, float d2)
+   {  return max(d1,d2); }
+
+   // Exclusion (A xor B)
+   float csg_exclusion(float d1, float d2) 
+   { return min(max(d1,-d2), max(-d1,d2)); }
+
+
+And we can check for the result using two circles (the shadertoy link for each
+example allows you to play online with them):
+
+   
+.. figure:: images/chapter-07/CSG-intersection.png
+   :figwidth: 30%
+   :figclass: right
+
+   Figure
+
+   | Intersection (A and B)
+   | `CSG-intersection.py <code/chapter-07/csg-intersection.py>`_ / `Shadertoy`__
+
+__  https://www.shadertoy.com/view/XllyWn
+
+.. figure:: images/chapter-07/CSG-union.png
+   :figwidth: 30%
+   :figclass: right
+
+   Figure
+
+   | Union (A or B)
+   | `CSG-union.py <code/chapter-07/csg-union.py>`_ / `Shadertoy`__
+
+__  https://www.shadertoy.com/view/4tlyWn
+
+.. figure:: images/chapter-07/CSG-mix.png
+   :figwidth: 30%
+   :figclass: right
+
+   Figure
+
+   | Two SDF circles (A, B)
+   | `CSG-mix.py <code/chapter-07/csg-mix.py>`_ / `Shadertoy`__
+
+__  https://www.shadertoy.com/view/MtfcDr
+
+----
+
+.. figure:: images/chapter-07/CSG-exclusion.png
+   :figwidth: 30%
+   :figclass: right
+
+   Figure
+
+   | Exclusion (A xor B)
+   | `CSG-exclusion.py <code/chapter-07/csg-exclusion.py>`_ / `Shadertoy`__
+
+__  https://www.shadertoy.com/view/4tsyWn
+   
+
+.. figure:: images/chapter-07/CSG-difference-2.png
+   :figwidth: 30%
+   :figclass: right
+
+   Figure
+
+   | Difference (A not B)
+   | `CSG-difference-2.py <code/chapter-07/csg-difference-2.py>`_ / `Shadertoy`__
+
+__  https://www.shadertoy.com/view/XtsyWn
+
+.. figure:: images/chapter-07/CSG-difference-1.png
+   :figwidth: 30%
+   :figclass: right
+
+   Figure
+
+   | Difference (B not A)
+   | `CSG-difference-1.py <code/chapter-07/csg-difference-1.py>`_ / `Shadertoy`__
+
+__  https://www.shadertoy.com/view/4llyWn
+
+
+.. figure:: images/chapter-07/CSG-markers.png
+   :figwidth: 50%
+   :figclass: right
+
+   Figure
+
+   Some example of markers constructed using CSG.
+
+
+Arrows
+-------------------------------------------------------------------------------
+
+
+
+
+
+Boundings boxes
+-------------------------------------------------------------------------------

08-markers.rst

@@ -4,12 +4,12 @@ Rendering lines
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-08
+   :class: toc chapter-09
 
 Segments
 --------
 
-.. figure:: images/chapter-08/segment.png
+.. figure:: images/chapter-09/segment.png
    :figwidth: 50%
 
    Figure

08-lines.rst renamed to 09-lines.rst

@@ -4,7 +4,7 @@ Rendering a polygon
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-09
+   :class: toc chapter-10
 
 
 Triangulation

09-polygons.rst renamed to 10-polygons.rst

@@ -4,7 +4,7 @@ Rendering a mesh
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-10
+   :class: toc chapter-11
 
 
 Implicit surfaces

10-meshes.rst renamed to 11-meshes.rst

@@ -4,7 +4,7 @@ Rendering text
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-11
+   :class: toc chapter-12
 
 
 Failsafe text

11-text.rst renamed to 12-text.rst

@@ -4,7 +4,7 @@ Framebuffer
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-12
+   :class: toc chapter-13
 
 Post-processing
 ---------------

12-framebuffer.rst renamed to 13-framebuffer.rst

@@ -4,7 +4,7 @@ Special techniques
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-13
+   :class: toc chapter-14
 
 
 Colormaps

13-special.rst renamed to 14-special.rst

@@ -6,7 +6,7 @@ GLSL References
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-15
+   :class: toc chapter-16
 
 
 The information below has been directly extracted and reformated from the `GLES

14-conclusion.rst renamed to 15-conclusion.rst

@@ -5,7 +5,7 @@ Bibliography
 .. contents:: .
    :local:
    :depth: 2
-   :class: toc chapter-16
+   :class: toc chapter-17
 
 
 This is a curated list of some computer graphics resources (peoole, articles,

15-glsl-reference.rst renamed to 16-glsl-reference.rst

@@ -92,7 +92,7 @@ body {
 }
 
 /* Buy the book !!! */
-#id54 {
+#id56 {
     padding-top: .25em;
     padding-bottom: .25em;
     color: #ffffff;
@@ -447,64 +447,72 @@ a:active {
 
 
 .chapter-01 .topic-title {
-    background: url("images/chapter-01/chapter-01.png") no-repeat center;
+    background: url("images/chapter-01/toc.png") no-repeat center;
     background-size: 100%;
 }
 .chapter-02 .topic-title {
-    background: url("images/chapter-02/chapter-02.jpg") no-repeat center;
+    background: url("images/chapter-02/toc.png") no-repeat center;
     background-size: 100%;
 }
 .chapter-03 .topic-title {
-    background: url("images/chapter-03/chapter-03.png") no-repeat center;
+    background: url("images/chapter-03/toc.png") no-repeat center;
     background-size: 100%;
 }
 .chapter-04 .topic-title {
-    background: url("images/chapter-04/chapter-04.jpg") no-repeat center;
+    background: url("images/chapter-04/toc.png") no-repeat center;
     background-size: 125%;
 }
 .chapter-05 .topic-title {
-    background: url("images/chapter-05/chapter-05.png") no-repeat center;
+    background: url("images/chapter-05/toc.png") no-repeat center;
     background-size: 100%;
 }
 .chapter-06 .topic-title {
-    background: url("images/chapter-06/chapter-06.jpg") no-repeat center;
+    background: url("images/chapter-06/toc.png") no-repeat center;
     background-size: 100%;
     background-position: center 25%;
 }
 .chapter-07 .topic-title {
-    background: url("images/chapter-07/chapter-07.png") no-repeat center;
+    background: url("images/chapter-07/toc.png") no-repeat center;
     background-size: 100%;
 }
 .chapter-08 .topic-title {
-    background: url("images/chapter-08/chapter-08.png") no-repeat center;
+    background: url("images/chapter-08/toc.png") no-repeat center;
     background-size: 120%;
 }
 .chapter-09 .topic-title {
-    background: url("images/chapter-09/chapter-09.png") no-repeat center;
+    background: url("images/chapter-09/toc.png") no-repeat center;
     background-size: 100%;
 }
 .chapter-10 .topic-title {
-    background: url("images/chapter-10/chapter-10.png") no-repeat center;
+    background: url("images/chapter-10/toc.png") no-repeat center;
     background-size: 100%;
 }
 .chapter-11 .topic-title {
-    background: url("images/chapter-11/chapter-11.png") no-repeat center;
+    background: url("images/chapter-11/toc.png") no-repeat center;
     background-size: 100%;
 }
+.chapter-12 .topic-title {
+    background: url("images/chapter-12/toc.png") no-repeat center;
+c    background-size: 100%;
+}
 .chapter-13 .topic-title {
-    background: url("images/chapter-13/chapter-13.png") no-repeat center;
-    background-size: 125%;
+    background: url("images/chapter-13/toc.png") no-repeat center;
+    background-size: 100%;
 }
 .chapter-14 .topic-title {
-    background: url("images/chapter-15/chapter-15.png") no-repeat center;
-    background-size: 175%;
+    background: url("images/chapter-14/toc.png") no-repeat center;
+    background-size: 125%;
 }
 .chapter-15 .topic-title {
-    background: url("images/chapter-15/chapter-15.png") no-repeat center;
-    background-size: 175%;
+    background: url("images/chapter-15/toc.png") no-repeat center;
+    background-size: 125%;
 }
 .chapter-16 .topic-title {
-    background: url("images/chapter-16/chapter-16.jpg") no-repeat center;
+    background: url("images/chapter-16/toc.png") no-repeat center;
+    background-size: 175%;
+}
+.chapter-17 .topic-title {
+    background: url("images/chapter-17/toc.png") no-repeat center;
     background-size: 125%;
 }