cortex: org/vision.org comparison

comparison org/vision.org @ 169:94b79c191fc7

renamed some functions in vision.org

author	Robert McIntyre <rlm@mit.edu>
date	Sat, 04 Feb 2012 04:23:32 -0700
parents	1c8e9d389ea4
children	1a00b4918529

comparison

equal deleted inserted replaced

-:1c8e9d389ea4
+:94b79c191fc7
 provided by (vision-pipeline)."
 [#^Renderer r #^FrameBuffer fb #^ByteBuffer bb #^BufferedImage bi]
 (byteBuffer->bufferedImage!
 (frameBuffer->byteBuffer! r fb bb) bi))
-(defn add-eye!
+(defn add-camera!
-"Add an eye to the world, calling continuation on every frame
+"Add a camera to the world, calling continuation on every frame
 produced."
 [#^Application world camera continuation]
 (let [width (.getWidth camera)
 	height (.getHeight camera)
 	render-manager (.getRenderManager world)
 (.setClearFlags true true true)
 (.setBackgroundColor ColorRGBA/Black)
 (.addProcessor (vision-pipeline continuation))
 (.attachScene (.getRootNode world)))))
-(defn retina-sensor-image
+(defn retina-sensor-profile
 "Return a map of pixel selection functions to BufferedImages
-describing the distribution of light-sensitive components on this
+describing the distribution of light-sensitive components of this
-geometry's surface. Each function creates an integer from the rgb
+eye. Each function creates an integer from the rgb values found in
-values found in the pixel. :red, :green, :blue, :gray are already
+the pixel. :red, :green, :blue, :gray are already defined as
-defined as extracting the red green blue and average components
+extracting the red, green, blue, and average components
 respectively."
 [#^Spatial eye]
 (if-let [eye-map (meta-data eye "eye")]
 (map-vals
 load-image
 (eval (read-string eye-map)))))
 (defn eye-dimensions
-"returns the width and height specified in the metadata of the eye"
+"Returns [width, height] specified in the metadata of the eye"
 [#^Spatial eye]
 (let [dimensions
 (map #(vector (.getWidth %) (.getHeight %))
-(vals (retina-sensor-image eye)))]
+(vals (retina-sensor-profile eye)))]
 [(apply max (map first dimensions))
 (apply max (map second dimensions))]))
 (defvar
 ^{:arglists '([creature])}
 eyes
 (sense-nodes "eyes")
 "Return the children of the creature's \"eyes\" node.")
-(defn attach-eye
+(defn add-eye!
-"Attach a Camera to the appropiate area and return the Camera."
+"Create a Camera centered on the current position of 'eye which
+follows the closest physical node in 'creature and sends visual
+data to 'continuation."
 [#^Node creature #^Spatial eye]
 (let [target (closest-node creature eye)
 [cam-width cam-height] (eye-dimensions eye)
 cam (Camera. cam-width cam-height)]
 (.setLocation cam (.getWorldTranslation eye))
 {:all    0xFFFFFF
 :red    0xFF0000
 :blue   0x0000FF
 :green  0x00FF00})
-(defn enable-vision
+(defn vision-fn
 "return [init-function sensor-functions] for a particular eye"
 [#^Node creature #^Spatial eye & {skip :skip :or {skip 0}}]
-(let [retinal-map (retina-sensor-image eye)
+(let [retinal-map (retina-sensor-profile eye)
-camera (attach-eye creature eye)
+camera (add-eye! creature eye)
 vision-image
 (atom
 (BufferedImage. (.getWidth camera)
 (.getHeight camera)
 BufferedImage/TYPE_BYTE_BINARY))]
 [(fn [world]
-(add-eye!
+(add-camera!
 world camera
 (let [counter  (atom 0)]
 (fn [r fb bb bi]
 (if (zero? (rem (swap! counter inc) (inc skip)))
 (reset! vision-image (BufferedImage! r fb bb bi)))))))
 [init-b senses-b]]
 [(conj init-a init-b)
 (into senses-a senses-b)])
 [[][]]
 (for [eye (eyes creature)]
-(enable-vision creature eye))))
+(vision-fn creature eye))))
 #+end_src
 {}
 (fn [world]
 (let [cam (.clone (.getCamera world))
 width (.getWidth cam)
 height (.getHeight cam)]
-(add-eye! world cam
+(add-camera! world cam
 ;;no-op
 (comp (view-image) BufferedImage!)
 )
-(add-eye! world
+(add-camera! world
 (doto (.clone cam)
 (.setLocation (Vector3f. -10 0 0))
 (.lookAt Vector3f/ZERO Vector3f/UNIT_Y))
 ;;no-op
 (comp (view-image) BufferedImage!))
 ;; This is here to restore the main view
 ;; after the other views have completed processing
-(add-eye! world (.getCamera world) no-op)))
+(add-camera! world (.getCamera world) no-op)))
 (fn [world tpf]
 (.rotate candy (* tpf 0.2) 0 0)))))
 #+end_src
 #+results: test-vision

Mercurial > cortex

comparison org/vision.org @ 169:94b79c191fc7