Mercurial > cortex

changeset 398:36d492f4deab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finished for the night.
author Robert McIntyre <rlm@mit.edu>
date Tue, 04 Mar 2014 00:01:38 -0500
parents 72ee485d9179
children 85393ec986dc
files assets/Models/worm-segment/touch-guide.png assets/Models/worm-segment/touch-profile.png assets/Models/worm-segment/touch-profile.xcf assets/Models/worm-segment/worm.blend org/worm_learn.clj
diffstat 5 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
     1.1 Binary file assets/Models/worm-segment/touch-guide.png has changed

     2.1 Binary file assets/Models/worm-segment/touch-profile.png has changed

     3.1 Binary file assets/Models/worm-segment/touch-profile.xcf has changed

     4.1 Binary file assets/Models/worm-segment/worm.blend has changed

     5.1 --- a/org/worm_learn.clj	Mon Mar 03 23:24:28 2014 -0500
     5.2 +++ b/org/worm_learn.clj	Tue Mar 04 00:01:38 2014 -0500
     5.3 @@ -19,8 +19,8 @@
     5.4    (load-blender-model "Models/worm-segment/worm-segment.blend"))
     5.5  
     5.6  
     5.7 -(defn worm-segment []
     5.8 -  (load-blender-model "Models/test-touch/touch-cube.blend"))
     5.9 +(defn worm []
    5.10 +  (load-blender-model "Models/worm-segment/worm.blend"))
    5.11  
    5.12  
    5.13  (defn gen-worm
    5.14 @@ -59,7 +59,7 @@
    5.15       <space> : fire ball"
    5.16    ([] (test-basic-touch false))
    5.17    ([record?]
    5.18 -     (let [head (doto (worm-segment) (body!))
    5.19 +     (let [head (doto (worm) (body!))
    5.20             touch (touch! head)
    5.21             touch-display (view-touch)]
    5.22         (world