diff org/touch.org @ 304:2dfebf71053c

Merged Winston cover letter
author Dylan Holmes <ocsenave@gmail.com>
date Sat, 18 Feb 2012 02:07:40 -0600
parents 23aadf376e9d
children 7e7f8d6d9ec5
line wrap: on
line diff
     1.1 --- a/org/touch.org	Sat Feb 18 02:06:06 2012 -0600
     1.2 +++ b/org/touch.org	Sat Feb 18 02:07:40 2012 -0600
     1.3 @@ -435,7 +435,7 @@
     1.4                                               touch-objects))]
     1.5                           (FastMath/clamp
     1.6                            (float 
     1.7 -                           (if (> response limit) 0.0
     1.8 +                           (if (> response limit) (float 0.0)
     1.9                                 (+ response correction)))
    1.10                             (float 0.0)
    1.11                             limit)))
    1.12 @@ -485,7 +485,7 @@
    1.13          (for [i (range (count coords))]
    1.14            (.setRGB image ((coords i) 0) ((coords i) 1)
    1.15                     (apply touch->gray (sensor-data i)))))
    1.16 -       image))))
    1.17 +     image))))
    1.18  #+end_src
    1.19  
    1.20  #+results: visualization
    1.21 @@ -623,8 +623,8 @@
    1.22  #+begin_src clojure
    1.23  (in-ns 'cortex.test.touch)
    1.24  
    1.25 -(defn test-touch 
    1.26 -  ([] (test-touch false))
    1.27 +(defn test-worm-touch 
    1.28 +  ([] (test-worm-touch false))
    1.29    ([record?]
    1.30       (let [the-worm (doto (worm) (body!))
    1.31             touch (touch! the-worm)
    1.32 @@ -730,6 +730,7 @@
    1.33    - [[../src/cortex/test/touch.clj][cortex.test.touch]]
    1.34    - [[../src/cortex/video/magick4.clj][cortex.video.magick4]]
    1.35    - [[../src/cortex/video/magick5.clj][cortex.video.magick5]]
    1.36 +  - [[../assets/Models/test-touch/touch-cube.blend][touch-cube.blend]]
    1.37  #+html: <ul> <li> <a href="../org/touch.org">This org file</a> </li> </ul>
    1.38    - [[http://hg.bortreb.com ][source-repository]]
    1.39  
    1.40 @@ -781,11 +782,3 @@
    1.41  #+begin_src clojure :tangle ../src/cortex/video/magick5.clj
    1.42  <<magick5>>
    1.43  #+end_src
    1.44 -
    1.45 -
    1.46 -
    1.47 -
    1.48 -  
    1.49 -
    1.50 -
    1.51 -