# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1343047272 18000
# Node ID d2806d5c5f745e24e2ad1d438225dde501130550
# Parent  61513c80bc0e934d33c9071a2bb9f291098b5fe8
change distribution of muscles for joint creature

diff -r 61513c80bc0e -r d2806d5c5f74 assets/Models/joint/basic-muscle.png
Binary file assets/Models/joint/basic-muscle.png has changed
diff -r 61513c80bc0e -r d2806d5c5f74 assets/Models/joint/joint.blend
Binary file assets/Models/joint/joint.blend has changed
diff -r 61513c80bc0e -r d2806d5c5f74 org/joint.org
--- a/org/joint.org	Mon Jul 23 03:51:42 2012 -0500
+++ b/org/joint.org	Mon Jul 23 07:41:12 2012 -0500
@@ -5,26 +5,25 @@
 The point of this joint is that it uses exploratory motor movements to
 learn how to move to any particular position.
 
-visual-information -- list of functions which must each be called with the
-world the argument, each of which returns [topology data]. Each element
-of data is a number between 0 and 255 representing the intensity of
-the light recieved at that sensor.
+visual-information -- list of functions which must each be called with
+the world the argument, each of which returns [topology data]. Each
+element of data is a number between 0 and 255 representing the
+intensity of the light recieved at that sensor.
 
 proprioception -- list of nullary functions, one for each joint, which
 return [heding pitch roll].
 
+movement -- list of functions, one for each muscle, which must be
+called with an integer between 0 and the total number of muscle fibers
+in the muscle. Each function returns a float which is (current-force/
+total-possible-force).
+
 touch -- list of functions which must each be called with a Node
 (normally the root node of the simulation) the argument, each of which
 returns [topology data]. Each element of data is a posive float
 between 0.0 and the max length of the "hairs" of which the touch sense
 is composed.
 
-movement -- list of functions, one for each muscle, which must be
-called with an integer between 0 and the total number of muscle fibers
-in the muscle. Each function returns a float which is (current-force/
-total-possible-force).
-
-
 #+name: load-creature
 #+begin_src clojure
 (in-ns 'cortex.joint)
@@ -34,10 +33,6 @@
 (defn load-creature []
   (load-blender-model joint))
 
-
-
-
-
 (defn test-creature []
   (let [me (sphere 0.5 :color ColorRGBA/Blue :physical? false)
         creature (doto (load-creature) (body!))
@@ -73,17 +68,8 @@
      (fn [world tpf]
        (.setLocalTranslation me (.getLocation (.getCamera world)))
        (fix-display world)))))
-
-    
-
-
 #+end_src
 
-
-
-
-
-
 * Headers
 #+name: joint-header
 #+begin_src clojure
@@ -94,7 +80,6 @@
   (:import java.io.File)
   (:import (com.aurellem.capture RatchetTimer IsoTimer)))
 
-
 (cortex.import/mega-import-jme3)
 (rlm.rlm-commands/help)
 #+end_src