summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6a3b098)
warnings. Using snprintf directly would be a little bit more tricky,
because once again Microsoft decided to avoid followind standards and
provide _snprintf instead. We could use this, too, but this would
require an additional autoconf check, which I'd like to avoid, if
possible.
Note: If VS *still* issues warnings, but this time about vsnprintf,
somebody should add some pragmas or whatever is needed to shut up that
warning, it would be silly.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@783
7f0cb862-5218-0410-a997-
914c9d46530a
#include <GL/freeglut.h>
#include <stdio.h>
#include <stdlib.h>
#include <GL/freeglut.h>
#include <stdio.h>
#include <stdlib.h>
static int sequence_number = 0 ;
static int sequence_number = 0 ;
int mousewheel_number = -1, mousewheel_direction = -1, mousewheel_x = -1, mousewheel_y = -1, mousewheel_seq = -1 ;
int motion_x = -1, motion_y = -1, motion_seq = -1 ;
int passivemotion_x = -1, passivemotion_y = -1, passivemotion_seq = -1 ;
int mousewheel_number = -1, mousewheel_direction = -1, mousewheel_x = -1, mousewheel_y = -1, mousewheel_seq = -1 ;
int motion_x = -1, motion_y = -1, motion_seq = -1 ;
int passivemotion_x = -1, passivemotion_y = -1, passivemotion_seq = -1 ;
+
+static void
+bitmapPrintf (const char *fmt, ...)
+{
+ static char buf[256];
+ va_list args;
+
+ va_start(args, fmt);
+ (void) vsnprintf (buf, sizeof(buf), fmt, args);
+ va_end(args);
+ glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)buf ) ;
+}
+
+
static void
Display(void)
{
static void
Display(void)
{
int window = glutGetWindow () ;
glClear ( GL_COLOR_BUFFER_BIT );
int window = glutGetWindow () ;
glClear ( GL_COLOR_BUFFER_BIT );
- sprintf ( line, "Reshape %d: %d %d\n", reshape_seq, reshape_width, reshape_height );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Reshape %d: %d %d\n", reshape_seq, reshape_width, reshape_height );
- sprintf ( line, "Key %d: %d(%c) %d %d\n", key_seq, key_key, key_key, key_x, key_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Key %d: %d(%c) %d %d\n", key_seq, key_key, key_key, key_x, key_y );
}
if ( special_called )
{
}
if ( special_called )
{
- sprintf ( line, "Special %d: %d(%c) %d %d\n", special_seq, special_key, special_key, special_x, special_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Special %d: %d(%c) %d %d\n", special_seq, special_key, special_key, special_x, special_y );
}
if ( visibility_called )
{
}
if ( visibility_called )
{
- sprintf ( line, "Visibility %d: %d\n", visibility_seq, visibility_vis );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Visibility %d: %d\n", visibility_seq, visibility_vis );
- sprintf ( line, "Key Up %d: %d(%c) %d %d\n", keyup_seq, keyup_key, keyup_key, keyup_x, keyup_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Key Up %d: %d(%c) %d %d\n", keyup_seq, keyup_key, keyup_key, keyup_x, keyup_y );
}
if ( specialup_called )
{
}
if ( specialup_called )
{
- sprintf ( line, "Special Up %d: %d(%c) %d %d\n", specialup_seq, specialup_key, specialup_key, specialup_x, specialup_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Special Up %d: %d(%c) %d %d\n", specialup_seq, specialup_key, specialup_key, specialup_x, specialup_y );
}
if ( joystick_called )
{
}
if ( joystick_called )
{
- sprintf ( line, "Joystick %d: %d %d %d %d\n", joystick_seq, joystick_a, joystick_b, joystick_c, joystick_d );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Joystick %d: %d %d %d %d\n", joystick_seq, joystick_a, joystick_b, joystick_c, joystick_d );
- sprintf ( line, "Mouse %d: %d %d %d %d\n", mouse_seq, mouse_button, mouse_updown, mouse_x, mouse_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Mouse %d: %d %d %d %d\n", mouse_seq, mouse_button, mouse_updown, mouse_x, mouse_y );
}
if ( mousewheel_called )
{
}
if ( mousewheel_called )
{
- sprintf ( line, "Mouse Wheel %d: %d %d %d %d\n", mousewheel_seq, mousewheel_number, mousewheel_direction, mousewheel_x, mousewheel_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Mouse Wheel %d: %d %d %d %d\n", mousewheel_seq, mousewheel_number, mousewheel_direction, mousewheel_x, mousewheel_y );
- sprintf ( line, "Motion %d: %d %d\n", motion_seq, motion_x, motion_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Motion %d: %d %d\n", motion_seq, motion_x, motion_y );
}
if ( passivemotion_called )
{
}
if ( passivemotion_called )
{
- sprintf ( line, "Passive Motion %d: %d %d\n", passivemotion_seq, passivemotion_x, passivemotion_y );
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)line );
+ bitmapPrintf ( "Passive Motion %d: %d %d\n", passivemotion_seq, passivemotion_x, passivemotion_y );
}
glMatrixMode ( GL_PROJECTION );
}
glMatrixMode ( GL_PROJECTION );
/* Include Files */
#include <stdio.h>
#include <stdlib.h>
/* Include Files */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <GL/freeglut.h>
#include <string.h>
#include <math.h>
#include <GL/freeglut.h>
-void display_cb ( void )
+void bitmapPrintf (const char *fmt, ...)
+ static char buf[256];
+ va_list args;
+
+ va_start(args, fmt);
+ (void) vsnprintf (buf, sizeof(buf), fmt, args);
+ va_end(args);
+ glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)buf ) ;
+}
+void display_cb ( void )
+{
glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ) ;
glColor3d ( 1.0, 1.0, 1.0 ) ; /* White */
glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ) ;
glColor3d ( 1.0, 1.0, 1.0 ) ; /* White */
/* Print the distance between the two points */
glColor3d ( 1.0, 1.0, 1.0 ) ; /* White */
/* Print the distance between the two points */
glColor3d ( 1.0, 1.0, 1.0 ) ; /* White */
- sprintf ( string, "Distance: %10.6f", distance ) ;
- glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)string ) ;
+ bitmapPrintf ( "Distance: %10.6f", distance ) ;
Limitation: Cannot address pixels.
Limitation: Renders in screen coords, not model coords.
Limitation: Cannot address pixels.
Limitation: Renders in screen coords, not model coords.
-
- \note Uses a fixed, 256-byte array for holding strings.
- The best way around this would be to use vasprintf(),
- but that is not available on WIN32, I believe.
- Another alternative would be to write our own formatter
- from scratch and emit the characters one at a time to
- the GLUT bitmap single-character drawing routine.
- We could also use vsnprintf(), but I'm not sure if
- that is standard...
*/
static void shapesPrintf (int row, int col, const char *fmt, ...)
{
*/
static void shapesPrintf (int row, int col, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
va_list args;
va_start(args, fmt);
- (void) vsprintf (buf, fmt, args);
+ (void) vsnprintf (buf, sizeof(buf), fmt, args);
va_end(args);
glGetIntegerv(GL_VIEWPORT,viewport);
va_end(args);
glGetIntegerv(GL_VIEWPORT,viewport);