# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1323281808 21600
# Node ID 1381a6ebd08b3dd3a34f6f83cc74413e47a8e000
# Parent  4b5f00110d8c0c98d134b4cb05a06ad4d7404ffb
updated org files to work with latest org changes

diff -r 4b5f00110d8c -r 1381a6ebd08b org/body.org
--- a/org/body.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/body.org	Wed Dec 07 12:16:48 2011 -0600
@@ -8,7 +8,7 @@
 
 
 * Proprioception
-#+srcname: proprioception
+#+name: proprioception
 #+begin_src clojure 
 (ns cortex.body
   (:use (cortex world util))
@@ -105,7 +105,7 @@
 #+end_src
 
 * Motor Control
-#+srcname: motor-control
+#+name: motor-control
 #+begin_src clojure
 (in-ns 'cortex.body)
 
diff -r 4b5f00110d8c -r 1381a6ebd08b org/eyes.org
--- a/org/eyes.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/eyes.org	Wed Dec 07 12:16:48 2011 -0600
@@ -11,7 +11,7 @@
 
 I want to make creatures with eyes. Each eye can be independely moved
 and should see its own version of the world depending on where it is.
-#+srcname: eyes
+#+name: eyes
 #+begin_src clojure 
 (ns cortex.vision
   "Simulate the sense of vision in jMonkeyEngine3. Enables multiple
@@ -85,7 +85,7 @@
 
 * Example
 
-#+srcname: test-vision
+#+name: test-vision
 #+begin_src clojure
 (ns test.vision
   (:use (cortex world util vision))
diff -r 4b5f00110d8c -r 1381a6ebd08b org/games.org
--- a/org/games.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/games.org	Wed Dec 07 12:16:48 2011 -0600
@@ -20,7 +20,7 @@
 =AssetManager= via extendig =SimpleApplication=, we have to build one
 ourselves. 
 
-#+srcname: hello-simple-app
+#+name: hello-simple-app
 #+begin_src clojure :results silent
 (ns hello.hello-simple-app
   (:use cortex.world)
@@ -67,7 +67,7 @@
 
 * Simpler HelloSimpleApp
 
-#+srcname: hello-simpler-app
+#+name: hello-simpler-app
 #+begin_src clojure 
 (ns hello.hello-simpler-app
   (:use cortex.world)
@@ -92,7 +92,7 @@
 * COMMENT Hello Physics
 From http://jmonkeyengine.org/wiki/doku.php/jme3:beginner:hello_physics
 
-#+srcname: brick-wall-header
+#+name: brick-wall-header
 #+begin_src clojure :results silent
 (ns hello.brick-wall)
 (require 'cortex.import)
@@ -104,7 +104,7 @@
 (use 'cortex.util)
 #+end_src
 
-#+srcname: brick-wall-body
+#+name: brick-wall-body
 #+begin_src clojure :results silent
 (in-ns 'hello.brick-wall)
 
@@ -221,7 +221,7 @@
 [[../images/brick-wall-knocked-down.jpg]]
 
 * COMMENT Other Brick Games
-#+srcname: other-games
+#+name: other-games
 #+begin_src clojure :results silent
 (ns hello.other-games
    {:author "Dylan Holmes"})
@@ -369,7 +369,7 @@
 [[../images/dominos.jpg]]
 
 * Hello Loop
-#+srcname: hello-loop
+#+name: hello-loop
 #+begin_src clojure :results silent
 (ns hello.loop
   (:use cortex.world)
@@ -397,7 +397,7 @@
    
 * COMMENT Hello Collision
 
-#+srcname: hello-collision
+#+name: hello-collision
 #+begin_src clojure :results silent
 (ns hello.collision)
 (use 'cortex.world)
@@ -518,7 +518,7 @@
 #+end_src
 
 * COMMENT Hello Terrain
-#+srcname: hello-terrain
+#+name: hello-terrain
 #+begin_src clojure :results silent
 (ns hello.terrain)
 (use 'cortex.world)
@@ -595,7 +595,7 @@
 
 
 
-#+srcname: hello-animation
+#+name: hello-animation
 #+begin_src clojure :results silent
 (ns hello.animation)
 (use 'cortex.world)
@@ -668,7 +668,7 @@
 #+end_src
 
 * COMMENT Hello Materials
-#+srcname: material
+#+name: material
 #+begin_src clojure :results silent
 (ns hello.material)
 (use 'cortex.world)
diff -r 4b5f00110d8c -r 1381a6ebd08b org/setup.org
--- a/org/setup.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/setup.org	Wed Dec 07 12:16:48 2011 -0600
@@ -11,7 +11,7 @@
 
 First, I checked out the source to jMonkeyEngine:
 
-#+srcname: checkout 
+#+name: checkout 
 #+begin_src sh :results verbatim
 svn checkout http://jmonkeyengine.googlecode.com/svn/trunk/engine \
              /home/r/proj/jMonkeyEngine3
@@ -23,7 +23,7 @@
 
 Building jMonkeyEngine is easy enough:
 
-#+srcname: build
+#+name: build
 #+begin_src sh :results verbatim
 cd /home/r/proj/jMonkeyEngine3
 ant jar | tail -n 2
@@ -36,7 +36,7 @@
 
 Also build the javadoc:
 
-#+srcname: javadoc
+#+name: javadoc
 #+begin_src sh :results verbatim
 cd /home/r/proj/jMonkeyEngine3
 ant javadoc | tail -n 2
diff -r 4b5f00110d8c -r 1381a6ebd08b org/skin.org
--- a/org/skin.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/skin.org	Wed Dec 07 12:16:48 2011 -0600
@@ -17,7 +17,7 @@
 complicated regions like the hands/face, etc. get more touch receptors
 than simpler areas of the body.
 
-#+srcname: skin-main
+#+name: skin-main
 #+begin_src clojure
 (ns cortex.touch
   "Simulate the sense of touch in jMonkeyEngine3. Enables any Geometry
@@ -105,7 +105,7 @@
 
 * Example
 
-#+srcname: touch-test
+#+name: touch-test
 #+begin_src clojure 
 (ns test.touch
   (:use (cortex world util touch))
diff -r 4b5f00110d8c -r 1381a6ebd08b org/test.org
--- a/org/test.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/test.org	Wed Dec 07 12:16:48 2011 -0600
@@ -1,13 +1,13 @@
-#+title: The BODY!!!
+#+title: Test Suite
 #+author: Robert McIntyre
 #+email: rlm@mit.edu
 #+description: Simulating a body (movement, touch, propioception) in jMonkeyEngine3.
 #+SETUPFILE: ../../aurellem/org/setup.org
 #+INCLUDE: ../../aurellem/org/level-0.org
 
-* Body  
+* Tests
 
-#+srcname: body-main
+#+name: body-main
 #+begin_src clojure 
 (ns test.all
   (:require [test touch vision])
diff -r 4b5f00110d8c -r 1381a6ebd08b org/util.org
--- a/org/util.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/util.org	Wed Dec 07 12:16:48 2011 -0600
@@ -13,7 +13,7 @@
 
 * Imports
 
-#+srcname: import
+#+name: import
 #+begin_src clojure :results silent
 (ns cortex.import
   (:require swank.util.class-browse))
@@ -78,7 +78,7 @@
 
 *** Changing Settings
 
-#+srcname: util
+#+name: util
 #+begin_src clojure 
 (ns cortex.util
   "Utility functions for making jMonkeyEngine3 easier to program from
@@ -194,7 +194,7 @@
 
 *** Creating Basic Shapes
 
-#+srcname: shapes
+#+name: shapes
 #+begin_src clojure :results silent
 (in-ns 'cortex.util)
 
@@ -296,7 +296,7 @@
 
 
 *** Debug Actions
-#+srcname: debug-actions
+#+name: debug-actions
 #+begin_src clojure :results silent
 (in-ns 'cortex.util)
 
@@ -365,7 +365,7 @@
 
 *** Viewing Objects
 
-#+srcname: world-view
+#+name: world-view
 #+begin_src clojure :results silent
 (in-ns 'cortex.util)
 
diff -r 4b5f00110d8c -r 1381a6ebd08b org/world.org
--- a/org/world.org	Wed Dec 07 10:29:35 2011 -0600
+++ b/org/world.org	Wed Dec 07 12:16:48 2011 -0600
@@ -46,14 +46,14 @@
    =SimpleApplication= classes.
 
 ** Header
-#+srcname: header
+#+name: header
 #+begin_src clojure :results silent    
 (ns cortex.world
   "World Creation, abstracion over jme3's input system, and REPL
   driven exception handling"
   {:author "Robert McIntyre"}
   
-  (:use (clojure.contrib (def :only (defvar))))
+  (:use (clojure.contrib (def :only (defvar defn-memo))))
   (:use [clojure.contrib [str-utils :only [re-gsub]]])
 
   (:import com.aurellem.capture.IsoTimer)
@@ -71,11 +71,13 @@
   (:import com.jme3.app.SimpleApplication)
   (:import com.jme3.input.controls.ActionListener)
   (:import com.jme3.renderer.queue.RenderQueue$ShadowMode)
-  (:import org.lwjgl.input.Mouse))
+  (:import org.lwjgl.input.Mouse)
+  (:import com.aurellem.capture.AurellemSystemDelegate))
+
 #+end_src    
     
 ** General Settings
-#+srcname: settings    
+#+name: settings    
 #+begin_src clojure 
 (in-ns 'cortex.world)
 
@@ -105,7 +107,7 @@
 Instance.
 
 ** Exception Protection
-#+srcname: exceptions
+#+name: exceptions
 #+begin_src clojure
 (in-ns 'cortex.world)
 
@@ -138,7 +140,7 @@
 restarting the JVM.
 
 ** Input
-#+srcname: input
+#+name: input
 #+begin_src clojure
 (in-ns 'cortex.world)
 
@@ -192,6 +194,9 @@
 
 #+end_src
 
+#+results: input
+: #'cortex.world/initialize-inputs
+
 These functions are for controlling the world through the keyboard and
 mouse.
 
@@ -226,7 +231,7 @@
 :  ["key-at" #<KeyTrigger com.jme3.input.controls.KeyTrigger@4c3e2e5f>])
 
 ** World Creation
-#+srcname: world
+#+name: world
 #+begin_src clojure :results silent
 (in-ns 'cortex.world)
 
@@ -326,6 +331,7 @@
       (.setShowSettings false)
       ;; continue running simulation even if the window has lost
       ;; focus.
+      (JmeSystem/setSystemDelegate (AurellemSystemDelegate.))
       (.setPauseOnLostFocus false)
       (.setSettings *app-settings*))))
 #+end_src