From 3a7faad878bf7cf3dcdcaf8494eb09cb1c9c4c47 Mon Sep 17 00:00:00 2001
From: Alex Chapman <chapman.alex@gmail.com>
Date: Sat, 17 May 2008 11:49:19 +1000
Subject: [PATCH] use gl-look-at, and make gl-look-at more elegant

---
 extra/jamshred/gl/gl.factor | 8 ++++----
 extra/opengl/opengl.factor  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extra/jamshred/gl/gl.factor b/extra/jamshred/gl/gl.factor
index fe2009201f..fffc97b4c6 100644
--- a/extra/jamshred/gl/gl.factor
+++ b/extra/jamshred/gl/gl.factor
@@ -59,10 +59,10 @@ IN: jamshred.gl
     GL_LIGHT0 GL_SPECULAR F{ 1.0 1.0 1.0 1.0 } >c-float-array glLightfv ;
 
 : player-view ( player -- )
-    [ location>> first3 ]
-    [ [ location>> ] [ forward>> ] bi v+ first3 ]
-    [ up>> first3 ] tri gluLookAt ;
+    [ location>> ]
+    [ [ location>> ] [ forward>> ] bi v+ ]
+    [ up>> ] tri gl-look-at ;
 
 : draw-jamshred ( jamshred width height -- )
-    init-graphics jamshred-player dup player-view draw-tunnel ;
+    init-graphics jamshred-player [ player-view ] [ draw-tunnel ] bi ;
 
diff --git a/extra/opengl/opengl.factor b/extra/opengl/opengl.factor
index ee58a4e345..a6e76cdc9e 100755
--- a/extra/opengl/opengl.factor
+++ b/extra/opengl/opengl.factor
@@ -154,7 +154,7 @@ MACRO: set-draw-buffers ( buffers -- )
     swap glPushAttrib call glPopAttrib ; inline
 
 : gl-look-at ( eye focus up -- )
-    >r >r first3 r> first3 r> first3 gluLookAt ;
+    [ first3 ] tri@ gluLookAt ;
 
 TUPLE: sprite loc dim dim2 dlist texture ;