# HG changeset patch # User Robert McIntyre # Date 1342891243 18000 # Node ID 2e7d786241d3bb03932fe692a900c338fdf774c6 # Parent 4f5a5d5f161365c5bd78b2295786e5c8bb3cf989 now I am satisfied with the tests. diff -r 4f5a5d5f1613 -r 2e7d786241d3 org/movement.org --- a/org/movement.org Sat Jul 21 11:18:47 2012 -0500 +++ b/org/movement.org Sat Jul 21 12:20:43 2012 -0500 @@ -325,10 +325,13 @@ (:import java.awt.image.BufferedImage) (:import com.jme3.scene.Node) (:import (com.jme3.math Quaternion Vector3f)) - (:import (com.aurellem.capture Capture RatchetTimer)) + (:import (com.aurellem.capture Capture RatchetTimer IsoTimer)) (:import com.jme3.bullet.control.RigidBodyControl)) #+end_src +#+results: test-header +: com.jme3.bullet.control.RigidBodyControl + * Source Listing - [[../src/cortex/movement.clj][cortex.movement]] - [[../src/cortex/test/movement.clj][cortex.test.movement]] diff -r 4f5a5d5f1613 -r 2e7d786241d3 org/util.org --- a/org/util.org Sat Jul 21 11:18:47 2012 -0500 +++ b/org/util.org Sat Jul 21 12:20:43 2012 -0500 @@ -492,7 +492,7 @@ (controlUpdate [tpf] (.setText text (format "%.2f" - (float (/ (.getTime timer) 1000))))) + (float (.getTimeInSeconds timer))))) (controlRender [_ _]))) (.attachChild (.getGuiNode world) text))) #+end_src diff -r 4f5a5d5f1613 -r 2e7d786241d3 org/vision.org --- a/org/vision.org Sat Jul 21 11:18:47 2012 -0500 +++ b/org/vision.org Sat Jul 21 12:20:43 2012 -0500 @@ -492,7 +492,7 @@ (if record? (File. "/home/r/proj/cortex/render/vision/2"))) BufferedImage!)) - (let [timer (RatchetTimer. 60)] + (let [timer (IsoTimer. 60)] (.setTimer world timer) (display-dilated-time world timer)) ;; This is here to restore the main view @@ -631,7 +631,7 @@ (fn [world] (light-up-everything world) (speed-up world) - (let [timer (RatchetTimer. 60)] + (let [timer (IsoTimer. 60)] (.setTimer world timer) (display-dilated-time world timer)) ;; add a view from the worm's perspective @@ -783,8 +783,12 @@ (:import com.jme3.scene.Node) (:import com.jme3.math.Vector3f) (:import java.io.File) - (:import (com.aurellem.capture Capture RatchetTimer))) + (:import (com.aurellem.capture Capture RatchetTimer IsoTimer))) #+end_src + +#+results: test-header +: com.aurellem.capture.IsoTimer + * Source Listing - [[../src/cortex/vision.clj][cortex.vision]] - [[../src/cortex/test/vision.clj][cortex.test.vision]]