Mercurial > cortex
diff org/integration.org @ 302:7e3938f40c52
added winston letter, corrected source listing for integration
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Fri, 17 Feb 2012 13:03:58 -0700 |
parents | 4203c2140b95 |
children | 7e7f8d6d9ec5 |
line wrap: on
line diff
1.1 --- a/org/integration.org Fri Feb 17 11:10:55 2012 -0700 1.2 +++ b/org/integration.org Fri Feb 17 13:03:58 2012 -0700 1.3 @@ -6,7 +6,7 @@ 1.4 #+SETUPFILE: ../../aurellem/org/setup.org 1.5 #+INCLUDE: ../../aurellem/org/level-0.org 1.6 1.7 -* Intro 1.8 +* Integration 1.9 1.10 This is the ultimate test which features all of the senses that I've 1.11 made so far. The blender file for the creature serves as an example of 1.12 @@ -23,7 +23,7 @@ 1.13 </div> 1.14 #+end_html 1.15 1.16 - 1.17 +* Generating the Video 1.18 1.19 #+name: integration 1.20 #+begin_src clojure 1.21 @@ -305,7 +305,7 @@ 1.22 (fix-display world)))))) 1.23 #+end_src 1.24 1.25 -* Generating the Video 1.26 +** ImageMagick / ffmpeg 1.27 1.28 Just a bunch of calls to imagemagick to arrange the data that 1.29 =test-everything!= produces. 1.30 @@ -700,7 +700,7 @@ 1.31 1.32 * Source Listing 1.33 - [[../src/cortex/test/integration.clj][cortex.test.integration]] 1.34 - - [[../src/cortex/video/magick2.clj][cortex.video.magick2]] 1.35 + - [[../src/cortex/video/magick8.clj][cortex.video.magick8]] 1.36 - [[../assets/Models/subtitles/hand.blend][subtitles/hand.blend]] 1.37 #+html: <ul> <li> <a href="../org/integration.org">This org file</a> </li> </ul> 1.38 - [[http://hg.bortreb.com ][source-repository]]