Mercurial > cortex

changeset 294:76a5edd6507d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adjusted thumb a bit.
author Robert McIntyre <rlm@mit.edu>
date Thu, 16 Feb 2012 07:43:13 -0700
parents 577ce4d250b9
children 67a4e92d4628
files assets/Models/test-creature/hand.blend org/integration.org
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
     1.1 Binary file assets/Models/test-creature/hand.blend has changed

     2.1 --- a/org/integration.org	Thu Feb 16 07:38:15 2012 -0700
     2.2 +++ b/org/integration.org	Thu Feb 16 07:43:13 2012 -0700
     2.3 @@ -42,14 +42,14 @@
     2.4                     (body!))
     2.5          
     2.6          ;;;;;;;;;;;;  Sensors/Effectors  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     2.7 -        touch (touch! creature)
     2.8 -        touch-display (view-touch)
     2.9 +        ;;touch (touch! creature)
    2.10 +        ;;touch-display (view-touch)
    2.11  
    2.12 -        vision (vision! creature)
    2.13 -        vision-display (view-vision)
    2.14 +        ;;vision (vision! creature)
    2.15 +        ;;vision-display (view-vision)
    2.16  
    2.17 -        hearing (hearing! creature)
    2.18 -        hearing-display (view-hearing)
    2.19 +        ;;hearing (hearing! creature)
    2.20 +        ;;hearing-display (view-hearing)
    2.21  
    2.22          prop (proprioception! creature)
    2.23          prop-display (view-proprioception)
    2.24 @@ -89,10 +89,10 @@
    2.25                      (comp (view-image) BufferedImage!))
    2.26         (speed-up world))
    2.27       (fn [world tpf]
    2.28 -       (prop-display (prop))
    2.29 -       (touch-display (map #(% (.getRootNode world)) touch))
    2.30 -       (vision-display (map #(% world) vision))
    2.31 -       (hearing-display (map #(% world) hearing))
    2.32 +       ;;(prop-display (prop))
    2.33 +       ;;(touch-display (map #(% (.getRootNode world)) touch))
    2.34 +       ;;(vision-display (map #(% world) vision))
    2.35 +       ;;(hearing-display (map #(% world) hearing))
    2.36         (muscle-display (map #(% @muscle-exertion) muscles))
    2.37         (.setLocalTranslation me (.getLocation (.getCamera world)))
    2.38         (fix-display world))))))