Reverting previous commit: %lf is a valid format specifier for the scanf

familiy of functions only, not for the printf family.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@667 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2005-07-06 09:19:37 +00:00
parent 3ae354ad4b
commit a37b090e46

View File

@ -141,15 +141,15 @@ void key_cb ( unsigned char key, int x, int y )
break ;
case 'm' : case 'M' : /* Modify the Lorenz parameters */
printf ( "Please enter new value for <sigma> (default %lf, currently %lf): ", s0, sigma ) ;
printf ( "Please enter new value for <sigma> (default %f, currently %f): ", s0, sigma ) ;
fgets ( inputline, INPUT_LINE_LENGTH-1, stdin ) ;
sscanf ( inputline, "%lf", &sigma ) ;
printf ( "Please enter new value for <b> (default %lf, currently %lf): ", b0, b ) ;
printf ( "Please enter new value for <b> (default %f, currently %f): ", b0, b ) ;
fgets ( inputline, INPUT_LINE_LENGTH-1, stdin ) ;
sscanf ( inputline, "%lf", &b ) ;
printf ( "Please enter new value for <r> (default %lf, currently %lf): ", r0, r ) ;
printf ( "Please enter new value for <r> (default %f, currently %f): ", r0, r ) ;
fgets ( inputline, INPUT_LINE_LENGTH-1, stdin ) ;
sscanf ( inputline, "%lf", &r ) ;
@ -257,9 +257,9 @@ void display_cb ( void )
/* Print the distance between the two points */
glColor3d ( 1.0, 1.0, 1.0 ) ; /* White */
sprintf ( string, "Distance: %10.6lf", distance ) ;
sprintf ( string, "Distance: %10.6f", distance ) ;
glRasterPos2i ( 10, 10 ) ;
glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char *)string ) ;
glutBitmapString ( GLUT_BITMAP_HELVETICA_12, (unsigned char*)string ) ;
glutSwapBuffers();
}