diff --git a/extra/opengl/opengl.factor b/extra/opengl/opengl.factor index 3964288666..6e6302b305 100755 --- a/extra/opengl/opengl.factor +++ b/extra/opengl/opengl.factor @@ -16,7 +16,7 @@ IN: opengl : fix-coordinates ( point1 point2 -- x1 y2 x2 y2 ) [ first2 [ >fixnum ] bi@ ] bi@ ; - +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : gl-color ( color -- ) first4 glColor4d ; inline @@ -26,15 +26,13 @@ IN: opengl : gl-clear ( color -- ) gl-clear-color GL_COLOR_BUFFER_BIT glClear ; -: color>raw ( object -- 4array ) - >rgba - { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave - 4array ; - -: set-color ( object -- ) color>raw first4 glColor4d ; -: set-clear-color ( object -- ) color>raw first4 glClearColor ; +: color>raw ( object -- r g b a ) + >rgba { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave ; +: set-color ( object -- ) color>raw glColor4d ; +: set-clear-color ( object -- ) color>raw glClearColor ; +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : gl-error ( -- ) glGetError dup zero? [