projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strip out GLUT_DISPLAY_CALLBACK from worklist _before_ calling display callback....
[freeglut]
/
progs
/
demos
/
Lorenz
/
lorenz.c
diff --git
a/progs/demos/Lorenz/lorenz.c
b/progs/demos/Lorenz/lorenz.c
index
366c7e4
..
a3a61db
100644
(file)
--- a/
progs/demos/Lorenz/lorenz.c
+++ b/
progs/demos/Lorenz/lorenz.c
@@
-220,8
+220,7
@@
void mouse_cb ( int button, int updown, int x, int y )
{
if ( updown == GLUT_DOWN )
{
{
if ( updown == GLUT_DOWN )
{
- double dist = 1.0e20 ; /* A very large number */
- dist = 0.0 ; /* so we don't get "unused variable" compiler warning */
+ /*double dist = 1.0e20 ; A very large number */
/* The idea here is that we go into "pick" mode and pick the nearest point
to the mouse click position. Unfortunately I don't have the time to implement
it at the moment. */
/* The idea here is that we go into "pick" mode and pick the nearest point
to the mouse click position. Unfortunately I don't have the time to implement
it at the moment. */
@@
-249,7
+248,11
@@
void bitmapPrintf (const char *fmt, ...)
va_list args;
va_start(args, fmt);
va_list args;
va_start(args, fmt);
+#if defined(WIN32) && !defined(__CYGWIN__)
+ (void) _vsnprintf (buf, sizeof(buf), fmt, args);
+#else
(void) vsnprintf (buf, sizeof(buf), fmt, args);
(void) vsnprintf (buf, sizeof(buf), fmt, args);
+#endif
va_end(args);
glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)buf ) ;
}
va_end(args);
glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)buf ) ;
}