# HG changeset patch # User Robert McIntyre # Date 1329403393 25200 # Node ID 76a5edd6507d4c64a6f37251a6b8eabc8473fa31 # Parent 577ce4d250b9aeb934049c6aedb8842c909830a5 adjusted thumb a bit. diff -r 577ce4d250b9 -r 76a5edd6507d assets/Models/test-creature/hand.blend Binary file assets/Models/test-creature/hand.blend has changed diff -r 577ce4d250b9 -r 76a5edd6507d org/integration.org --- a/org/integration.org Thu Feb 16 07:38:15 2012 -0700 +++ b/org/integration.org Thu Feb 16 07:43:13 2012 -0700 @@ -42,14 +42,14 @@ (body!)) ;;;;;;;;;;;; Sensors/Effectors ;;;;;;;;;;;;;;;;;;;;;;;;;;;; - touch (touch! creature) - touch-display (view-touch) + ;;touch (touch! creature) + ;;touch-display (view-touch) - vision (vision! creature) - vision-display (view-vision) + ;;vision (vision! creature) + ;;vision-display (view-vision) - hearing (hearing! creature) - hearing-display (view-hearing) + ;;hearing (hearing! creature) + ;;hearing-display (view-hearing) prop (proprioception! creature) prop-display (view-proprioception) @@ -89,10 +89,10 @@ (comp (view-image) BufferedImage!)) (speed-up world)) (fn [world tpf] - (prop-display (prop)) - (touch-display (map #(% (.getRootNode world)) touch)) - (vision-display (map #(% world) vision)) - (hearing-display (map #(% world) hearing)) + ;;(prop-display (prop)) + ;;(touch-display (map #(% (.getRootNode world)) touch)) + ;;(vision-display (map #(% world) vision)) + ;;(hearing-display (map #(% world) hearing)) (muscle-display (map #(% @muscle-exertion) muscles)) (.setLocalTranslation me (.getLocation (.getCamera world))) (fix-display world))))))