diff org/worm_learn.clj @ 443:d3c5f9b70574

workling on thesis render.
author Robert McIntyre <rlm@mit.edu>
date Tue, 25 Mar 2014 00:20:01 -0400
parents 5205535237fb
children ea0bcd47d55b
line wrap: on
line diff
     1.1 --- a/org/worm_learn.clj	Mon Mar 24 22:43:06 2014 -0400
     1.2 +++ b/org/worm_learn.clj	Tue Mar 25 00:20:01 2014 -0400
     1.3 @@ -164,7 +164,7 @@
     1.4        (Math/abs)))
     1.5  
     1.6  (defn resting?
     1.7 -  "Is the worm straight?"
     1.8 +  "Is the worm resting on the ground?"
     1.9    [experiences]
    1.10    (every?
    1.11     (fn [touch-data]
    1.12 @@ -261,6 +261,8 @@
    1.13  (defn record-experience! [experiences data]
    1.14    (swap! experiences #(conj % data)))
    1.15  
    1.16 +
    1.17 +
    1.18  (defn worm-world
    1.19    [& {:keys [record motor-control keybindings view experiences
    1.20               worm-model end-frame experience-watch] :as settings}]
    1.21 @@ -277,13 +279,16 @@
    1.22          muscle-display (view-movement)
    1.23          
    1.24          floor (box 10 1 10 :position (Vector3f. 0 -10 0)
    1.25 -                   :color ColorRGBA/Gray :mass 0)
    1.26 +                   :color ColorRGBA/Gray :mass 0
    1.27 +                   :texture "Textures/greenGrid.png")
    1.28          timer (IsoTimer. 60)]
    1.29  
    1.30      (world
    1.31         (nodify [worm floor])
    1.32         (merge standard-debug-controls keybindings)
    1.33         (fn [world]
    1.34 +         (.setDisplayStatView world false)
    1.35 +         (.setDisplayFps world false)
    1.36           (position-camera world view)
    1.37           (.setTimer world timer)
    1.38           (display-dilated-time world timer)