fly/flightgear
1
0
Fork 0
Code Activity

Eliminated glScale call so that glutSolidSphere normals are preserved

Browse source 
correctly.  Also made the sun & moon a bit smaller.
This commit is contained in:
curt 1998-07-30 23:43:30 +00:00
parent 05e3836b52
commit dbf002ddc0
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Astro/moon.cxx
View file

@ -175,9 +175,6 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements params,
void fgMoonInit( void ) { void fgMoonInit( void ) {
GLfloat moonColor[4] = {0.85, 0.75, 0.35, 1.0};
GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
fgPrintf( FG_ASTRO, FG_INFO, "Initializing the Moon\n"); fgPrintf( FG_ASTRO, FG_INFO, "Initializing the Moon\n");
fgSolarSystemUpdate(&(pltOrbElements[1]), cur_time_params); fgSolarSystemUpdate(&(pltOrbElements[1]), cur_time_params);
moonPos = fgCalculateMoon(pltOrbElements[1], pltOrbElements[0], moonPos = fgCalculateMoon(pltOrbElements[1], pltOrbElements[0],
@ -197,13 +194,12 @@ void fgMoonInit( void ) {
moon = xglGenLists (1); moon = xglGenLists (1);
xglNewList (moon, GL_COMPILE); xglNewList (moon, GL_COMPILE);
xglMaterialfv (GL_FRONT, GL_AMBIENT, black);
xglMaterialfv (GL_FRONT, GL_DIFFUSE, moonColor);
xglPushMatrix (); xglPushMatrix ();
xglTranslatef (xMoon, yMoon, zMoon); xglTranslatef (xMoon, yMoon, zMoon);
xglScalef (1400, 1400, 1400); // xglScalef (1400, 1400, 1400);
glutSolidSphere (1.0, 10, 10); // glutSolidSphere (1.0, 10, 10);
glutSolidSphere (1200.0, 10, 10);
xglPopMatrix (); xglPopMatrix ();
xglEndList (); xglEndList ();
} }
@ -211,14 +207,24 @@ void fgMoonInit( void ) {
/* Draw the moon */ /* Draw the moon */
void fgMoonRender( void ) { void fgMoonRender( void ) {
GLfloat moonColor[4] = {0.85, 0.75, 0.35, 1.0};
GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
xglMaterialfv (GL_FRONT, GL_AMBIENT, black);
xglMaterialfv (GL_FRONT, GL_DIFFUSE, moonColor);
xglCallList(moon); xglCallList(moon);
} }
/* $Log$ /* $Log$
/* Revision 1.4 1998/04/28 01:18:59 curt /* Revision 1.5 1998/07/30 23:43:30 curt
/* Type-ified fgTIME and fgVIEW /* Eliminated glScale call so that glutSolidSphere normals are preserved
/* correctly. Also made the sun & moon a bit smaller.
/* /*
* Revision 1.4 1998/04/28 01:18:59 curt
* Type-ified fgTIME and fgVIEW
*
* Revision 1.3 1998/04/25 22:06:24 curt * Revision 1.3 1998/04/25 22:06:24 curt
* Edited cvs log messages in source files ... bad bad bad! * Edited cvs log messages in source files ... bad bad bad!
* *

11
Astro/sun.cxx
View file

@ -177,9 +177,8 @@ void fgSunInit( void ) {
xglPushMatrix(); xglPushMatrix();
xglTranslatef(xSun, ySun, zSun); xglTranslatef(xSun, ySun, zSun);
xglScalef(1400, 1400, 1400);
xglColor3f(amb[0], amb[1], amb[2]); xglColor3f(amb[0], amb[1], amb[2]);
glutSolidSphere(1.0, 10, 10); glutSolidSphere(1200.0, 10, 10);
xglPopMatrix(); xglPopMatrix();
xglEndList(); xglEndList();
} }
@ -192,9 +191,13 @@ void fgSunRender( void ) {
/* $Log$ /* $Log$
/* Revision 1.5 1998/04/28 01:19:04 curt /* Revision 1.6 1998/07/30 23:43:31 curt
/* Type-ified fgTIME and fgVIEW /* Eliminated glScale call so that glutSolidSphere normals are preserved
/* correctly. Also made the sun & moon a bit smaller.
/* /*
* Revision 1.5 1998/04/28 01:19:04 curt
* Type-ified fgTIME and fgVIEW
*
* Revision 1.4 1998/04/26 05:10:02 curt * Revision 1.4 1998/04/26 05:10:02 curt
* "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd. * "struct fgLIGHT" -> "fgLIGHT" because fgLIGHT is typedef'd.
* *