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

dont use paren names when there's not a word with that name already

Doug Coleman 2009-06-10 16:23:57 -04:00
parent f788885dc9
commit 4b15de5e00
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/opengl/textures/textures.factor
View File

@ -50,7 +50,7 @@ TUPLE: single-texture image dim loc texture-coords texture display-list disposed
[ dup 1 = [ next-power-of-2 ] unless ] map [ dup 1 = [ next-power-of-2 ] unless ] map
] unless ; ] unless ;
: (tex-image) ( image bitmap -- ) : tex-image ( image bitmap -- )
[ [
[ GL_TEXTURE_2D 0 GL_RGBA ] dip [ GL_TEXTURE_2D 0 GL_RGBA ] dip
[ dim>> adjust-texture-dim first2 0 ] [ dim>> adjust-texture-dim first2 0 ]
@ -58,9 +58,11 @@ TUPLE: single-texture image dim loc texture-coords texture display-list disposed
] dip ] dip
glTexImage2D ; glTexImage2D ;
: (tex-sub-image) ( image -- ) : tex-sub-image ( image -- )
[ GL_TEXTURE_2D 0 0 0 ] dip [ GL_TEXTURE_2D 0 0 0 ] dip
[ dim>> first2 ] [ component-order>> component-order>format ] [ bitmap>> ] tri [ dim>> first2 ]
[ component-order>> component-order>format ]
[ bitmap>> ] tri
glTexSubImage2D ; glTexSubImage2D ;
: init-texture ( -- ) : init-texture ( -- )
@ -173,8 +175,8 @@ PRIVATE>
GL_TEXTURE_BIT [ GL_TEXTURE_BIT [
GL_TEXTURE_2D swap glBindTexture GL_TEXTURE_2D swap glBindTexture
non-power-of-2-textures? get non-power-of-2-textures? get
[ dup bitmap>> (tex-image) ] [ dup bitmap>> tex-image ]
[ [ f (tex-image) ] [ (tex-sub-image) ] bi ] if [ [ f tex-image ] [ tex-sub-image ] bi ] if
] do-attribs ] do-attribs
] keep ; ] keep ;