projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now have a default reshape callback function that is used if the user didn't set...
[freeglut]
/
src
/
fg_init.c
diff --git
a/src/fg_init.c
b/src/fg_init.c
index
1e71931
..
752439e
100644
(file)
--- a/
src/fg_init.c
+++ b/
src/fg_init.c
@@
-28,7
+28,6
@@
#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h>
#include "fg_internal.h"
#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h>
#include "fg_internal.h"
-#include "fg_gl2.h"
/*
* TODO BEFORE THE STABLE RELEASE:
/*
* TODO BEFORE THE STABLE RELEASE:
@@
-342,9
+341,6
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
fgCreateStructure( );
fgCreateStructure( );
- /* Get start time */
- fgState.Time = fgSystemTime();
-
fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
/*
fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
/*
@@
-381,8
+377,6
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
if( (mask & (XValue|YValue)) == (XValue|YValue) )
fgState.Position.Use = GL_TRUE;
}
if( (mask & (XValue|YValue)) == (XValue|YValue) )
fgState.Position.Use = GL_TRUE;
}
-
- fgInitGL2();
}
/*
}
/*
@@
-671,19
+665,19
@@
void FGAPIENTRY glutInitContextProfile( int profile )
/*
* Sets the user error handler (note the use of va_list for the args to the fmt)
*/
/*
* Sets the user error handler (note the use of va_list for the args to the fmt)
*/
-void FGAPIENTRY glutInitErrorFunc( void (* vfgError) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitErrorFunc( FGError callback )
{
/* This allows user programs to handle freeglut errors */
{
/* This allows user programs to handle freeglut errors */
- fgState.ErrorFunc = vfgError;
+ fgState.ErrorFunc = callback;
}
/*
* Sets the user warning handler (note the use of va_list for the args to the fmt)
*/
}
/*
* Sets the user warning handler (note the use of va_list for the args to the fmt)
*/
-void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
{
/* This allows user programs to handle freeglut warnings */
{
/* This allows user programs to handle freeglut warnings */
- fgState.WarningFunc = vfgWarning;
+ fgState.WarningFunc = callback;
}
/*** END OF FILE ***/
}
/*** END OF FILE ***/