# HG changeset patch # User Robert McIntyre # Date 1330459461 21600 # Node ID bb3f8a4af87ffd760515265395c77d2b7967cbcb # Parent 2c7fbcbd5ebb21265f808217c8d44d1c5d50fb51 removed references to defvar from clojure.contrib.def since the def from 1.4 now allows for docstrings diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/body.org --- a/org/body.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/body.org Tue Feb 28 14:04:21 2012 -0600 @@ -233,11 +233,11 @@ #+name: joints-2 #+begin_src clojure -(defvar - ^{:arglists '([creature])} +(def + ^{:doc "Return the children of the creature's \"joints\" node." + :arglists '([creature])} joints - (sense-nodes "joints") - "Return the children of the creature's \"joints\" node.") + (sense-nodes "joints")) #+end_src ** Joint Targets and Orientation @@ -550,7 +550,6 @@ that a creature can have a physical presence in the simulation." {:author "Robert McIntyre"} (:use (cortex world util sense)) - (:use clojure.contrib.def) (:import (com.jme3.math Vector3f Quaternion Vector2f Matrix3f) (com.jme3.bullet.joints diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/hearing.org --- a/org/hearing.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/hearing.org Tue Feb 28 14:04:21 2012 -0600 @@ -834,11 +834,12 @@ #+name: hearing-ears #+begin_src clojure -(defvar - ^{:arglists '([creature])} +(def + ^{:doc "Return the children of the creature's \"ears\" node." + :arglists '([creature])} ears - (sense-nodes "ears") - "Return the children of the creature's \"ears\" node.") + (sense-nodes "ears")) + (defn update-listener-velocity! "Update the listener's velocity every update loop." @@ -1140,7 +1141,6 @@ instantiates them in the world as simulated ears." {:author "Robert McIntyre"} (:use (cortex world util sense)) - (:use clojure.contrib.def) (:import java.nio.ByteBuffer) (:import java.awt.image.BufferedImage) (:import org.tritonus.share.sampled.FloatSampleTools) diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/movement.org --- a/org/movement.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/movement.org Tue Feb 28 14:04:21 2012 -0600 @@ -63,11 +63,12 @@ #+begin_src clojure (in-ns 'cortex.movement) -(defvar - ^{:arglists '([creature])} +(def + ^{:doc "Return the children of the creature's \"muscles\" node." + :arglists '([creature])} muscles - (sense-nodes "muscles") - "Return the children of the creature's \"muscles\" node.") + (sense-nodes "muscles")) + (defn muscle-profile-image "Get the muscle-profile image from the node's blender meta-data." @@ -292,7 +293,6 @@ to move around in a simulated environment." {:author "Robert McIntyre"} (:use (cortex world util sense body)) - (:use clojure.contrib.def) (:import java.awt.image.BufferedImage) (:import com.jme3.scene.Node) (:import com.jme3.math.Vector3f) @@ -304,7 +304,6 @@ (ns cortex.test.movement (:use (cortex world util sense body movement)) (:use cortex.test.body) - (:use clojure.contrib.def) (:import java.io.File) (:import java.awt.image.BufferedImage) (:import com.jme3.scene.Node) diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/proprioception.org --- a/org/proprioception.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/proprioception.org Tue Feb 28 14:04:21 2012 -0600 @@ -343,7 +343,6 @@ in jMonkeyEngine3. Reads specially prepared blender files to automatically generate proprioceptive senses." (:use (cortex world util sense body)) - (:use clojure.contrib.def) (:import com.jme3.scene.Node) (:import java.awt.image.BufferedImage) (:import (com.jme3.math Vector3f Quaternion))) diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/test.org --- a/org/test.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/test.org Tue Feb 28 14:04:21 2012 -0600 @@ -11,7 +11,6 @@ #+begin_src clojure (ns cortex.test (:use cortex.util) - (:use clojure.contrib.def) (:require [cortex.test touch vision body hearing]) (:import com.jme3.app.state.AppState com.jme3.system.AppSettings)) @@ -49,13 +48,13 @@ (println-repl (:doc (meta test-fn-var))) (run-world ((deref test-fn-var)))) -(defvar test-suite +(def test-suite + "The full test suite for all sensors/effectors." [#'cortex.test.touch/test-skin #'cortex.test.vision/test-two-eyes #'cortex.test.hearing/test-advanced-hearing #'cortex.test.body/test-proprioception - #'cortex.test.body/test-motor-control] - "The full test suite for all sensors/effectors.") + #'cortex.test.body/test-motor-control]) (defn run-suite "Run the entire test-suite." diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/touch.org --- a/org/touch.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/touch.org Tue Feb 28 14:04:21 2012 -0600 @@ -723,7 +723,6 @@ construct this sense automatically." {:author "Robert McIntyre"} (:use (cortex world util sense)) - (:use clojure.contrib.def) (:import (com.jme3.scene Geometry Node Mesh)) (:import com.jme3.collision.CollisionResults) (:import com.jme3.scene.VertexBuffer$Type) diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/util.org --- a/org/util.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/util.org Tue Feb 28 14:04:21 2012 -0600 @@ -83,7 +83,6 @@ clojure." {:author "Robert McIntyre"} (:use cortex.world) - (:use clojure.contrib.def) (:import com.jme3.math.Vector3f) (:import com.jme3.math.Quaternion) (:import com.jme3.asset.TextureKey) diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/vision.org --- a/org/vision.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/vision.org Tue Feb 28 14:04:21 2012 -0600 @@ -224,13 +224,13 @@ #+name: sensitivity #+begin_src clojure -(defvar sensitivity-presets +(def sensitivity-presets + "Retinal sensitivity presets for sensors that extract one channel + (:red :blue :green) or average all channels (:all)" {:all 0xFFFFFF :red 0xFF0000 :blue 0x0000FF - :green 0x00FF00} - "Retinal sensitivity presets for sensors that extract one channel - (:red :blue :green) or average all channels (:all)") + :green 0x00FF00}) #+end_src ** Metadata Processing @@ -268,11 +268,11 @@ eyes the creature has. #+name: eye-node #+begin_src clojure -(defvar - ^{:arglists '([creature])} +(def + ^{:doc "Return the children of the creature's \"eyes\" node." + :arglists '([creature])} eyes - (sense-nodes "eyes") - "Return the children of the creature's \"eyes\" node.") + (sense-nodes "eyes")) #+end_src Then, add the camera created by =add-eye!= to the simulation by @@ -692,7 +692,6 @@ them in the world as actual eyes." {:author "Robert McIntyre"} (:use (cortex world sense util)) - (:use clojure.contrib.def) (:import com.jme3.post.SceneProcessor) (:import (com.jme3.util BufferUtils Screenshots)) (:import java.nio.ByteBuffer) diff -r 2c7fbcbd5ebb -r bb3f8a4af87f org/world.org --- a/org/world.org Tue Feb 28 13:44:46 2012 -0600 +++ b/org/world.org Tue Feb 28 14:04:21 2012 -0600 @@ -53,7 +53,7 @@ driven exception handling" {:author "Robert McIntyre"} - (:use (clojure.contrib (def :only (defvar defn-memo)))) + (:use (clojure.contrib (def :only (defn-memo)))) (:use [clojure.contrib [str-utils :only [re-gsub]]]) (:import com.aurellem.capture.IsoTimer) @@ -217,18 +217,17 @@ mouse button controls to the map. #+begin_src clojure :exports both :results output -(require 'clojure.contrib.pprint) -(clojure.contrib.pprint/pprint +(clojure.pprint/pprint (take 6 (cortex.world/all-keys))) #+end_src #+results: -: (["key-n" #] -: ["key-apps" #] -: ["key-pgup" #] -: ["key-f8" #] -: ["key-o" #] -: ["key-at" #]) +: (["key-n" #] +: ["key-apps" #] +: ["key-pgup" #] +: ["key-f8" #] +: ["key-o" #] +: ["key-at" #]) ** World Creation #+name: world