Relocation part III

Author: rougier

02-introduction.rst

@@ -376,8 +376,8 @@ Bindings
 * Ctypes_ bindings can also be generated quite easily thanks to the gl.xml_
   file provided by the Khronos group that defines the OpenGL and OpenGL API
   Registry. The number of functions and constants given in the table above have
-  been computed using the `<code/registry.py>`_ program that parses the gl.xml
-  file for each API and version and count the relevant features.
+  been computed using the `<code/chapter-02/registry.py>`_ program that parses
+  the gl.xml file for each API and version and count the relevant features.
 
 
 Engines

03-quickstart.rst

@@ -8,9 +8,9 @@ Quickstart
 
 
 For the **really** impatient, you can try to run the code in the `teaser image
-<code/glumpy-quad-solid.py>`_ above. If this works, a window should open on your
-desktop with a red color in the background. If you now want to understand how
-this works, you'll have to read the text below.
+<code/chapter-03/glumpy-quad-solid.py>`_ above. If this works, a window should
+open on your desktop with a red color in the background. If you now want to
+understand how this works, you'll have to read the text below.
 
 
 Preliminaries
@@ -688,7 +688,7 @@ shader program, using the proper mode.
    # Run the app
    app.run()
 
-The whole source is available in `<code/glumpy-quad-solid.py>`_.
+The whole source is available in `<code/chapter-03/glumpy-quad-solid.py>`_.
 
 If you run this program using the `--debug` switch, you should obtain the
 following output that show what is being done in the background. More
@@ -728,7 +728,7 @@ Uniform color
 
 Adding a `uniform` specified color like is only a matter of modifying the
 fragment shader as in the previous section an directly assigning the color to
-the quad program (see `<code/glumpy-quad-uniform-color.py>`_):
+the quad program (see `<code/chapter-03/glumpy-quad-uniform-color.py>`_):
 
 .. code:: python
 
@@ -741,7 +741,7 @@ Varying color
 
 Adding a per-vertex color like is also and only a matter of modifying the
 fragment shader as in the previous section an directly assigning the color to
-the quad program (see `<code/glumpy-quad-varying-color.py>`_):
+the quad program (see `<code/chapter-03/glumpy-quad-varying-color.py>`_):
 
 .. code:: python
 
@@ -822,10 +822,10 @@ tricks in the next chapters.
 
    Basic animation with the quad.
 
-**Scaling the quad** We've been using previously a `uniform` to pass a
-color to the fragment shader, but we could have used also in the vertex shader
-to pass any kind of information. In this exercise, try to modify the vertex
-shader in the `varying color example <code/glumpy-quad-varying-color.py>`_ in
+**Scaling the quad** We've been using previously a `uniform` to pass a color to
+the fragment shader, but we could have used also in the vertex shader to pass
+any kind of information. In this exercise, try to modify the vertex shader in
+the `varying color example <code/chapter-03/glumpy-quad-varying-color.py>`_ in
 order for the quad to be animated and to scale with time as shown in the figure
 on the right. You will need to update the scale factor within the Python
 program, for example in the `draw` function.
@@ -856,7 +856,7 @@ angle theta around the origin (0,0) for a point (x,y):
        float y2 = sin(theta)*x + cos(theta)*y;
 
 
-Solution: `<code/quad-rotate.py>`_
+Solution: `<code/chapter-03/quad-rotate.py>`_
 
 
 .. _GLUT:   http://freeglut.sourceforge.net 		

04-maths.rst

@@ -380,7 +380,7 @@ within the volume (even partially) will be rendered while objects outside
 won't. On the image below, the yellow and red spheres are within the volume
 while the green one is not and does not appear on the projection.
 
-.. image:: data/projection.png
+.. image:: images/chapter-04/projection.png
    :width: 100%
 
 There exist many different ways to project a 3D volume onto a 2D screen but

05-cube.rst

@@ -109,7 +109,7 @@ matrices as well as rotation, translation and scaling operations). This default
 perspective matrix is located at the origin and look in the negative z
 direction with the up direction pointing toward the positive y-axis. If we
 leave our cube at the origin, the camera would be inside the cube and we woudl
-not see much. So let first crate a view matrix that is a translation along the
+not see much. So let first create a view matrix that is a translation along the
 z-axis:
 
 .. code:: python

06-anti-grain.rst

@@ -412,7 +412,7 @@ vertices defining the box.
 Rounded Box
 ~~~~~~~~~~~
 
-.. figure:: data/SDF-round-box.mp4
+.. figure:: movies/chapter-06/SDF-round-box.mp4
    :loop:
    :autoplay:
    :controls:

07-points.rst

@@ -67,7 +67,7 @@ Note that there is a new `gl_FragCoord` variable in this fragment shader. This
 variable gives the coordinate of the current fragment in window coordinates
 (bottom-left is (0,0)). Without it, the `gl.GL_POINTS` would be useless.
 
-Last, we setup our python program (see `dots-1.py <code/dots-1.py>`_).
+Last, we setup our python program (see `dots-1.py <code/chapter-07/dots-1.py>`_).
 
 .. code:: python
 
@@ -93,15 +93,16 @@ Last, we setup our python program (see `dots-1.py <code/dots-1.py>`_).
    app.run()
 
 
-.. figure:: data/dots-1.png
+.. figure:: images/chapter-07/dots-1.png
    :figwidth: 50%
    :figclass: right
 
    Figure
 
    Discs positionned vertically with a 0.2 pixel increase.
+   See `code/chapter-07/discs-aligned.py`_
 
-.. figure:: data/dots-2.png
+.. figure:: images/chapter-07/dots-2.png
    :figwidth: 50%
    :figclass: right
 
@@ -117,7 +118,7 @@ pixels compared to its left neightbour. However, you cannot see any artefacts
 
 ----
 
-.. figure:: data/triangles.mp4
+.. figure:: movies/chapter-07/triangles.mp4
    :loop:
    :autoplay:
    :controls:
@@ -126,7 +127,7 @@ pixels compared to its left neightbour. However, you cannot see any artefacts
 
    Figure
 
-.. figure:: data/ellipses.mp4
+.. figure:: movies/chapter-07/ellipses.mp4
    :loop:
    :autoplay:
    :controls:
@@ -135,7 +136,7 @@ pixels compared to its left neightbour. However, you cannot see any artefacts
 
    Figure
 
-.. figure:: data/spiral.png
+.. figure:: images/chapter-07/spiral.png
    :figwidth: 30%
    :figclass: right
 
@@ -147,7 +148,7 @@ Markers
 -------------------------------------------------------------------------------
 
 
-.. figure:: data/CSG-markers.png
+.. figure:: images/chapter-07/CSG-markers.png
    :figwidth: 50%
    :figclass: right
 
@@ -168,7 +169,7 @@ Constructive Solid Geometry
 -------------------------------------------------------------------------------
 
 
-.. figure:: data/CSG.png
+.. figure:: images/chapter-07/CSG.png
    :figwidth: 50%
    :figclass: right
 
@@ -216,72 +217,72 @@ And we can check for the result using two circles (the shadertoy link for each
 example allows you to play online with them):
 
 
-.. figure:: data/CSG-intersection.png
+.. figure:: images/chapter-07/CSG-intersection.png
    :figwidth: 30%
    :figclass: right
 
    Figure
 
    | Intersection (A and B)
-   | `CSG-intersection.py <code/csg-intersection.py>`_ / `Shadertoy`__
+   | `CSG-intersection.py <code/chapter-07/csg-intersection.py>`_ / `Shadertoy`__
 
 __  https://www.shadertoy.com/view/XllyWn
 
-.. figure:: data/CSG-union.png
+.. figure:: images/chapter-07/CSG-union.png
    :figwidth: 30%
    :figclass: right
 
    Figure
 
    | Union (A or B)
-   | `CSG-union.py <code/csg-union.py>`_ / `Shadertoy`__
+   | `CSG-union.py <code/chapter-07/csg-union.py>`_ / `Shadertoy`__
 
 __  https://www.shadertoy.com/view/4tlyWn
 
-.. figure:: data/CSG-mix.png
+.. figure:: images/chapter-07/CSG-mix.png
    :figwidth: 30%
    :figclass: right
 
    Figure
 
    | Two SDF circles (A, B)
-   | `CSG-mix.py <code/csg-mix.py>`_ / `Shadertoy`__
+   | `CSG-mix.py <code/chapter-07/csg-mix.py>`_ / `Shadertoy`__
 
 __  https://www.shadertoy.com/view/MtfcDr
 
 ----
 
-.. figure:: data/CSG-exclusion.png
+.. figure:: images/chapter-07/CSG-exclusion.png
    :figwidth: 30%
    :figclass: right
 
    Figure
 
    | Exclusion (A xor B)
-   | `CSG-exclusion.py <code/csg-exclusion.py>`_ / `Shadertoy`__
+   | `CSG-exclusion.py <code/chapter-07/csg-exclusion.py>`_ / `Shadertoy`__
 
 __  https://www.shadertoy.com/view/4tsyWn
 
 
-.. figure:: data/CSG-difference-2.png
+.. figure:: images/chapter-07/CSG-difference-2.png
    :figwidth: 30%
    :figclass: right
 
    Figure
 
    | Difference (A not B)
-   | `CSG-difference-2.py <code/csg-difference-2.py>`_ / `Shadertoy`__
+   | `CSG-difference-2.py <code/chapter-07/csg-difference-2.py>`_ / `Shadertoy`__
 
 __  https://www.shadertoy.com/view/XtsyWn
 
-.. figure:: data/CSG-difference-1.png
+.. figure:: images/chapter-07/CSG-difference-1.png
    :figwidth: 30%
    :figclass: right
 
    Figure
 
    | Difference (B not A)
-   | `CSG-difference-1.py <code/csg-difference-1.py>`_ / `Shadertoy`__
+   | `CSG-difference-1.py <code/chapter-07/csg-difference-1.py>`_ / `Shadertoy`__
 
 __  https://www.shadertoy.com/view/4llyWn
 

08-lines.rst

@@ -9,7 +9,7 @@ Rendering lines
 Segments
 --------
 
-.. figure:: data/segment.png
+.. figure:: images/chapter-08/segment.png
    :figwidth: 50%
 
    Figure

README.rst

@@ -1,7 +1,7 @@
 Python & OpenGL for Scientific Visualization
 ============================================
 
-| Copyright (c) 2017 Nicolas P. Rougier
+| Copyright (c) 2018 Nicolas P. Rougier
 | **License**: Creative Commons Attribution 4.0 International (CC BY-NC-SA 4.0)
 | **Website**: http://www.labri.fr/perso/nrougier/python+opengl
 |
@@ -22,7 +22,7 @@ arbitrary transformations but there are actually many more techniques to be
 discovered and explained in this open-access book. And of course, everything
 will be fast and beautiful.
 
-.. image:: data/polar-projection.png
+.. image:: images/teaser.png
 
 This book is open-access (i.e. it's free to read at `this address
 <http://www.labri.fr/perso/nrougier/python+opengl>`_) because I believe

book.css

@@ -92,7 +92,7 @@ body {
 }
 
 /* Buy the book !!! */
-#id53 {
+#id54 {
     padding-top: .25em;
     padding-bottom: .25em;
     color: #ffffff;