nehe: fix load errors
Slava Pestov
parent
db5998e121
commit
c80e5435d4
|
|
@ -1,5 +1,6 @@
|
||||||
USING: arrays kernel math opengl opengl.gl opengl.glu
|
USING: arrays kernel math opengl opengl.gl opengl.glu
|
||||||
opengl.demo-support ui ui.gadgets ui.render literals accessors ;
|
opengl.demo-support ui ui.gadgets ui.render ui.pixel-formats
|
||||||
|
literals accessors ;
|
||||||
IN: nehe.2
|
IN: nehe.2
|
||||||
|
|
||||||
TUPLE: nehe2-gadget < gadget ;
|
TUPLE: nehe2-gadget < gadget ;
|
||||||
|
|
@ -8,36 +9,36 @@ CONSTANT: width 256
|
||||||
CONSTANT: height 256
|
CONSTANT: height 256
|
||||||
|
|
||||||
: <nehe2-gadget> ( -- gadget )
|
: <nehe2-gadget> ( -- gadget )
|
||||||
nehe2-gadget new ;
|
nehe2-gadget new ;
|
||||||
|
|
||||||
M: nehe2-gadget draw-gadget* ( gadget -- )
|
M: nehe2-gadget draw-gadget* ( gadget -- )
|
||||||
drop
|
drop
|
||||||
GL_PROJECTION glMatrixMode
|
GL_PROJECTION glMatrixMode
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
45.0 width height / >float 0.1 100.0 gluPerspective
|
45.0 width height / >float 0.1 100.0 gluPerspective
|
||||||
GL_MODELVIEW glMatrixMode
|
GL_MODELVIEW glMatrixMode
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
GL_SMOOTH glShadeModel
|
GL_SMOOTH glShadeModel
|
||||||
0.0 0.0 0.0 0.0 glClearColor
|
0.0 0.0 0.0 0.0 glClearColor
|
||||||
1.0 glClearDepth
|
1.0 glClearDepth
|
||||||
GL_DEPTH_TEST glEnable
|
GL_DEPTH_TEST glEnable
|
||||||
GL_LEQUAL glDepthFunc
|
GL_LEQUAL glDepthFunc
|
||||||
GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST glHint
|
GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST glHint
|
||||||
GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
|
GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
-1.5 0.0 -6.0 glTranslatef
|
-1.5 0.0 -6.0 glTranslatef
|
||||||
GL_TRIANGLES [
|
GL_TRIANGLES [
|
||||||
0.0 1.0 0.0 glVertex3f
|
0.0 1.0 0.0 glVertex3f
|
||||||
-1.0 -1.0 0.0 glVertex3f
|
-1.0 -1.0 0.0 glVertex3f
|
||||||
1.0 -1.0 0.0 glVertex3f
|
1.0 -1.0 0.0 glVertex3f
|
||||||
] do-state
|
] do-state
|
||||||
3.0 0.0 0.0 glTranslatef
|
3.0 0.0 0.0 glTranslatef
|
||||||
GL_QUADS [
|
GL_QUADS [
|
||||||
-1.0 1.0 0.0 glVertex3f
|
-1.0 1.0 0.0 glVertex3f
|
||||||
1.0 1.0 0.0 glVertex3f
|
1.0 1.0 0.0 glVertex3f
|
||||||
1.0 -1.0 0.0 glVertex3f
|
1.0 -1.0 0.0 glVertex3f
|
||||||
-1.0 -1.0 0.0 glVertex3f
|
-1.0 -1.0 0.0 glVertex3f
|
||||||
] do-state ;
|
] do-state ;
|
||||||
|
|
||||||
MAIN-WINDOW: run2
|
MAIN-WINDOW: run2
|
||||||
{
|
{
|
||||||
|
|
@ -49,4 +50,4 @@ MAIN-WINDOW: run2
|
||||||
T{ depth-bits { value 16 } }
|
T{ depth-bits { value 16 } }
|
||||||
} }
|
} }
|
||||||
}
|
}
|
||||||
<nehe2-gadget> >>gadgets ;
|
<nehe2-gadget> >>gadgets ;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
USING: arrays kernel math opengl opengl.gl opengl.glu
|
USING: arrays kernel math opengl opengl.gl opengl.glu
|
||||||
opengl.demo-support ui ui.gadgets ui.render threads accessors
|
opengl.demo-support ui ui.gadgets ui.render ui.pixel-formats
|
||||||
calendar literals ;
|
threads accessors calendar literals ;
|
||||||
IN: nehe.4
|
IN: nehe.4
|
||||||
|
|
||||||
TUPLE: nehe4-gadget < gadget rtri rquad thread quit? ;
|
TUPLE: nehe4-gadget < gadget rtri rquad thread quit? ;
|
||||||
|
|
@ -10,63 +10,63 @@ CONSTANT: height 256
|
||||||
: redraw-interval ( -- dt ) 10 milliseconds ;
|
: redraw-interval ( -- dt ) 10 milliseconds ;
|
||||||
|
|
||||||
: <nehe4-gadget> ( -- gadget )
|
: <nehe4-gadget> ( -- gadget )
|
||||||
nehe4-gadget new
|
nehe4-gadget new
|
||||||
0.0 >>rtri
|
0.0 >>rtri
|
||||||
0.0 >>rquad ;
|
0.0 >>rquad ;
|
||||||
|
|
||||||
M: nehe4-gadget draw-gadget* ( gadget -- )
|
M: nehe4-gadget draw-gadget* ( gadget -- )
|
||||||
GL_PROJECTION glMatrixMode
|
GL_PROJECTION glMatrixMode
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
45.0 width height / >float 0.1 100.0 gluPerspective
|
45.0 width height / >float 0.1 100.0 gluPerspective
|
||||||
GL_MODELVIEW glMatrixMode
|
GL_MODELVIEW glMatrixMode
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
GL_SMOOTH glShadeModel
|
GL_SMOOTH glShadeModel
|
||||||
0.0 0.0 0.0 0.0 glClearColor
|
0.0 0.0 0.0 0.0 glClearColor
|
||||||
1.0 glClearDepth
|
1.0 glClearDepth
|
||||||
GL_DEPTH_TEST glEnable
|
GL_DEPTH_TEST glEnable
|
||||||
GL_LEQUAL glDepthFunc
|
GL_LEQUAL glDepthFunc
|
||||||
GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST glHint
|
GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST glHint
|
||||||
GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
|
GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
-1.5 0.0 -6.0 glTranslatef
|
-1.5 0.0 -6.0 glTranslatef
|
||||||
dup rtri>> 0.0 1.0 0.0 glRotatef
|
dup rtri>> 0.0 1.0 0.0 glRotatef
|
||||||
|
|
||||||
GL_TRIANGLES [
|
GL_TRIANGLES [
|
||||||
1.0 0.0 0.0 glColor3f
|
1.0 0.0 0.0 glColor3f
|
||||||
0.0 1.0 0.0 glVertex3f
|
0.0 1.0 0.0 glVertex3f
|
||||||
0.0 1.0 0.0 glColor3f
|
0.0 1.0 0.0 glColor3f
|
||||||
-1.0 -1.0 0.0 glVertex3f
|
-1.0 -1.0 0.0 glVertex3f
|
||||||
0.0 0.0 1.0 glColor3f
|
0.0 0.0 1.0 glColor3f
|
||||||
1.0 -1.0 0.0 glVertex3f
|
1.0 -1.0 0.0 glVertex3f
|
||||||
] do-state
|
] do-state
|
||||||
|
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
|
|
||||||
1.5 0.0 -6.0 glTranslatef
|
1.5 0.0 -6.0 glTranslatef
|
||||||
dup rquad>> 1.0 0.0 0.0 glRotatef
|
dup rquad>> 1.0 0.0 0.0 glRotatef
|
||||||
0.5 0.5 1.0 glColor3f
|
0.5 0.5 1.0 glColor3f
|
||||||
GL_QUADS [
|
GL_QUADS [
|
||||||
-1.0 1.0 0.0 glVertex3f
|
-1.0 1.0 0.0 glVertex3f
|
||||||
1.0 1.0 0.0 glVertex3f
|
1.0 1.0 0.0 glVertex3f
|
||||||
1.0 -1.0 0.0 glVertex3f
|
1.0 -1.0 0.0 glVertex3f
|
||||||
-1.0 -1.0 0.0 glVertex3f
|
-1.0 -1.0 0.0 glVertex3f
|
||||||
] do-state
|
] do-state
|
||||||
[ 0.2 + ] change-rtri
|
[ 0.2 + ] change-rtri
|
||||||
[ 0.15 - ] change-rquad drop ;
|
[ 0.15 - ] change-rquad drop ;
|
||||||
|
|
||||||
: nehe4-update-thread ( gadget -- )
|
: nehe4-update-thread ( gadget -- )
|
||||||
dup quit?>> [ drop ] [
|
dup quit?>> [ drop ] [
|
||||||
redraw-interval sleep
|
redraw-interval sleep
|
||||||
dup relayout-1
|
dup relayout-1
|
||||||
nehe4-update-thread
|
nehe4-update-thread
|
||||||
] if ;
|
] if ;
|
||||||
|
|
||||||
M: nehe4-gadget graft* ( gadget -- )
|
M: nehe4-gadget graft* ( gadget -- )
|
||||||
f >>quit?
|
f >>quit?
|
||||||
[ nehe4-update-thread ] curry in-thread ;
|
[ nehe4-update-thread ] curry in-thread ;
|
||||||
|
|
||||||
M: nehe4-gadget ungraft* ( gadget -- )
|
M: nehe4-gadget ungraft* ( gadget -- )
|
||||||
t >>quit? drop ;
|
t >>quit? drop ;
|
||||||
|
|
||||||
MAIN-WINDOW: run4
|
MAIN-WINDOW: run4
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
USING: arrays kernel math opengl opengl.gl opengl.glu
|
USING: arrays kernel math opengl opengl.gl opengl.glu
|
||||||
opengl.demo-support ui ui.gadgets ui.render threads accessors
|
opengl.demo-support ui ui.gadgets ui.render ui.pixel-formats
|
||||||
calendar literals ;
|
threads accessors calendar literals ;
|
||||||
IN: nehe.5
|
IN: nehe.5
|
||||||
|
|
||||||
TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;
|
TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;
|
||||||
|
|
@ -9,118 +9,118 @@ CONSTANT: height 256
|
||||||
: redraw-interval ( -- dt ) 10 milliseconds ;
|
: redraw-interval ( -- dt ) 10 milliseconds ;
|
||||||
|
|
||||||
: <nehe5-gadget> ( -- gadget )
|
: <nehe5-gadget> ( -- gadget )
|
||||||
nehe5-gadget new
|
nehe5-gadget new
|
||||||
0.0 >>rtri
|
0.0 >>rtri
|
||||||
0.0 >>rquad ;
|
0.0 >>rquad ;
|
||||||
|
|
||||||
M: nehe5-gadget draw-gadget* ( gadget -- )
|
M: nehe5-gadget draw-gadget* ( gadget -- )
|
||||||
GL_PROJECTION glMatrixMode
|
GL_PROJECTION glMatrixMode
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
45.0 width height / >float 0.1 100.0 gluPerspective
|
45.0 width height / >float 0.1 100.0 gluPerspective
|
||||||
GL_MODELVIEW glMatrixMode
|
GL_MODELVIEW glMatrixMode
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
GL_SMOOTH glShadeModel
|
GL_SMOOTH glShadeModel
|
||||||
0.0 0.0 0.0 0.0 glClearColor
|
0.0 0.0 0.0 0.0 glClearColor
|
||||||
1.0 glClearDepth
|
1.0 glClearDepth
|
||||||
GL_DEPTH_TEST glEnable
|
GL_DEPTH_TEST glEnable
|
||||||
GL_LEQUAL glDepthFunc
|
GL_LEQUAL glDepthFunc
|
||||||
GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST glHint
|
GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST glHint
|
||||||
GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
|
GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT bitor glClear
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
-1.5 0.0 -6.0 glTranslatef
|
-1.5 0.0 -6.0 glTranslatef
|
||||||
dup rtri>> 0.0 1.0 0.0 glRotatef
|
dup rtri>> 0.0 1.0 0.0 glRotatef
|
||||||
|
|
||||||
GL_TRIANGLES [
|
GL_TRIANGLES [
|
||||||
1.0 0.0 0.0 glColor3f
|
1.0 0.0 0.0 glColor3f
|
||||||
0.0 1.0 0.0 glVertex3f
|
0.0 1.0 0.0 glVertex3f
|
||||||
0.0 1.0 0.0 glColor3f
|
0.0 1.0 0.0 glColor3f
|
||||||
-1.0 -1.0 1.0 glVertex3f
|
-1.0 -1.0 1.0 glVertex3f
|
||||||
0.0 0.0 1.0 glColor3f
|
0.0 0.0 1.0 glColor3f
|
||||||
1.0 -1.0 1.0 glVertex3f
|
1.0 -1.0 1.0 glVertex3f
|
||||||
|
|
||||||
1.0 0.0 0.0 glColor3f
|
1.0 0.0 0.0 glColor3f
|
||||||
0.0 1.0 0.0 glVertex3f
|
0.0 1.0 0.0 glVertex3f
|
||||||
0.0 0.0 1.0 glColor3f
|
0.0 0.0 1.0 glColor3f
|
||||||
1.0 -1.0 1.0 glVertex3f
|
1.0 -1.0 1.0 glVertex3f
|
||||||
0.0 1.0 0.0 glColor3f
|
0.0 1.0 0.0 glColor3f
|
||||||
1.0 -1.0 -1.0 glVertex3f
|
1.0 -1.0 -1.0 glVertex3f
|
||||||
|
|
||||||
1.0 0.0 0.0 glColor3f
|
1.0 0.0 0.0 glColor3f
|
||||||
0.0 1.0 0.0 glVertex3f
|
0.0 1.0 0.0 glVertex3f
|
||||||
0.0 1.0 0.0 glColor3f
|
0.0 1.0 0.0 glColor3f
|
||||||
1.0 -1.0 -1.0 glVertex3f
|
1.0 -1.0 -1.0 glVertex3f
|
||||||
0.0 0.0 1.0 glColor3f
|
0.0 0.0 1.0 glColor3f
|
||||||
-1.0 -1.0 -1.0 glVertex3f
|
-1.0 -1.0 -1.0 glVertex3f
|
||||||
|
|
||||||
1.0 0.0 0.0 glColor3f
|
1.0 0.0 0.0 glColor3f
|
||||||
0.0 1.0 0.0 glVertex3f
|
0.0 1.0 0.0 glVertex3f
|
||||||
0.0 0.0 1.0 glColor3f
|
0.0 0.0 1.0 glColor3f
|
||||||
-1.0 -1.0 -1.0 glVertex3f
|
-1.0 -1.0 -1.0 glVertex3f
|
||||||
0.0 1.0 0.0 glColor3f
|
0.0 1.0 0.0 glColor3f
|
||||||
-1.0 -1.0 1.0 glVertex3f
|
-1.0 -1.0 1.0 glVertex3f
|
||||||
] do-state
|
] do-state
|
||||||
|
|
||||||
glLoadIdentity
|
glLoadIdentity
|
||||||
|
|
||||||
1.5 0.0 -7.0 glTranslatef
|
1.5 0.0 -7.0 glTranslatef
|
||||||
dup rquad>> 1.0 0.0 0.0 glRotatef
|
dup rquad>> 1.0 0.0 0.0 glRotatef
|
||||||
GL_QUADS [
|
GL_QUADS [
|
||||||
0.0 1.0 0.0 glColor3f
|
0.0 1.0 0.0 glColor3f
|
||||||
1.0 1.0 -1.0 glVertex3f
|
1.0 1.0 -1.0 glVertex3f
|
||||||
-1.0 1.0 -1.0 glVertex3f
|
-1.0 1.0 -1.0 glVertex3f
|
||||||
-1.0 1.0 1.0 glVertex3f
|
-1.0 1.0 1.0 glVertex3f
|
||||||
1.0 1.0 1.0 glVertex3f
|
1.0 1.0 1.0 glVertex3f
|
||||||
|
|
||||||
1.0 0.5 0.0 glColor3f
|
1.0 0.5 0.0 glColor3f
|
||||||
1.0 -1.0 1.0 glVertex3f
|
1.0 -1.0 1.0 glVertex3f
|
||||||
-1.0 -1.0 1.0 glVertex3f
|
-1.0 -1.0 1.0 glVertex3f
|
||||||
-1.0 -1.0 -1.0 glVertex3f
|
-1.0 -1.0 -1.0 glVertex3f
|
||||||
1.0 -1.0 -1.0 glVertex3f
|
1.0 -1.0 -1.0 glVertex3f
|
||||||
|
|
||||||
1.0 0.0 0.0 glColor3f
|
1.0 0.0 0.0 glColor3f
|
||||||
1.0 1.0 1.0 glVertex3f
|
1.0 1.0 1.0 glVertex3f
|
||||||
-1.0 1.0 1.0 glVertex3f
|
-1.0 1.0 1.0 glVertex3f
|
||||||
-1.0 -1.0 1.0 glVertex3f
|
-1.0 -1.0 1.0 glVertex3f
|
||||||
1.0 -1.0 1.0 glVertex3f
|
1.0 -1.0 1.0 glVertex3f
|
||||||
|
|
||||||
1.0 1.0 0.0 glColor3f
|
1.0 1.0 0.0 glColor3f
|
||||||
1.0 -1.0 -1.0 glVertex3f
|
1.0 -1.0 -1.0 glVertex3f
|
||||||
-1.0 -1.0 -1.0 glVertex3f
|
-1.0 -1.0 -1.0 glVertex3f
|
||||||
-1.0 1.0 -1.0 glVertex3f
|
-1.0 1.0 -1.0 glVertex3f
|
||||||
1.0 1.0 -1.0 glVertex3f
|
1.0 1.0 -1.0 glVertex3f
|
||||||
|
|
||||||
0.0 0.0 1.0 glColor3f
|
0.0 0.0 1.0 glColor3f
|
||||||
-1.0 1.0 1.0 glVertex3f
|
-1.0 1.0 1.0 glVertex3f
|
||||||
-1.0 1.0 -1.0 glVertex3f
|
-1.0 1.0 -1.0 glVertex3f
|
||||||
-1.0 -1.0 -1.0 glVertex3f
|
-1.0 -1.0 -1.0 glVertex3f
|
||||||
-1.0 -1.0 1.0 glVertex3f
|
-1.0 -1.0 1.0 glVertex3f
|
||||||
|
|
||||||
1.0 0.0 1.0 glColor3f
|
1.0 0.0 1.0 glColor3f
|
||||||
1.0 1.0 -1.0 glVertex3f
|
1.0 1.0 -1.0 glVertex3f
|
||||||
1.0 1.0 1.0 glVertex3f
|
1.0 1.0 1.0 glVertex3f
|
||||||
1.0 -1.0 1.0 glVertex3f
|
1.0 -1.0 1.0 glVertex3f
|
||||||
1.0 -1.0 -1.0 glVertex3f
|
1.0 -1.0 -1.0 glVertex3f
|
||||||
] do-state
|
] do-state
|
||||||
[ 0.2 + ] change-rtri
|
[ 0.2 + ] change-rtri
|
||||||
[ 0.15 - ] change-rquad drop ;
|
[ 0.15 - ] change-rquad drop ;
|
||||||
|
|
||||||
: nehe5-update-thread ( gadget -- )
|
: nehe5-update-thread ( gadget -- )
|
||||||
dup quit?>> [
|
dup quit?>> [
|
||||||
drop
|
drop
|
||||||
] [
|
] [
|
||||||
redraw-interval sleep
|
redraw-interval sleep
|
||||||
dup relayout-1
|
dup relayout-1
|
||||||
nehe5-update-thread
|
nehe5-update-thread
|
||||||
] if ;
|
] if ;
|
||||||
|
|
||||||
M: nehe5-gadget graft* ( gadget -- )
|
M: nehe5-gadget graft* ( gadget -- )
|
||||||
f >>quit?
|
f >>quit?
|
||||||
[ nehe5-update-thread ] curry in-thread ;
|
[ nehe5-update-thread ] curry in-thread ;
|
||||||
|
|
||||||
M: nehe5-gadget ungraft* ( gadget -- )
|
M: nehe5-gadget ungraft* ( gadget -- )
|
||||||
t >>quit? drop ;
|
t >>quit? drop ;
|
||||||
|
|
||||||
MAIN-WINDOW: run4
|
MAIN-WINDOW: run5
|
||||||
{
|
{
|
||||||
{ title "NeHe Tutorial 5" }
|
{ title "NeHe Tutorial 5" }
|
||||||
{ pref-dim { $ width $ height } }
|
{ pref-dim { $ width $ height } }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue