Mercurial > cortex
diff org/skin.org @ 20:67d508a1e34d
going to update website/documentation
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Sun, 23 Oct 2011 12:32:56 -0700 |
parents | 5a371057078f |
children | 6372c108c5c6 |
line wrap: on
line diff
1.1 --- a/org/skin.org Sun Oct 23 12:09:29 2011 -0700 1.2 +++ b/org/skin.org Sun Oct 23 12:32:56 2011 -0700 1.3 @@ -28,8 +28,6 @@ 1.4 (import java.util.logging.Logger) 1.5 (use 'hello.brick-wall) 1.6 1.7 - 1.8 - 1.9 (defn triangles [#^Geometry geom] 1.10 (let 1.11 [mesh (.getMesh geom) 1.12 @@ -43,7 +41,6 @@ 1.13 (conj! triangles tri)))) 1.14 (persistent! triangles))) 1.15 1.16 - 1.17 (defn get-ray-origin 1.18 [geom tri] 1.19 (let [new (Vector3f.)] 1.20 @@ -63,14 +60,14 @@ 1.21 (defn ray-origin-debug 1.22 [ray color] 1.23 (make-shape 1.24 - (assoc base-shape 1.25 - :shape (Sphere. 5 5 0.05) 1.26 - :name "arrow" 1.27 - :color color 1.28 - :texture false 1.29 - :physical? false 1.30 - :position 1.31 - (.getOrigin ray)))) 1.32 + (assoc base-shape 1.33 + :shape (Sphere. 5 5 0.05) 1.34 + :name "arrow" 1.35 + :color color 1.36 + :texture false 1.37 + :physical? false 1.38 + :position 1.39 + (.getOrigin ray)))) 1.40 1.41 (defn ray-debug [ray color] 1.42 (make-shape 1.43 @@ -126,7 +123,7 @@ 1.44 debug-node 1.45 (doto (Node.) 1.46 (.attachChild (ray-origin-debug ray ColorRGBA/Gray)) 1.47 - ;;(.attachChild (ray-debug ray ColorRGBA/Gray)) 1.48 + (.attachChild (ray-debug ray ColorRGBA/Gray)) 1.49 )))))) 1.50 1.51 (defn manage-ray-debug-node [debug-node geom touch-data limit] 1.52 @@ -166,7 +163,6 @@ 1.53 (let [physics-manager (.getState (.getStateManager world) BulletAppState)] 1.54 (.setAccuracy (.getPhysicsSpace physics-manager) (float new-accuracy)))) 1.55 1.56 - 1.57 (defn transparent-sphere [] 1.58 (doto 1.59 (make-shape 1.60 @@ -227,14 +223,13 @@ 1.61 (world 1.62 root-node 1.63 {"key-return" (fire-cannon-ball node)} 1.64 - ;;no-op 1.65 (fn [world] 1.66 - ;; (Capture/SimpleCaptureVideo 1.67 - ;; world 1.68 - ;; (file-str "/home/r/proj/cortex/tmp/blob.avi")) 1.69 - ;; (no-logging) 1.70 - ;;(enable-debug world) 1.71 - ;; (set-accuracy world (/ 1 60)) 1.72 + ;; (Capture/SimpleCaptureVideo 1.73 + ;; world 1.74 + ;; (file-str "/home/r/proj/cortex/tmp/blob.avi")) 1.75 + ;; (no-logging) 1.76 + ;;(enable-debug world) 1.77 + ;; (set-accuracy world (/ 1 60)) 1.78 ) 1.79 1.80 (fn [& _]