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

opengl: properly scale viewports.

db4
John Benediktsson 2012-11-01 17:12:13 -07:00
parent 43d91bcf08
commit ab3d6b1d13
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/ui/text/core-text/core-text.factor
View File

@ -12,13 +12,13 @@ SINGLETON: core-text-renderer
<PRIVATE <PRIVATE
: unscale ( m -- n ) : unscale ( m -- n )
retina? get-global [ 2.0 / ] when ; inline retina? get-global [ 2 /i ] when ; inline
: scale ( m -- n ) : scale ( m -- n )
retina? get-global [ 2.0 * ] when ; inline retina? get-global [ 2 * ] when ; inline
: scale-dim ( dim -- dim' ) : scale-dim ( dim -- dim' )
retina? get-global [ [ 2.0 / ] map ] when ; inline retina? get-global [ [ 2 /i ] map ] when ; inline
: scale-metrics ( metrics -- metrics' ) : scale-metrics ( metrics -- metrics' )
retina? get-global [ retina? get-global [

2
extra/gpu/state/state.factor
View File

@ -310,7 +310,7 @@ PRIVATE>
GENERIC: set-gpu-state* ( state -- ) GENERIC: set-gpu-state* ( state -- )
M: viewport-state set-gpu-state* M: viewport-state set-gpu-state*
rect>> [ loc>> first2 ] [ dim>> first2 ] bi glViewport ; rect>> [ loc>> ] [ dim>> ] bi gl-viewport ;
M: triangle-cull-state set-gpu-state* M: triangle-cull-state set-gpu-state*
{ {

2
extra/gpu/textures/textures.factor
View File

@ -307,7 +307,7 @@ TYPED: read-compressed-texture ( tdt: texture-data-target level: integer -- byte
[ texture-dim ] [ texture-dim ]
[ drop texture-object [ component-order>> ] [ component-type>> ] bi f f ] [ drop texture-object [ component-order>> ] [ component-type>> ] bi f f ]
[ read-texture ] 2tri [ read-texture ] 2tri
image boa ; inline f image boa ; inline
<PRIVATE <PRIVATE
: bind-texture ( texture -- gl-target ) : bind-texture ( texture -- gl-target )

2
extra/opengl/demo-support/demo-support.factor
View File

@ -51,7 +51,7 @@ M: demo-world pref-dim* ( gadget -- dim )
M: demo-world resize-world M: demo-world resize-world
GL_PROJECTION glMatrixMode GL_PROJECTION glMatrixMode
glLoadIdentity glLoadIdentity
[ [ 0 0 ] dip dim>> first2 glViewport ] [ [ { 0 0 } ] dip dim>> gl-viewport ]
[ demo-world-frustum glFrustum ] bi ; [ demo-world-frustum glFrustum ] bi ;
: demo-world-set-matrix ( gadget -- ) : demo-world-set-matrix ( gadget -- )

4
extra/spheres/spheres.factor
View File

@ -248,7 +248,7 @@ M: spheres-world end-world
: (draw-reflection-texture) ( gadget -- ) : (draw-reflection-texture) ( gadget -- )
dup reflection-framebuffer>> [ { dup reflection-framebuffer>> [ {
[ drop 0 0 (reflection-dim) glViewport ] [ drop { 0 0 } (reflection-dim) 2array gl-viewport ]
[ [
GL_PROJECTION glMatrixMode GL_PROJECTION glMatrixMode
glPushMatrix glLoadIdentity glPushMatrix glLoadIdentity
@ -275,7 +275,7 @@ M: spheres-world end-world
glPopMatrix 90.0 1.0 0.0 0.0 glRotatef ] glPopMatrix 90.0 1.0 0.0 0.0 glRotatef ]
[ sphere-scene ] [ sphere-scene ]
[ [
[ 0 0 ] dip dim>> first2 glViewport [ { 0 0 } ] dip dim>> gl-viewport
GL_PROJECTION glMatrixMode GL_PROJECTION glMatrixMode
glPopMatrix glPopMatrix
] ]

2
extra/terrain/terrain.factor
View File

@ -266,7 +266,7 @@ M: terrain-world end-game-world
M: terrain-world resize-world M: terrain-world resize-world
GL_PROJECTION glMatrixMode GL_PROJECTION glMatrixMode
glLoadIdentity glLoadIdentity
dim>> [ [ 0 0 ] dip first2 glViewport ] dim>> [ [ { 0 0 } ] dip gl-viewport ]
[ frustum glFrustum ] bi ; [ frustum glFrustum ] bi ;
M: terrain-world draw-world* M: terrain-world draw-world*