Merge branch 'master' of factorcode.org:/git/factor

db4
Joe Groff 2010-05-24 18:39:24 -07:00
commit 7325e13521
5 changed files with 33 additions and 7 deletions

View File

@ -30,7 +30,7 @@ M: world configure-event
! In case dimensions didn't change
relayout-1 ;
PIXEL-FORMAT-ATTRIBUTE-TABLE: glx-visual { $ GLX_USE_GL $ GLX_RGBA } H{
PIXEL-FORMAT-ATTRIBUTE-TABLE: glx-visual { $ GLX_RGBA } H{
{ double-buffered { $ GLX_DOUBLEBUFFER } }
{ stereo { $ GLX_STEREO } }
{ color-bits { $ GLX_BUFFER_SIZE } }

View File

@ -20,7 +20,6 @@ CONSTANT: default-world-pixel-format-attributes
{
windowed
double-buffered
T{ depth-bits { value 16 } }
}
CONSTANT: default-world-window-controls

View File

@ -39,5 +39,14 @@ M: nehe2-gadget draw-gadget* ( gadget -- )
-1.0 -1.0 0.0 glVertex3f
] do-state ;
MAIN-WINDOW: run2 { { title "NeHe Tutorial 2" } { pref-dim { $ width $ height } } }
MAIN-WINDOW: run2
{
{ title "NeHe Tutorial 2" }
{ pref-dim { $ width $ height } }
{ pixel-format-attributes {
windowed
double-buffered
T{ depth-bits { value 16 } }
} }
}
<nehe2-gadget> >>gadgets ;

View File

@ -68,5 +68,14 @@ M: nehe4-gadget graft* ( gadget -- )
M: nehe4-gadget ungraft* ( gadget -- )
t >>quit? drop ;
MAIN-WINDOW: run4 { { title "NeHe Tutorial 4" } { pref-dim { $ width $ height } } }
<nehe4-gadget> >>gadgets ;
MAIN-WINDOW: run4
{
{ title "NeHe Tutorial 4" }
{ pref-dim { $ width $ height } }
{ pixel-format-attributes {
windowed
double-buffered
T{ depth-bits { value 16 } }
} }
}
<nehe4-gadget> >>gadgets ;

View File

@ -120,5 +120,14 @@ M: nehe5-gadget graft* ( gadget -- )
M: nehe5-gadget ungraft* ( gadget -- )
t >>quit? drop ;
MAIN-WINDOW: run5 { { title "NeHe Tutorial 5" } { pref-dim { $ width $ height } } }
<nehe5-gadget> >>gadgets ;
MAIN-WINDOW: run4
{
{ title "NeHe Tutorial 5" }
{ pref-dim { $ width $ height } }
{ pixel-format-attributes {
windowed
double-buffered
T{ depth-bits { value 16 } }
} }
}
<nehe5-gadget> >>gadgets ;