Update from John:
I [John] converted everything to double precision to avoid compiler warnings. I also added a feature to check for memory leaks under Windows and removed a memory leak (surprise!). git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@296 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
cc38ef07e9
commit
8df7ae3c29
@ -24,6 +24,9 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#ifdef WIN32
|
||||||
|
#include <crtdbg.h> // DUMP MEMORY LEAKS
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@ -44,11 +47,11 @@ static AffineTrans *affine ;
|
|||||||
char window_title [ 80 ] ;
|
char window_title [ 80 ] ;
|
||||||
|
|
||||||
/* The amount the view is translated */
|
/* The amount the view is translated */
|
||||||
float xwin = 0.0, ywin = 0.0 ;
|
double xwin = 0.0, ywin = 0.0 ;
|
||||||
float scale_factor = 1.0 ;
|
double scale_factor = 1.0 ;
|
||||||
|
|
||||||
/* The current point */
|
/* The current point */
|
||||||
float current_x = 0.0, current_y = 0.0 ;
|
double current_x = 0.0, current_y = 0.0 ;
|
||||||
|
|
||||||
/* Signals when a glClear is needed */
|
/* Signals when a glClear is needed */
|
||||||
static GLboolean needClear = GL_TRUE;
|
static GLboolean needClear = GL_TRUE;
|
||||||
@ -61,8 +64,8 @@ static void draw_level ( int num, double m00, double m01, double m10, double m11
|
|||||||
for ( i = 0; i < 10; i++ )
|
for ( i = 0; i < 10; i++ )
|
||||||
{
|
{
|
||||||
int random = (rand() >> 10) % num_trans;
|
int random = (rand() >> 10) % num_trans;
|
||||||
float new_x = affine[random].a00 * current_x + affine[random].a01 * current_y + affine[random].b0 ;
|
double new_x = affine[random].a00 * current_x + affine[random].a01 * current_y + affine[random].b0 ;
|
||||||
float new_y = affine[random].a10 * current_x + affine[random].a11 * current_y + affine[random].b1 ;
|
double new_y = affine[random].a10 * current_x + affine[random].a11 * current_y + affine[random].b1 ;
|
||||||
|
|
||||||
glVertex2f ( new_x, new_y ) ;
|
glVertex2f ( new_x, new_y ) ;
|
||||||
current_x = new_x ;
|
current_x = new_x ;
|
||||||
@ -80,7 +83,7 @@ Display(void)
|
|||||||
|
|
||||||
/* the curve */
|
/* the curve */
|
||||||
glPushMatrix();
|
glPushMatrix();
|
||||||
glScalef(2.5, 2.5, 2.5);
|
glScaled(2.5, 2.5, 2.5);
|
||||||
|
|
||||||
glColor4f(0.0, 0.0, 0.0, 1.0);
|
glColor4f(0.0, 0.0, 0.0, 1.0);
|
||||||
glBegin ( GL_POINTS ) ;
|
glBegin ( GL_POINTS ) ;
|
||||||
@ -109,7 +112,7 @@ Reshape(int width, int height)
|
|||||||
glLoadIdentity();
|
glLoadIdentity();
|
||||||
xwin = -1.0 ;
|
xwin = -1.0 ;
|
||||||
ywin = 0.0 ;
|
ywin = 0.0 ;
|
||||||
glTranslatef(xwin, ywin, -5.0);
|
glTranslated(xwin, ywin, -5.0);
|
||||||
needClear = GL_TRUE;
|
needClear = GL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,7 +131,7 @@ Key(unsigned char key, int x, int y)
|
|||||||
glLoadIdentity();
|
glLoadIdentity();
|
||||||
xwin = -1.0 ;
|
xwin = -1.0 ;
|
||||||
ywin = 0.0 ;
|
ywin = 0.0 ;
|
||||||
glTranslatef(xwin, ywin, -5.0);
|
glTranslated(xwin, ywin, -5.0);
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@ -144,45 +147,45 @@ static void
|
|||||||
Special(int key, int x, int y)
|
Special(int key, int x, int y)
|
||||||
{
|
{
|
||||||
int changed_settings = 1;
|
int changed_settings = 1;
|
||||||
|
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case GLUT_KEY_UP :
|
case GLUT_KEY_UP :
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
ywin += 0.1 * scale_factor ;
|
ywin += 0.1 * scale_factor ;
|
||||||
glTranslatef(0.0, 0.1 * scale_factor, 0.0);
|
glTranslated(0.0, 0.1 * scale_factor, 0.0);
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
case GLUT_KEY_DOWN :
|
case GLUT_KEY_DOWN :
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
ywin -= 0.1 * scale_factor ;
|
ywin -= 0.1 * scale_factor ;
|
||||||
glTranslatef(0.0, -0.1 * scale_factor, 0.0);
|
glTranslated(0.0, -0.1 * scale_factor, 0.0);
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
case GLUT_KEY_LEFT :
|
case GLUT_KEY_LEFT :
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
xwin -= 0.1 * scale_factor ;
|
xwin -= 0.1 * scale_factor ;
|
||||||
glTranslatef(-0.1 * scale_factor, 0.0, 0.0);
|
glTranslated(-0.1 * scale_factor, 0.0, 0.0);
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
case GLUT_KEY_RIGHT :
|
case GLUT_KEY_RIGHT :
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
xwin += 0.1 * scale_factor ;
|
xwin += 0.1 * scale_factor ;
|
||||||
glTranslatef(0.1 * scale_factor, 0.0, 0.0);
|
glTranslated(0.1 * scale_factor, 0.0, 0.0);
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
case GLUT_KEY_PAGE_UP :
|
case GLUT_KEY_PAGE_UP :
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
glTranslatef ( -xwin, -ywin, 0.0 ) ;
|
glTranslated ( -xwin, -ywin, 0.0 ) ;
|
||||||
glScalef(1.25, 1.25, 1.25);
|
glScaled(1.25, 1.25, 1.25);
|
||||||
glTranslatef ( xwin, ywin, 0.0 ) ;
|
glTranslated ( xwin, ywin, 0.0 ) ;
|
||||||
scale_factor *= 0.8 ;
|
scale_factor *= 0.8 ;
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
case GLUT_KEY_PAGE_DOWN :
|
case GLUT_KEY_PAGE_DOWN :
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
glTranslatef ( -xwin, -ywin, 0.0 ) ;
|
glTranslated ( -xwin, -ywin, 0.0 ) ;
|
||||||
glScalef(0.8, 0.8, 0.8);
|
glScaled(0.8, 0.8, 0.8);
|
||||||
glTranslatef ( xwin, ywin, 0.0 ) ;
|
glTranslated ( xwin, ywin, 0.0 ) ;
|
||||||
scale_factor *= 1.25 ;
|
scale_factor *= 1.25 ;
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
@ -305,5 +308,11 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
printf ( "Back from the 'freeglut' main loop\n" ) ;
|
printf ( "Back from the 'freeglut' main loop\n" ) ;
|
||||||
|
|
||||||
|
free ( affine ) ;
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
_CrtDumpMemoryLeaks () ; // DUMP MEMORY LEAK INFORMATION
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0; /* ANSI C requires main to return int. */
|
return 0; /* ANSI C requires main to return int. */
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user