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

opengl: fix drawing artifact around rectangles.

db4
John Benediktsson 2015-07-18 15:08:48 -07:00
parent f9cb9765ee
commit 58d84c6c98
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basis/opengl/opengl.factor
View File

@ -22,7 +22,7 @@ SYMBOL: gl-scale-factor
: error>string ( n -- string ) : error>string ( n -- string )
H{ H{
{ 0x0 "No error" } { 0x0000 "No error" }
{ 0x0501 "Invalid value" } { 0x0501 "Invalid value" }
{ 0x0500 "Invalid enumerant" } { 0x0500 "Invalid enumerant" }
{ 0x0502 "Invalid operation" } { 0x0502 "Invalid operation" }
@ -86,9 +86,11 @@ MACRO: all-enabled-client-state ( seq quot -- )
: gl-texture-coord-pointer ( seq -- ) : gl-texture-coord-pointer ( seq -- )
[ 2 GL_FLOAT 0 ] dip glTexCoordPointer ; inline [ 2 GL_FLOAT 0 ] dip glTexCoordPointer ; inline
: (line-vertices) ( a b -- vertices )
[ first2 [ 0.3 + ] bi@ ] bi@ 4 float-array{ } nsequence ;
: line-vertices ( a b -- ) : line-vertices ( a b -- )
[ first2 [ 0.5 + ] bi@ ] bi@ 4 float-array{ } nsequence (line-vertices) gl-vertex-pointer ;
gl-vertex-pointer ;
: gl-line ( a b -- ) : gl-line ( a b -- )
line-vertices GL_LINES 0 2 glDrawArrays ; line-vertices GL_LINES 0 2 glDrawArrays ;
@ -97,14 +99,14 @@ MACRO: all-enabled-client-state ( seq quot -- )
#! We use GL_LINE_STRIP with a duplicated first vertex #! We use GL_LINE_STRIP with a duplicated first vertex
#! instead of GL_LINE_LOOP to work around a bug in Apple's #! instead of GL_LINE_LOOP to work around a bug in Apple's
#! X3100 driver. #! X3100 driver.
loc first2 :> ( x y ) loc first2 [ 0.3 - ] bi@ :> ( x y )
dim first2 :> ( w h ) dim first2 [ 0.6 + ] bi@ :> ( w h )
[ [
x 0.5 + y 0.5 + x y
x w + 0.3 - y 0.5 + x w + y
x w + 0.3 - y h + 0.3 - x w + y h +
x y h + 0.3 - x y h +
x 0.5 + y 0.5 + x y
] float-array{ } output>sequence ; ] float-array{ } output>sequence ;
: rect-vertices ( loc dim -- ) : rect-vertices ( loc dim -- )