# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1395731884 14400
# Node ID 47cfbe84f00e7127654f44181a4cfbc992834d26
# Parent  ea0bcd47d55b165fdf4acbd4d9a96f913098c839
complete images in first third of first chapter.

diff -r ea0bcd47d55b -r 47cfbe84f00e org/worm_learn.clj
--- a/org/worm_learn.clj	Tue Mar 25 02:08:30 2014 -0400
+++ b/org/worm_learn.clj	Tue Mar 25 03:18:04 2014 -0400
@@ -223,12 +223,12 @@
 (declare phi-space phi-scan)
 
 (defn debug-experience
-  [experiences]
+  [experiences text]
   (cond
-   (grand-circle? experiences) (println "Grand Circle")
-   (curled? experiences)       (println "Curled")
-   (wiggling? experiences)     (println "Wiggling")
-   (resting? experiences)      (println "Resting")))
+   (grand-circle? experiences) (.setText text "Grand Circle")
+   (curled? experiences)       (.setText text "Curled")
+   (wiggling? experiences)     (.setText text "Wiggling")
+   (resting? experiences)      (.setText text "Resting")))
 
 
 (def standard-world-view
@@ -278,6 +278,16 @@
     (.addProcessor (.getViewPort world) pssm)))
         
 
+(defn display-text [[x y :as location]]
+  (let []
+    (.setLocalTranslation text 300 (.getLineHeight text) 0)
+   (fn [world]
+     
+  
+  
+  
+  (fn [new-text]
+
 (defn worm-world
   [& {:keys [record motor-control keybindings view experiences
              worm-model end-frame experience-watch] :as settings}]
@@ -298,12 +308,21 @@
              :mass 0
              :texture "Textures/aurellem.png"
              :material "Common/MatDefs/Misc/Unshaded.j3md")
-        timer (IsoTimer. 60)]
+        timer (IsoTimer. 60)
+
+        font (.loadFont (asset-manager) "Interface/Fonts/Console.fnt")
+        worm-action (doto (BitmapText. font false)
+                      (.setSize 35)
+                      (.setColor (ColorRGBA/Black)))]
 
     (world
      (nodify [worm floor])
        (merge standard-debug-controls keybindings)
        (fn [world]
+         (.setLocalTranslation
+          worm-action 20 470 0)
+         (.attachChild (.getGuiNode world) worm-action)
+         
          (enable-good-shadows world)
          (.setShadowMode worm RenderQueue$ShadowMode/CastAndReceive)
          (.setShadowMode floor RenderQueue$ShadowMode/Receive)
@@ -315,6 +334,7 @@
          (.setTimer world timer)
          (display-dilated-time world timer)
          (when record
+           (dir! record)
            (Capture/captureVideo
             world
             (dir! (File. record "main-view"))))
@@ -333,7 +353,7 @@
                            :proprioception proprioception-data
                            :muscle muscle-data}))
            (when experience-watch
-             (experience-watch @experiences))
+             (experience-watch @experiences worm-action))
            (muscle-display
             muscle-data
             (when record (dir! (File. record "muscle"))))
diff -r ea0bcd47d55b -r 47cfbe84f00e thesis/cortex.org
--- a/thesis/cortex.org	Tue Mar 25 02:08:30 2014 -0400
+++ b/thesis/cortex.org	Tue Mar 25 03:18:04 2014 -0400
@@ -182,7 +182,7 @@
    #+caption: curling, wiggling, and resting.
    #+name: worm-intro
    #+ATTR_LaTeX: :width 13cm
-   [[./images/worm-free-play.png]]
+   [[./images/worm-intro-white.png]]
 
 
    #+caption: Body-centerd actions are best expressed in a body-centered 
@@ -209,7 +209,7 @@
    #+caption:  in the missing sensory detail with previous experience.
    #+name: worm-recognition-intro
    #+ATTR_LaTeX: :width 10cm
-   [[./images/wall-push.png]]
+   [[./images/worm-poses.png]]
 
    
    One powerful advantage of empathic problem solving is that it
diff -r ea0bcd47d55b -r 47cfbe84f00e thesis/images/worm-free-play.png
Binary file thesis/images/worm-free-play.png has changed
diff -r ea0bcd47d55b -r 47cfbe84f00e thesis/images/worm-intro-black.png
Binary file thesis/images/worm-intro-black.png has changed
diff -r ea0bcd47d55b -r 47cfbe84f00e thesis/images/worm-intro-rainbow.png
Binary file thesis/images/worm-intro-rainbow.png has changed
diff -r ea0bcd47d55b -r 47cfbe84f00e thesis/images/worm-intro-white.png
Binary file thesis/images/worm-intro-white.png has changed
diff -r ea0bcd47d55b -r 47cfbe84f00e thesis/images/worm-poses.png
Binary file thesis/images/worm-poses.png has changed
diff -r ea0bcd47d55b -r 47cfbe84f00e thesis/rlm-cortex-meng.tex
--- a/thesis/rlm-cortex-meng.tex	Tue Mar 25 02:08:30 2014 -0400
+++ b/thesis/rlm-cortex-meng.tex	Tue Mar 25 03:18:04 2014 -0400
@@ -43,7 +43,6 @@
 \usepackage{hyperref}
 \usepackage{libertine}
 \usepackage{inconsolata}
-\usepackage{float}
 
 
 \usepackage[backend=bibtex,style=alphabetic]{biblatex}
@@ -59,6 +58,7 @@
 }
 
 \renewcommand{\thesection}{\arabic{section}}
+\renewcommand{\thefigure}{\arabic{figure}}
 
 %%%%% better source code display
 \usepackage{minted}