1.1 Binary file assets/Models/test-creature/finger-tip.png has changed

     2.1 Binary file assets/Models/test-creature/finger-tip.xcf has changed

     3.1 Binary file assets/Models/test-creature/hand.blend has changed

     4.1 Binary file assets/Models/test-creature/mid-finger.png has changed

     5.1 Binary file assets/Models/test-creature/mid-finger.xcf has changed

     6.1 Binary file assets/Models/test-touch/touch-cube.blend has changed

     7.1 --- a/org/integration.org	Wed Feb 15 16:58:33 2012 -0700
     7.2 +++ b/org/integration.org	Thu Feb 16 06:39:34 2012 -0700
     7.3 @@ -60,51 +60,42 @@
     7.4          ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     7.5  
     7.6          fix-display (gen-fix-display)]
     7.7 -    (apply
     7.8 -     world
     7.9 -     (with-movement
    7.10 -       (.getChild creature "palm")
    7.11 -       ["key-r" "key-t"
    7.12 -        "key-f" "key-g"
    7.13 -        "key-v" "key-b"]
    7.14 -       [10 10 10 10 1 1]
    7.15 -       [(nodify [creature
    7.16 -                 (box 10 2 10 :position (Vector3f. 0 -9 0)
    7.17 -                      :color ColorRGBA/Gray :mass 0)
    7.18 -                 me])
    7.19 -        (merge standard-debug-controls
    7.20 -               {"key-return"
    7.21 -                (fn [_ value]
    7.22 -                  (if value
    7.23 -                    (do
    7.24 -                      (println-repl "play-sound")
    7.25 -                      (.play bell))))
    7.26 -                "key-h"
    7.27 -                (fn [_ value]
    7.28 -                  (if value
    7.29 -                    (swap!  muscle-exertion (partial + 20))))
    7.30 -                "key-n"
    7.31 -                (fn [_ value]
    7.32 -                  (if value
    7.33 -                    (swap! muscle-exertion (fn [v] (- v 20)))))})
    7.34 -        (fn [world]
    7.35 -          (.setTimer world (RatchetTimer. 60))
    7.36 -          (light-up-everything world)
    7.37 -          (enable-debug world)
    7.38 -          (add-camera! world
    7.39 -                       (add-eye! creature
    7.40 -                                 (.getChild 
    7.41 -                                  (.getChild creature "eyes") "eye"))
    7.42 -                   (comp (view-image) BufferedImage!))
    7.43 -          (speed-up world))
    7.44 -        (fn [world tpf]
    7.45 -          (prop-display (prop))
    7.46 -          (touch-display (map #(% (.getRootNode world)) touch))
    7.47 -          (vision-display (map #(% world) vision))
    7.48 -          (hearing-display (map #(% world) hearing))
    7.49 -          (muscle-display (map #(% @muscle-exertion) muscles))
    7.50 -          (.setLocalTranslation me (.getLocation (.getCamera world)))
    7.51 -          (fix-display world))])))))
    7.52 +    (world
    7.53 +     (nodify [creature
    7.54 +              (box 10 2 10 :position (Vector3f. 0 -9 0)
    7.55 +                   :color ColorRGBA/Gray :mass 0)
    7.56 +              me])
    7.57 +     (merge standard-debug-controls
    7.58 +            {"key-return"
    7.59 +             (fn [_ value]
    7.60 +               (if value
    7.61 +                   (.play bell)))
    7.62 +             "key-h"
    7.63 +             (fn [_ value]
    7.64 +               (if value
    7.65 +                 (swap!  muscle-exertion (partial + 20))))
    7.66 +             "key-n"
    7.67 +             (fn [_ value]
    7.68 +               (if value
    7.69 +                 (swap! muscle-exertion (fn [v] (- v 20)))))})
    7.70 +     (fn [world]
    7.71 +       (.setTimer world (RatchetTimer. 60))
    7.72 +       (light-up-everything world)
    7.73 +       (enable-debug world)
    7.74 +       (add-camera! world
    7.75 +                    (add-eye! creature
    7.76 +                              (.getChild 
    7.77 +                               (.getChild creature "eyes") "eye"))
    7.78 +                    (comp (view-image) BufferedImage!))
    7.79 +       (speed-up world))
    7.80 +     (fn [world tpf]
    7.81 +       (prop-display (prop))
    7.82 +       (touch-display (map #(% (.getRootNode world)) touch))
    7.83 +       (vision-display (map #(% world) vision))
    7.84 +       (hearing-display (map #(% world) hearing))
    7.85 +       (muscle-display (map #(% @muscle-exertion) muscles))
    7.86 +       (.setLocalTranslation me (.getLocation (.getCamera world)))
    7.87 +       (fix-display world))))))
    7.88  #+end_src
    7.89  
    7.90  #+results: integration