projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics in one demo
[freeglut]
/
progs
/
demos
/
One
/
one.c
diff --git
a/progs/demos/One/one.c
b/progs/demos/One/one.c
index
cdabd24
..
e14b083
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, g_gamemodewin;
/*
* Call this function to have some text drawn at given coordinates
/*
* Call this function to have some text drawn at given coordinates
@@
-94,12
+94,18
@@
void PrintText( int nX, int nY, char* pszText )
/*
* This is the display routine for our sample FreeGLUT windows
*/
/*
* This is the display routine for our sample FreeGLUT windows
*/
-static float g_fTime = 0.0f;
-
void SampleDisplay( void )
{
int win = glutGetWindow();
void SampleDisplay( void )
{
int win = glutGetWindow();
+ if (g_InGameMode && win!=g_gamemodewin)
+ /* Dont draw other windows when in gamemode, those aren't visible
+ * anyway. Drawing them continuously anyway can cause flicker trouble
+ * on my machine. This only seems to occur when there are child windows
+ * among the non-visible windows
+ */
+ return;
+
if (win==g_sw1)
{
/*
if (win==g_sw1)
{
/*
@@
-109,8
+115,19
@@
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
{
+ const GLfloat time = glutGet(GLUT_ELAPSED_TIME) / 1000.f * 40;
+
/*
* Clear the screen
*/
/*
* Clear the screen
*/
@@
-123,9
+140,9
@@
void SampleDisplay( void )
glMatrixMode( GL_MODELVIEW );
glPushMatrix();
glMatrixMode( GL_MODELVIEW );
glPushMatrix();
- glRotatef( g_fTime, 0, 0, 1 );
- glRotatef( g_fTime, 0, 1, 0 );
- glRotatef( g_fTime, 1, 0, 0 );
+ glRotatef( time, 0, 0, 1 );
+ glRotatef( time, 0, 1, 0 );
+ glRotatef( time, 1, 0, 0 );
/*
* And then drawn...
/*
* And then drawn...
@@
-133,7
+150,7
@@
void SampleDisplay( void )
glColor3f( 1, 1, 0 );
/* glutWireCube( 20.0 ); */
glutWireTeapot( 20.0 );
glColor3f( 1, 1, 0 );
/* glutWireCube( 20.0 ); */
glutWireTeapot( 20.0 );
- /* glutWireSpher( 15.0, 15, 15 ); */
+ /* glutWireSphere( 15.0, 15, 15 ); */
/* glColor3f( 0, 1, 0 ); */
/* glutWireCube( 30.0 ); */
/* glutSolidCone( 10, 20, 10, 2 ); */
/* glColor3f( 0, 1, 0 ); */
/* glutWireCube( 30.0 ); */
/* glutSolidCone( 10, 20, 10, 2 ); */
@@
-164,16
+181,21
@@
void SampleDisplay( void )
*/
void SampleIdle( void )
{
*/
void SampleIdle( void )
{
- g_fTime += 0.5f;
-
if( g_LeaveGameMode == 1 )
{
if( g_LeaveGameMode == 1 )
{
+ /* One could do all this just as well in SampleGameModeKeyboard... */
glutLeaveGameMode( );
g_LeaveGameMode = 0;
g_InGameMode = 0;
}
}
glutLeaveGameMode( );
g_LeaveGameMode = 0;
g_InGameMode = 0;
}
}
+void SampleEntry(int state)
+{
+ int window = glutGetWindow () ;
+ printf ( "Window %d Entry Callback: %d\n", window, state ) ;
+}
+
/*
* The reshape function
*/
/*
* The reshape function
*/
@@
-255,13
+277,18
@@
void SampleSpecial( int nSpecial, int nMouseX, int nMouseY )
*/
void SampleMenu( int menuID )
{
*/
void SampleMenu( int menuID )
{
- /*
- * Just print something funny
- */
printf( "SampleMenu() callback executed, menuID is %i\n", menuID );
}
/*
printf( "SampleMenu() callback executed, menuID is %i\n", menuID );
}
/*
+ * A sample menu status callback
+ */
+void SampleMenuStatus( int status, int x, int y )
+{
+ printf ( "SampleMenu() callback executed, MenuStatus is %i at (%i,%i)\n", status, x, y );
+}
+
+/*
* The sample's entry point
*/
int main( int argc, char** argv )
* The sample's entry point
*/
int main( int argc, char** argv )
@@
-302,6
+329,8
@@
int main( int argc, char** argv )
glutKeyboardFunc( SampleKeyboard );
glutSpecialFunc( SampleSpecial );
glutIdleFunc( SampleIdle );
glutKeyboardFunc( SampleKeyboard );
glutSpecialFunc( SampleSpecial );
glutIdleFunc( SampleIdle );
+ glutEntryFunc( SampleEntry );
+ glutMenuStatusFunc( SampleMenuStatus );
glutAttachMenu( GLUT_LEFT_BUTTON );
glutInitWindowPosition( 200, 200 );
glutAttachMenu( GLUT_LEFT_BUTTON );
glutInitWindowPosition( 200, 200 );
@@
-311,14
+340,21
@@
int main( int argc, char** argv )
glutKeyboardFunc( SampleKeyboard );
glutSpecialFunc( SampleSpecial );
glutIdleFunc( SampleIdle );
glutKeyboardFunc( SampleKeyboard );
glutSpecialFunc( SampleSpecial );
glutIdleFunc( SampleIdle );
+ glutEntryFunc( SampleEntry );
+ glutMenuStatusFunc( SampleMenuStatus );
glutAttachMenu( GLUT_LEFT_BUTTON );
glutSetMenu(subMenuA);
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);
g_sw1=glutCreateSubWindow(g_mainwin,200,0,100,100);
glutDisplayFunc( SampleDisplay );
glutSetMenu(subMenuB);
- glutAttachMenu( GLUT_LEFT_BUTTON);
+ 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" );
printf( "Testing game mode string parsing, don't panic!\n" );
glutGameModeString( "320x240:32@100" );
@@
-331,7
+367,7
@@
int main( int argc, char** argv )
glutEnterGameMode();
glutGameModeString( "800x600" ); /* this one is likely to succeed */
glutEnterGameMode();
glutGameModeString( "800x600" ); /* this one is likely to succeed */
- glutEnterGameMode();
+ g_gamemodewin = glutEnterGameMode();
if (glutGameModeGet(GLUT_GAME_MODE_ACTIVE))
g_InGameMode = 1;
if (glutGameModeGet(GLUT_GAME_MODE_ACTIVE))
g_InGameMode = 1;
@@
-339,6
+375,10
@@
int main( int argc, char** argv )
glutReshapeFunc( SampleReshape );
glutKeyboardFunc( SampleGameModeKeyboard );
glutIdleFunc( SampleIdle );
glutReshapeFunc( SampleReshape );
glutKeyboardFunc( SampleGameModeKeyboard );
glutIdleFunc( SampleIdle );
+ glutEntryFunc( SampleEntry );
+ glutMenuStatusFunc( SampleMenuStatus );
+ glutSetMenu(menuID);
+ glutAttachMenu( GLUT_LEFT_BUTTON );
printf( "current window is %ix%i at (%i,%i)\n",
glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT ),
printf( "current window is %ix%i at (%i,%i)\n",
glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT ),
@@
-350,12
+390,13
@@
int main( int argc, char** argv )
*/
glutMainLoop();
*/
glutMainLoop();
- printf( "glutMainLoop() termination works fine!\n" );
-
/*
/*
- * This is never reached in FreeGLUT. Is that good?
+ * returned from mainloop after window closed
+ * see glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_GLUTMAINLOOP_RETURNS); above
*/
*/
+ printf( "glutMainLoop() termination works fine!\n" );
+
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}
-/*** END OF FILE ***/
\ No newline at end of file
+/*** END OF FILE ***/