Mercurial > cortex

changeset 18:221052dac374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
touch has been GREATLY improved
author Robert McIntyre <rlm@mit.edu>
date Sun, 23 Oct 2011 12:07:34 -0700
parents 014b14d48092
children 5a371057078f
files org/skin.org
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/skin.org	Sun Oct 23 11:58:33 2011 -0700
     1.2 +++ b/org/skin.org	Sun Oct 23 12:07:34 2011 -0700
     1.3 @@ -150,8 +150,8 @@
     1.4                                  (map #(.getGeometry %) results)))
     1.5                   ;;color (contact-color answer)
     1.6                   ]
     1.7 -             (if (= 2 (count answer))
     1.8 -               (dorun (map #(println-repl (.getName %)) answer)))
     1.9 +         
    1.10 +               ;;(dorun (map #(println-repl (.getName %)) answer))
    1.11               (count answer) )))))))
    1.12  
    1.13  (defn enable-debug [world]
    1.14 @@ -217,8 +217,8 @@
    1.15  
    1.16  (defn test-skin []
    1.17    (let [b
    1.18 -	(transparent-box)
    1.19 -	;;(transparent-sphere)
    1.20 +	;;(transparent-box)
    1.21 +	(transparent-sphere)
    1.22          ;;(sphere)
    1.23  	f (transparent-floor)
    1.24  	;;controls
    1.25 @@ -239,14 +239,16 @@
    1.26       ;;   world 
    1.27       ;;   (file-str "/home/r/proj/cortex/tmp/blob.avi"))
    1.28       ;;  (no-logging)
    1.29 -     (enable-debug world)
    1.30 +     ;;(enable-debug world)
    1.31       ;;  (set-accuracy world (/ 1 60))
    1.32       )
    1.33  
    1.34       (fn [& _]
    1.35 -       (let [touch-data (touch-percieve 0.2 b node)]
    1.36 +       (let [sensitivity 5
    1.37 +             touch-data (touch-percieve sensitivity b node)]
    1.38           ;;(println-repl touch-data)
    1.39 -         (manage-ray-debug-node debug-node b touch-data 0.2))
    1.40 +         (manage-ray-debug-node debug-node b touch-data sensitivity)
    1.41 +         )
    1.42         (Thread/sleep 10)
    1.43         ;;(touch-print controls)
    1.44         ;;(color-touch controls)