Mercurial > cortex
changeset 66:1381a6ebd08b
updated org files to work with latest org changes
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Wed, 07 Dec 2011 12:16:48 -0600 |
parents | 4b5f00110d8c |
children | 6f74d89fb8b3 |
files | org/body.org org/eyes.org org/games.org org/setup.org org/skin.org org/test.org org/util.org org/world.org |
diffstat | 8 files changed, 40 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
1.1 --- a/org/body.org Wed Dec 07 10:29:35 2011 -0600 1.2 +++ b/org/body.org Wed Dec 07 12:16:48 2011 -0600 1.3 @@ -8,7 +8,7 @@ 1.4 1.5 1.6 * Proprioception 1.7 -#+srcname: proprioception 1.8 +#+name: proprioception 1.9 #+begin_src clojure 1.10 (ns cortex.body 1.11 (:use (cortex world util)) 1.12 @@ -105,7 +105,7 @@ 1.13 #+end_src 1.14 1.15 * Motor Control 1.16 -#+srcname: motor-control 1.17 +#+name: motor-control 1.18 #+begin_src clojure 1.19 (in-ns 'cortex.body) 1.20
2.1 --- a/org/eyes.org Wed Dec 07 10:29:35 2011 -0600 2.2 +++ b/org/eyes.org Wed Dec 07 12:16:48 2011 -0600 2.3 @@ -11,7 +11,7 @@ 2.4 2.5 I want to make creatures with eyes. Each eye can be independely moved 2.6 and should see its own version of the world depending on where it is. 2.7 -#+srcname: eyes 2.8 +#+name: eyes 2.9 #+begin_src clojure 2.10 (ns cortex.vision 2.11 "Simulate the sense of vision in jMonkeyEngine3. Enables multiple 2.12 @@ -85,7 +85,7 @@ 2.13 2.14 * Example 2.15 2.16 -#+srcname: test-vision 2.17 +#+name: test-vision 2.18 #+begin_src clojure 2.19 (ns test.vision 2.20 (:use (cortex world util vision))
3.1 --- a/org/games.org Wed Dec 07 10:29:35 2011 -0600 3.2 +++ b/org/games.org Wed Dec 07 12:16:48 2011 -0600 3.3 @@ -20,7 +20,7 @@ 3.4 =AssetManager= via extendig =SimpleApplication=, we have to build one 3.5 ourselves. 3.6 3.7 -#+srcname: hello-simple-app 3.8 +#+name: hello-simple-app 3.9 #+begin_src clojure :results silent 3.10 (ns hello.hello-simple-app 3.11 (:use cortex.world) 3.12 @@ -67,7 +67,7 @@ 3.13 3.14 * Simpler HelloSimpleApp 3.15 3.16 -#+srcname: hello-simpler-app 3.17 +#+name: hello-simpler-app 3.18 #+begin_src clojure 3.19 (ns hello.hello-simpler-app 3.20 (:use cortex.world) 3.21 @@ -92,7 +92,7 @@ 3.22 * COMMENT Hello Physics 3.23 From http://jmonkeyengine.org/wiki/doku.php/jme3:beginner:hello_physics 3.24 3.25 -#+srcname: brick-wall-header 3.26 +#+name: brick-wall-header 3.27 #+begin_src clojure :results silent 3.28 (ns hello.brick-wall) 3.29 (require 'cortex.import) 3.30 @@ -104,7 +104,7 @@ 3.31 (use 'cortex.util) 3.32 #+end_src 3.33 3.34 -#+srcname: brick-wall-body 3.35 +#+name: brick-wall-body 3.36 #+begin_src clojure :results silent 3.37 (in-ns 'hello.brick-wall) 3.38 3.39 @@ -221,7 +221,7 @@ 3.40 [[../images/brick-wall-knocked-down.jpg]] 3.41 3.42 * COMMENT Other Brick Games 3.43 -#+srcname: other-games 3.44 +#+name: other-games 3.45 #+begin_src clojure :results silent 3.46 (ns hello.other-games 3.47 {:author "Dylan Holmes"}) 3.48 @@ -369,7 +369,7 @@ 3.49 [[../images/dominos.jpg]] 3.50 3.51 * Hello Loop 3.52 -#+srcname: hello-loop 3.53 +#+name: hello-loop 3.54 #+begin_src clojure :results silent 3.55 (ns hello.loop 3.56 (:use cortex.world) 3.57 @@ -397,7 +397,7 @@ 3.58 3.59 * COMMENT Hello Collision 3.60 3.61 -#+srcname: hello-collision 3.62 +#+name: hello-collision 3.63 #+begin_src clojure :results silent 3.64 (ns hello.collision) 3.65 (use 'cortex.world) 3.66 @@ -518,7 +518,7 @@ 3.67 #+end_src 3.68 3.69 * COMMENT Hello Terrain 3.70 -#+srcname: hello-terrain 3.71 +#+name: hello-terrain 3.72 #+begin_src clojure :results silent 3.73 (ns hello.terrain) 3.74 (use 'cortex.world) 3.75 @@ -595,7 +595,7 @@ 3.76 3.77 3.78 3.79 -#+srcname: hello-animation 3.80 +#+name: hello-animation 3.81 #+begin_src clojure :results silent 3.82 (ns hello.animation) 3.83 (use 'cortex.world) 3.84 @@ -668,7 +668,7 @@ 3.85 #+end_src 3.86 3.87 * COMMENT Hello Materials 3.88 -#+srcname: material 3.89 +#+name: material 3.90 #+begin_src clojure :results silent 3.91 (ns hello.material) 3.92 (use 'cortex.world)
4.1 --- a/org/setup.org Wed Dec 07 10:29:35 2011 -0600 4.2 +++ b/org/setup.org Wed Dec 07 12:16:48 2011 -0600 4.3 @@ -11,7 +11,7 @@ 4.4 4.5 First, I checked out the source to jMonkeyEngine: 4.6 4.7 -#+srcname: checkout 4.8 +#+name: checkout 4.9 #+begin_src sh :results verbatim 4.10 svn checkout http://jmonkeyengine.googlecode.com/svn/trunk/engine \ 4.11 /home/r/proj/jMonkeyEngine3 4.12 @@ -23,7 +23,7 @@ 4.13 4.14 Building jMonkeyEngine is easy enough: 4.15 4.16 -#+srcname: build 4.17 +#+name: build 4.18 #+begin_src sh :results verbatim 4.19 cd /home/r/proj/jMonkeyEngine3 4.20 ant jar | tail -n 2 4.21 @@ -36,7 +36,7 @@ 4.22 4.23 Also build the javadoc: 4.24 4.25 -#+srcname: javadoc 4.26 +#+name: javadoc 4.27 #+begin_src sh :results verbatim 4.28 cd /home/r/proj/jMonkeyEngine3 4.29 ant javadoc | tail -n 2
5.1 --- a/org/skin.org Wed Dec 07 10:29:35 2011 -0600 5.2 +++ b/org/skin.org Wed Dec 07 12:16:48 2011 -0600 5.3 @@ -17,7 +17,7 @@ 5.4 complicated regions like the hands/face, etc. get more touch receptors 5.5 than simpler areas of the body. 5.6 5.7 -#+srcname: skin-main 5.8 +#+name: skin-main 5.9 #+begin_src clojure 5.10 (ns cortex.touch 5.11 "Simulate the sense of touch in jMonkeyEngine3. Enables any Geometry 5.12 @@ -105,7 +105,7 @@ 5.13 5.14 * Example 5.15 5.16 -#+srcname: touch-test 5.17 +#+name: touch-test 5.18 #+begin_src clojure 5.19 (ns test.touch 5.20 (:use (cortex world util touch))
6.1 --- a/org/test.org Wed Dec 07 10:29:35 2011 -0600 6.2 +++ b/org/test.org Wed Dec 07 12:16:48 2011 -0600 6.3 @@ -1,13 +1,13 @@ 6.4 -#+title: The BODY!!! 6.5 +#+title: Test Suite 6.6 #+author: Robert McIntyre 6.7 #+email: rlm@mit.edu 6.8 #+description: Simulating a body (movement, touch, propioception) in jMonkeyEngine3. 6.9 #+SETUPFILE: ../../aurellem/org/setup.org 6.10 #+INCLUDE: ../../aurellem/org/level-0.org 6.11 6.12 -* Body 6.13 +* Tests 6.14 6.15 -#+srcname: body-main 6.16 +#+name: body-main 6.17 #+begin_src clojure 6.18 (ns test.all 6.19 (:require [test touch vision])
7.1 --- a/org/util.org Wed Dec 07 10:29:35 2011 -0600 7.2 +++ b/org/util.org Wed Dec 07 12:16:48 2011 -0600 7.3 @@ -13,7 +13,7 @@ 7.4 7.5 * Imports 7.6 7.7 -#+srcname: import 7.8 +#+name: import 7.9 #+begin_src clojure :results silent 7.10 (ns cortex.import 7.11 (:require swank.util.class-browse)) 7.12 @@ -78,7 +78,7 @@ 7.13 7.14 *** Changing Settings 7.15 7.16 -#+srcname: util 7.17 +#+name: util 7.18 #+begin_src clojure 7.19 (ns cortex.util 7.20 "Utility functions for making jMonkeyEngine3 easier to program from 7.21 @@ -194,7 +194,7 @@ 7.22 7.23 *** Creating Basic Shapes 7.24 7.25 -#+srcname: shapes 7.26 +#+name: shapes 7.27 #+begin_src clojure :results silent 7.28 (in-ns 'cortex.util) 7.29 7.30 @@ -296,7 +296,7 @@ 7.31 7.32 7.33 *** Debug Actions 7.34 -#+srcname: debug-actions 7.35 +#+name: debug-actions 7.36 #+begin_src clojure :results silent 7.37 (in-ns 'cortex.util) 7.38 7.39 @@ -365,7 +365,7 @@ 7.40 7.41 *** Viewing Objects 7.42 7.43 -#+srcname: world-view 7.44 +#+name: world-view 7.45 #+begin_src clojure :results silent 7.46 (in-ns 'cortex.util) 7.47
8.1 --- a/org/world.org Wed Dec 07 10:29:35 2011 -0600 8.2 +++ b/org/world.org Wed Dec 07 12:16:48 2011 -0600 8.3 @@ -46,14 +46,14 @@ 8.4 =SimpleApplication= classes. 8.5 8.6 ** Header 8.7 -#+srcname: header 8.8 +#+name: header 8.9 #+begin_src clojure :results silent 8.10 (ns cortex.world 8.11 "World Creation, abstracion over jme3's input system, and REPL 8.12 driven exception handling" 8.13 {:author "Robert McIntyre"} 8.14 8.15 - (:use (clojure.contrib (def :only (defvar)))) 8.16 + (:use (clojure.contrib (def :only (defvar defn-memo)))) 8.17 (:use [clojure.contrib [str-utils :only [re-gsub]]]) 8.18 8.19 (:import com.aurellem.capture.IsoTimer) 8.20 @@ -71,11 +71,13 @@ 8.21 (:import com.jme3.app.SimpleApplication) 8.22 (:import com.jme3.input.controls.ActionListener) 8.23 (:import com.jme3.renderer.queue.RenderQueue$ShadowMode) 8.24 - (:import org.lwjgl.input.Mouse)) 8.25 + (:import org.lwjgl.input.Mouse) 8.26 + (:import com.aurellem.capture.AurellemSystemDelegate)) 8.27 + 8.28 #+end_src 8.29 8.30 ** General Settings 8.31 -#+srcname: settings 8.32 +#+name: settings 8.33 #+begin_src clojure 8.34 (in-ns 'cortex.world) 8.35 8.36 @@ -105,7 +107,7 @@ 8.37 Instance. 8.38 8.39 ** Exception Protection 8.40 -#+srcname: exceptions 8.41 +#+name: exceptions 8.42 #+begin_src clojure 8.43 (in-ns 'cortex.world) 8.44 8.45 @@ -138,7 +140,7 @@ 8.46 restarting the JVM. 8.47 8.48 ** Input 8.49 -#+srcname: input 8.50 +#+name: input 8.51 #+begin_src clojure 8.52 (in-ns 'cortex.world) 8.53 8.54 @@ -192,6 +194,9 @@ 8.55 8.56 #+end_src 8.57 8.58 +#+results: input 8.59 +: #'cortex.world/initialize-inputs 8.60 + 8.61 These functions are for controlling the world through the keyboard and 8.62 mouse. 8.63 8.64 @@ -226,7 +231,7 @@ 8.65 : ["key-at" #<KeyTrigger com.jme3.input.controls.KeyTrigger@4c3e2e5f>]) 8.66 8.67 ** World Creation 8.68 -#+srcname: world 8.69 +#+name: world 8.70 #+begin_src clojure :results silent 8.71 (in-ns 'cortex.world) 8.72 8.73 @@ -326,6 +331,7 @@ 8.74 (.setShowSettings false) 8.75 ;; continue running simulation even if the window has lost 8.76 ;; focus. 8.77 + (JmeSystem/setSystemDelegate (AurellemSystemDelegate.)) 8.78 (.setPauseOnLostFocus false) 8.79 (.setSettings *app-settings*)))) 8.80 #+end_src