Mercurial > cortex

changeset 337:fdc98824d69b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
working on problem with vision.
author Robert McIntyre <rlm@mit.edu>
date Fri, 20 Jul 2012 13:14:22 -0500
parents 70469ff8eb56
children d37ccb6c888f
files .hgignore org/vision.org
diffstat 2 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/.hgignore	Fri Jul 20 13:04:25 2012 -0500
     1.2 +++ b/.hgignore	Fri Jul 20 13:14:22 2012 -0500
     1.3 @@ -10,6 +10,9 @@
     1.4  libbulletjme64.so
     1.5  liblwjgl64.so
     1.6  libopenal64.so
     1.7 +liblwjgl.so
     1.8 +libopenal.so
     1.9 +libbulletjme.so
    1.10  
    1.11  
    1.12  syntax: regexp

     2.1 --- a/org/vision.org	Fri Jul 20 13:04:25 2012 -0500
     2.2 +++ b/org/vision.org	Fri Jul 20 13:14:22 2012 -0500
     2.3 @@ -562,7 +562,7 @@
     2.4    ([record?] 
     2.5       (let [the-worm (doto (worm)(body!))
     2.6             vision (vision! the-worm)
     2.7 -           vision-display (view-vision)
     2.8 +           ;;vision-display (view-vision)
     2.9             fix-display (gen-fix-display)
    2.10             me (sphere 0.5 :color ColorRGBA/Blue :physical? false)
    2.11             x-axis
    2.12 @@ -584,9 +584,9 @@
    2.13            "key-g" (colored-cannon-ball ColorRGBA/Green))
    2.14          (fn [world]
    2.15            (light-up-everything world)
    2.16 -          (speed-up world)
    2.17 +          ;;(speed-up world)
    2.18            (.setTimer world timer)
    2.19 -          (display-dilated-time world timer)
    2.20 +          ;;(display-dilated-time world timer)
    2.21            ;; add a view from the worm's perspective
    2.22            (if record?
    2.23              (Capture/captureVideo
    2.24 @@ -609,16 +609,16 @@
    2.25          
    2.26          (fn [world _ ]
    2.27            (.setLocalTranslation me (.getLocation (.getCamera world)))
    2.28 -          (vision-display
    2.29 -           (map #(% world) vision)
    2.30 -           (if record?
    2.31 -             (File. "/home/r/proj/cortex/render/worm-vision")))
    2.32 +          ;; (vision-display
    2.33 +          ;;  (map #(% world) vision)
    2.34 +          ;;  (if record?
    2.35 +          ;;    (File. "/home/r/proj/cortex/render/worm-vision")))
    2.36            (fix-display world)
    2.37            )))))
    2.38  #+end_src
    2.39  
    2.40  #+RESULTS: test-2
    2.41 -|   | #'cortex.test.vision/test-worm-vision |
    2.42 +: #'cortex.test.vision/test-worm-vision
    2.43  
    2.44  
    2.45  The world consists of the worm and a flat gray floor. I can shoot red,