projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a new state variable "Initalized".
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
b09f272
..
0ddceaf
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.c
@@
-29,8
+29,6
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#define G_LOG_DOMAIN "freeglut-state"
-
#include "../include/GL/freeglut.h"
#include "freeglut_internal.h"
#include "../include/GL/freeglut.h"
#include "freeglut_internal.h"
@@
-129,8
+127,14
@@
int FGAPIENTRY glutGet( GLenum eWhat )
int returnValue ;
GLboolean boolValue ;
int returnValue ;
GLboolean boolValue ;
- if ( eWhat == GLUT_INIT_STATE )
- return ( fgState.Time.Set ) ;
+ switch (eWhat)
+ {
+ case GLUT_INIT_STATE:
+ return ( fgState.Initalized ) ;
+
+ case GLUT_ELAPSED_TIME:
+ return( fgElapsedTime() );
+ }
freeglut_assert_ready;
freeglut_assert_ready;
@@
-139,9
+143,6
@@
int FGAPIENTRY glutGet( GLenum eWhat )
*/
switch( eWhat )
{
*/
switch( eWhat )
{
- case GLUT_ELAPSED_TIME:
- return( fgElapsedTime() );
-
/*
* Following values are stored in fgState and fgDisplay global structures
*/
/*
* Following values are stored in fgState and fgDisplay global structures
*/
@@
-230,7
+231,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
case GLUT_WINDOW_Y: return y;
}
case GLUT_WINDOW_Y: return y;
}
- if ( w == 0 )
+ if ( w == 0 )
return( 0 );
XTranslateCoordinates(
fgDisplay.Display,
return( 0 );
XTranslateCoordinates(
fgDisplay.Display,