From 9d512b3313a1a95f9c20da2414996564cbc84927 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 2 Jul 2008 16:26:10 -0500 Subject: [PATCH] Fix bunny for float array change --- extra/bunny/bunny.factor | 16 +++++++++------- extra/bunny/model/model.factor | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/extra/bunny/bunny.factor b/extra/bunny/bunny.factor index b315e4ca5a..a927f1f055 100755 --- a/extra/bunny/bunny.factor +++ b/extra/bunny/bunny.factor @@ -42,13 +42,15 @@ M: bunny-gadget ungraft* ( gadget -- ) [ draw-seq>> [ [ dispose ] when* ] each ] bi ; M: bunny-gadget draw-gadget* ( gadget -- ) - 0.15 0.15 0.15 1.0 glClearColor - GL_DEPTH_BUFFER_BIT GL_COLOR_BUFFER_BIT bitor glClear - dup demo-gadget-set-matrices - GL_MODELVIEW glMatrixMode - 0.02 -0.105 0.0 glTranslatef - { geom>> bunny-gadget-draw } get-slots - draw-bunny ; + dup draw-seq>> empty? [ drop ] [ + 0.15 0.15 0.15 1.0 glClearColor + GL_DEPTH_BUFFER_BIT GL_COLOR_BUFFER_BIT bitor glClear + dup demo-gadget-set-matrices + GL_MODELVIEW glMatrixMode + 0.02 -0.105 0.0 glTranslatef + { geom>> bunny-gadget-draw } get-slots + draw-bunny + ] if ; M: bunny-gadget pref-dim* ( gadget -- dim ) drop { 640 480 } ; diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor index b1f2f19d9c..97477a6f68 100755 --- a/extra/bunny/model/model.factor +++ b/extra/bunny/model/model.factor @@ -66,7 +66,7 @@ TUPLE: bunny-buffers array element-array nv ni ; { [ [ first concat ] [ second concat ] bi - append >float-array + append >c-double-array GL_ARRAY_BUFFER swap GL_STATIC_DRAW ] [