Mercurial > cortex
diff org/test-creature.org @ 175:0b9ae09eaec3
renamed functions in body
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Sat, 04 Feb 2012 06:47:07 -0700 |
parents | 1943b3f581c2 |
children | 6fba17a74a57 |
line wrap: on
line diff
1.1 --- a/org/test-creature.org Sat Feb 04 06:29:20 2012 -0700 1.2 +++ b/org/test-creature.org Sat Feb 04 06:47:07 2012 -0700 1.3 @@ -71,15 +71,6 @@ 1.4 (.registerLoader BlenderModelLoader (into-array String ["blend"]))) 1.5 model)) 1.6 1.7 -(declare blender-creature) 1.8 - 1.9 -(defn blender-creature 1.10 - "Return a creature with all joints in place." 1.11 - [blender-path] 1.12 - (let [model (load-blender-model blender-path) 1.13 - joints (creature-joints model)] 1.14 - (assemble-creature model joints))) 1.15 - 1.16 (def hand "Models/creature1/one.blend") 1.17 1.18 (def worm "Models/creature1/try-again.blend") 1.19 @@ -178,7 +169,9 @@ 1.20 (box 0.01 1 0.01 :physical? false :color ColorRGBA/Green) 1.21 z-axis 1.22 (box 0.01 0.01 1 :physical? false :color ColorRGBA/Blue) 1.23 - creature (blender-creature thing) 1.24 + creature (doto 1.25 + (load-blender-model thing) 1.26 + (body!)) 1.27 touch-nerves (touch creature) 1.28 touch-debug-windows (map (fn [_] (debug-touch-window)) touch-nerves) 1.29 vision-data (vision! creature)