Mercurial > cortex

changeset 341:2e7d786241d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
now I am satisfied with the tests.
author Robert McIntyre <rlm@mit.edu>
date Sat, 21 Jul 2012 12:20:43 -0500
parents 4f5a5d5f1613
children dc8de16d0051
files org/movement.org org/util.org org/vision.org
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/movement.org	Sat Jul 21 11:18:47 2012 -0500
     1.2 +++ b/org/movement.org	Sat Jul 21 12:20:43 2012 -0500
     1.3 @@ -325,10 +325,13 @@
     1.4    (:import java.awt.image.BufferedImage)
     1.5    (:import com.jme3.scene.Node)
     1.6    (:import (com.jme3.math Quaternion Vector3f))
     1.7 -  (:import (com.aurellem.capture Capture RatchetTimer))
     1.8 +  (:import (com.aurellem.capture Capture RatchetTimer IsoTimer))
     1.9    (:import com.jme3.bullet.control.RigidBodyControl))
    1.10  #+end_src
    1.11  
    1.12 +#+results: test-header
    1.13 +: com.jme3.bullet.control.RigidBodyControl
    1.14 +
    1.15  * Source Listing
    1.16    - [[../src/cortex/movement.clj][cortex.movement]]
    1.17    - [[../src/cortex/test/movement.clj][cortex.test.movement]]

     2.1 --- a/org/util.org	Sat Jul 21 11:18:47 2012 -0500
     2.2 +++ b/org/util.org	Sat Jul 21 12:20:43 2012 -0500
     2.3 @@ -492,7 +492,7 @@
     2.4         (controlUpdate [tpf]
     2.5           (.setText text (format
     2.6                           "%.2f"
     2.7 -                         (float (/ (.getTime timer) 1000)))))
     2.8 +                         (float (.getTimeInSeconds timer)))))
     2.9         (controlRender [_ _])))
    2.10      (.attachChild (.getGuiNode world) text)))
    2.11  #+end_src

     3.1 --- a/org/vision.org	Sat Jul 21 11:18:47 2012 -0500
     3.2 +++ b/org/vision.org	Sat Jul 21 12:20:43 2012 -0500
     3.3 @@ -492,7 +492,7 @@
     3.4                             (if record?
     3.5                               (File. "/home/r/proj/cortex/render/vision/2")))
     3.6                            BufferedImage!))
     3.7 -            (let [timer (RatchetTimer. 60)]
     3.8 +            (let [timer (IsoTimer. 60)]
     3.9                (.setTimer world timer)
    3.10                (display-dilated-time world timer))
    3.11              ;; This is here to restore the main view
    3.12 @@ -631,7 +631,7 @@
    3.13          (fn [world]
    3.14            (light-up-everything world)
    3.15            (speed-up world)
    3.16 -          (let [timer (RatchetTimer. 60)]
    3.17 +          (let [timer (IsoTimer. 60)]
    3.18                  (.setTimer world timer)
    3.19                  (display-dilated-time world timer))
    3.20            ;; add a view from the worm's perspective
    3.21 @@ -783,8 +783,12 @@
    3.22    (:import com.jme3.scene.Node)
    3.23    (:import com.jme3.math.Vector3f)
    3.24    (:import java.io.File)
    3.25 -  (:import (com.aurellem.capture Capture RatchetTimer)))
    3.26 +  (:import (com.aurellem.capture Capture RatchetTimer IsoTimer)))
    3.27  #+end_src
    3.28 +
    3.29 +#+results: test-header
    3.30 +: com.aurellem.capture.IsoTimer
    3.31 +
    3.32  * Source Listing
    3.33    - [[../src/cortex/vision.clj][cortex.vision]]
    3.34    - [[../src/cortex/test/vision.clj][cortex.test.vision]]