projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added one more child window (child-of-child) to one demo for testing
[freeglut]
/
progs
/
demos
/
One
/
one.c
diff --git
a/progs/demos/One/one.c
b/progs/demos/One/one.c
index
330921e
..
36f7c79
100644
(file)
--- a/
progs/demos/One/one.c
+++ b/
progs/demos/One/one.c
@@
-23,7
+23,7
@@
int g_LeaveGameMode = 0;
int g_InGameMode = 0;
int g_LeaveGameMode = 0;
int g_InGameMode = 0;
-int g_mainwin, g_sw1;
+int g_mainwin, g_sw1, g_sw2;
/*
* Call this function to have some text drawn at given coordinates
/*
* Call this function to have some text drawn at given coordinates
@@
-109,6
+109,15
@@
void SampleDisplay( void )
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
glutPostWindowRedisplay(g_mainwin);
}
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
glutPostWindowRedisplay(g_mainwin);
}
+ else if (win==g_sw2)
+ {
+ /*
+ * Clear the screen
+ */
+ glClearColor(0.3f,0.3f,0.3f,1);
+ glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+ glutPostWindowRedisplay(g_mainwin);
+ }
else
{
/*
else
{
/*
@@
-321,13
+330,18
@@
int main( int argc, char** argv )
glutIdleFunc( SampleIdle );
glutAttachMenu( GLUT_LEFT_BUTTON );
glutSetMenu(subMenuA);
glutIdleFunc( SampleIdle );
glutAttachMenu( GLUT_LEFT_BUTTON );
glutSetMenu(subMenuA);
- glutAttachMenu( GLUT_RIGHT_BUTTON);
+ glutAttachMenu( GLUT_RIGHT_BUTTON );
g_sw1=glutCreateSubWindow(g_mainwin,200,0,100,100);
glutDisplayFunc( SampleDisplay );
glutSetMenu(subMenuB);
glutAttachMenu( GLUT_LEFT_BUTTON);
g_sw1=glutCreateSubWindow(g_mainwin,200,0,100,100);
glutDisplayFunc( SampleDisplay );
glutSetMenu(subMenuB);
glutAttachMenu( GLUT_LEFT_BUTTON);
+ g_sw2=glutCreateSubWindow(g_sw1,50,0,50,50);
+ glutDisplayFunc( SampleDisplay );
+ glutSetMenu(menuID);
+ glutAttachMenu( GLUT_RIGHT_BUTTON );
+
printf( "Testing game mode string parsing, don't panic!\n" );
glutGameModeString( "320x240:32@100" );
glutGameModeString( "640x480:16@72" );
printf( "Testing game mode string parsing, don't panic!\n" );
glutGameModeString( "320x240:32@100" );
glutGameModeString( "640x480:16@72" );