steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some load errors

db4
Slava Pestov 2008-03-29 04:07:06 -05:00
parent adb1dd14d0
commit 9e13e61a74
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
extra/bunny/model/model.factor
View File

@ -64,16 +64,19 @@ TUPLE: bunny-buffers array element-array nv ni ;
bunny-dlist construct-boa ; bunny-dlist construct-boa ;
: <bunny-buffers> ( model -- geom ) : <bunny-buffers> ( model -- geom )
[ {
[ first concat ] [ second concat ] bi [
append >float-array [ first concat ] [ second concat ] bi
GL_ARRAY_BUFFER swap GL_STATIC_DRAW <gl-buffer> append >float-array
] [ GL_ARRAY_BUFFER swap GL_STATIC_DRAW <gl-buffer>
third concat >c-uint-array ]
GL_ELEMENT_ARRAY_BUFFER swap GL_STATIC_DRAW <gl-buffer> [
] third concat >c-uint-array
[ first length 3 * ] [ third length 3 * ] tetra GL_ELEMENT_ARRAY_BUFFER swap GL_STATIC_DRAW <gl-buffer>
bunny-buffers construct-boa ; ]
[ first length 3 * ]
[ third length 3 * ]
} cleave bunny-buffers construct-boa ;
GENERIC: bunny-geom ( geom -- ) GENERIC: bunny-geom ( geom -- )
GENERIC: draw-bunny ( geom draw -- ) GENERIC: draw-bunny ( geom draw -- )

2
extra/bunny/outlined/outlined.factor
View File

@ -1,6 +1,6 @@
USING: arrays bunny.model bunny.cel-shaded continuations kernel USING: arrays bunny.model bunny.cel-shaded continuations kernel
math multiline opengl opengl.shaders opengl.framebuffers math multiline opengl opengl.shaders opengl.framebuffers
opengl.gl opengl.capabilities sequences ui.gadgets ; opengl.gl opengl.capabilities sequences ui.gadgets combinators ;
IN: bunny.outlined IN: bunny.outlined
STRING: outlined-pass1-fragment-shader-main-source STRING: outlined-pass1-fragment-shader-main-source

2
extra/combinators/cleave/cleave.factor
View File

@ -1,5 +1,5 @@
USING: kernel sequences macros ; USING: kernel sequences macros combinators ;
IN: combinators.cleave IN: combinators.cleave

4
extra/opengl/shaders/shaders.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2008 Joe Groff. ! Copyright (C) 2008 Joe Groff.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel opengl.gl alien.c-types continuations namespaces USING: kernel opengl.gl alien.c-types continuations namespaces
assocs alien libc opengl math sequences combinators.lib assocs alien libc opengl math sequences combinators
macros arrays ; combinators.lib macros arrays ;
IN: opengl.shaders IN: opengl.shaders
: with-gl-shader-source-ptr ( string quot -- ) : with-gl-shader-source-ptr ( string quot -- )