Mercurial > cortex
diff org/util.org @ 363:9fa92af29c3a
saving ...
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Thu, 07 Mar 2013 05:36:17 +0000 |
parents | 2e7d786241d3 |
children | 4c37d39a3cf6 |
line wrap: on
line diff
1.1 --- a/org/util.org Thu Mar 07 03:28:26 2013 +0000 1.2 +++ b/org/util.org Thu Mar 07 05:36:17 2013 +0000 1.3 @@ -276,8 +276,8 @@ 1.4 geom (Geometry. (:name d) (:shape d))] 1.5 (if (:texture d) 1.6 (let [key (TextureKey. (:texture d))] 1.7 - ;;(.setGenerateMips key true) 1.8 - ;;(.setTexture mat "ColorMap" (.loadTexture asset-manager key)) 1.9 + (.setGenerateMips key true) 1.10 + (.setTexture mat "ColorMap" (.loadTexture asset-manager key)) 1.11 )) 1.12 (if (:color d) (.setColor mat "Color" (:color d))) 1.13 (.setMaterial geom mat) 1.14 @@ -398,14 +398,15 @@ 1.15 (if (not value) 1.16 (let [camera (.getCamera game) 1.17 cannon-ball 1.18 - (sphere 0.7 1.19 + (sphere 0.4 1.20 + ;;:texture nil 1.21 :material "Common/MatDefs/Misc/Unshaded.j3md" 1.22 - :color ColorRGBA/White 1.23 + :color ColorRGBA/Blue 1.24 :name "cannonball!" 1.25 :position 1.26 (.add (.getLocation camera) 1.27 (.mult (.getDirection camera) (float 1))) 1.28 - :mass 3)] ;200 0.05 1.29 + :mass 25)] ;200 0.05 1.30 (.setLinearVelocity 1.31 (.getControl cannon-ball RigidBodyControl) 1.32 (.mult (.getDirection camera) (float 50))) ;50