Skip to content

Commit 808d5d2

Browse files
committed
Finished marker chapter
1 parent 7149485 commit 808d5d2

28 files changed

+1619
-869
lines changed

03-quickstart.rst

-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Normalize Device Coordinates
3030

3131
.. figure:: images/chapter-03/NDC.png
3232
:figwidth: 40%
33-
:figclass: left
3433

3534
Figure
3635

@@ -59,7 +58,6 @@ Triangulation
5958

6059
.. figure:: images/chapter-03/triangulation.png
6160
:figwidth: 35%
62-
:figclass: left
6361

6462
Figure
6563

@@ -105,7 +103,6 @@ GL Primitives
105103

106104
.. figure:: images/chapter-03/gl-primitives.png
107105
:figwidth: 40%
108-
:figclass: left
109106

110107
Figure
111108

@@ -144,7 +141,6 @@ Interpolation
144141

145142
.. figure:: images/chapter-03/interpolation.png
146143
:figwidth: 40%
147-
:figclass: left
148144

149145
Figure
150146

@@ -458,7 +454,6 @@ We're done, we can now rewrite the display function:
458454
459455
.. figure:: images/chapter-03/glumpy-quad-solid.png
460456
:figwidth: 30%
461-
:figclass: left
462457

463458
Figure
464459

@@ -484,7 +479,6 @@ Uniform color
484479

485480
.. figure:: images/chapter-03/glumpy-quad-uniform-color.png
486481
:figwidth: 30%
487-
:figclass: left
488482

489483
Figure
490484

@@ -528,7 +522,6 @@ Varying color
528522

529523
.. figure:: images/chapter-03/glumpy-quad-varying-color.png
530524
:figwidth: 30%
531-
:figclass: left
532525

533526
Figure
534527

@@ -757,7 +750,6 @@ the quad program (see `<code/chapter-03/glumpy-quad-varying-color.py>`_):
757750
:autoplay:
758751
:controls:
759752
:figwidth: 35%
760-
:figclass: left
761753

762754
Figure
763755

@@ -816,7 +808,6 @@ tricks in the next chapters.
816808
:autoplay:
817809
:controls:
818810
:figwidth: 35%
819-
:figclass: left
820811

821812
Figure
822813

@@ -839,7 +830,6 @@ Solution: `<code/chapter-03/quad-scale.py>`_
839830
:autoplay:
840831
:controls:
841832
:figwidth: 35%
842-
:figclass: left
843833

844834
Figure
845835

05-cube.rst

-6
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ Actual rendering
174174
:autoplay:
175175
:controls:
176176
:figwidth: 35%
177-
:figclass: left
178177

179178
Figure
180179

@@ -258,7 +257,6 @@ shader.
258257
:autoplay:
259258
:controls:
260259
:figwidth: 35%
261-
:figclass: left
262260

263261
Figure
264262

@@ -294,7 +292,6 @@ Outlined cube
294292
:autoplay:
295293
:controls:
296294
:figwidth: 35%
297-
:figclass: left
298295

299296
Figure
300297

@@ -365,7 +362,6 @@ Textured cube
365362
:autoplay:
366363
:controls:
367364
:figwidth: 35%
368-
:figclass: left
369365

370366
Figure
371367

@@ -464,7 +460,6 @@ Exercises
464460
:autoplay:
465461
:controls:
466462
:figwidth: 35%
467-
:figclass: left
468463

469464
Figure
470465

@@ -490,7 +485,6 @@ cube code <code/chapter-05/color-cube.py>`_, try to modify only the shader code
490485
:autoplay:
491486
:controls:
492487
:figwidth: 35%
493-
:figclass: left
494488

495489
Figure
496490

07-points.rst

+13-7
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,11 @@ You can see on the figures that the spheres now intersect each other correctly.
426426
Exercises
427427
-------------------------------------------------------------------------------
428428

429+
Tiny discs
430+
++++++++++
429431

430432
.. figure:: images/chapter-07/spiral.png
431-
:figwidth: 25%
432-
:figclass: right
433+
:figwidth: 30%
433434

434435
Figure
435436

@@ -444,27 +445,32 @@ disc...
444445
Solution: `spiral.py <code/chapter-07/spiral.py>`_
445446

446447

447-
----
448+
449+
Antialiased triangles
450+
+++++++++++++++++++++
448451

449452
.. figure:: movies/chapter-07/triangles.mp4
450453
:loop:
451454
:autoplay:
452455
:controls:
453456
:figwidth: 30%
454-
:figclass: right
455457

458+
Figure
459+
456460
Antialiased triangles
457461

458462
Try to adapt the code from the ellipses section to remake the animation on the
459463
right. Be careful with the computation of the bouding box.
460464

461465
Solution: `triangles.py <code/chapter-07/triangles.py>`_
462466

463-
----
467+
468+
469+
GPU Voronoi
470+
+++++++++++
464471

465472
.. figure:: images/chapter-07/voronoi.png
466-
:figwidth: 25%
467-
:figclass: right
473+
:figwidth: 30%
468474

469475
Figure
470476

0 commit comments

Comments
 (0)