FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working on tweaking lighting.

Browse Source
This commit is contained in:
curt
1997-12-09 05:11:54 +00:00
parent 268a59d0a9
commit 7ea54d28cd
2 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scenery/moon.c
+29 -35
View File
@@ -31,10 +31,10 @@
#include "../Main/views.h" #include "../Main/views.h"
#include "../Time/fg_time.h" #include "../Time/fg_time.h"
struct CelestialCoord struct CelestialCoord moonPos;
moonPos;
float xMoon, yMoon, zMoon; float xMoon, yMoon, zMoon;
GLint moon;
/* /*
static GLfloat vdata[12][3] = static GLfloat vdata[12][3] =
@@ -52,8 +52,6 @@ static GLuint tindices[20][3] =
{6,1,10}, {9,0,11}, {9,11,2}, {9,2,5}, {7,2,11} {6,1,10}, {9,0,11}, {9,11,2}, {9,2,5}, {7,2,11}
};*/ };*/
GLint moon;
/* ------------------------------------------------------------- /* -------------------------------------------------------------
This section contains the code that generates a yellow This section contains the code that generates a yellow
Icosahedron. It's under development... (of Course) Icosahedron. It's under development... (of Course)
@@ -226,57 +224,53 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements params,
} }
void fgMoonInit() void fgMoonInit() {
{
// int i; // int i;
// moon = glGenLists(1); moon = glGenLists(1);
// glNewList(moon, GL_COMPILE ); glNewList(moon, GL_COMPILE );
fgSolarSystemUpdate(&(pltOrbElements[1]), cur_time_params); fgSolarSystemUpdate(&(pltOrbElements[1]), cur_time_params);
moonPos = fgCalculateMoon(pltOrbElements[1], pltOrbElements[0], cur_time_params); moonPos = fgCalculateMoon(pltOrbElements[1], pltOrbElements[0],
#ifdef DEBUG cur_time_params);
printf("Moon found at %f (ra), %f (dec)\n", moonPos.RightAscension, moonPos.Declination); #ifdef DEBUG
#endif printf("Moon found at %f (ra), %f (dec)\n", moonPos.RightAscension,
glColor3f(1.0, 1.0, 0.0); moonPos.Declination);
#endif
/* xMoon = 90000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination); /* xMoon = 90000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination);
yMoon = 90000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination); yMoon = 90000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination);
zMoon = 90000.0 * sin(moonPos.Declination); */ zMoon = 90000.0 * sin(moonPos.Declination); */
xMoon = 60000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination); xMoon = 60000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination);
yMoon = 60000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination); yMoon = 60000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination);
zMoon = 60000.0 * sin(moonPos.Declination); zMoon = 60000.0 * sin(moonPos.Declination);
// glPushMatrix(); glColor3f(1.0, 1.0, 1.0);
// glBegin(GL_TRIANGLES); glutSolidSphere(1.0, 10, 10);
/*
for (i = 0; i < 20; i++)
subdivide(&vdata[tindices[i][0]][0],
&vdata[tindices[i][1]][0],
&vdata[tindices[i][2]][0], 3);*/
// glutSolidSphere(1.0, 25, 25);
// glEnd(); glEndList();
// glPopMatrix();
// glEndList();
} }
/* Draw the moon */ /* Draw the moon */
void fgMoonRender() { void fgMoonRender() {
struct fgLIGHT *l;
GLfloat color[4] = { 1.0, 1.0, 1.0, 1.0 }; GLfloat color[4] = { 1.0, 1.0, 1.0, 1.0 };
l = &cur_light_params;
/* set lighting parameters */ /* set lighting parameters */
glLightfv(GL_LIGHT0, GL_AMBIENT, color ); glLightfv(GL_LIGHT0, GL_AMBIENT, l->scene_clear );
glLightfv(GL_LIGHT0, GL_DIFFUSE, color ); glLightfv(GL_LIGHT0, GL_DIFFUSE, color );
glMaterialfv(GL_FRONT, GL_AMBIENT, fgClearColor);
glMaterialfv(GL_FRONT, GL_DIFFUSE, color);
glPushMatrix(); glPushMatrix();
glTranslatef(xMoon, yMoon, zMoon); glTranslatef(xMoon, yMoon, zMoon);
glScalef(1400, 1400, 1400); glScalef(1400, 1400, 1400);
/* glColor3fv(color); */
/* glutSolidSphere(1.0, 25, 25); */ /* glutSolidSphere(1.0, 25, 25); */
glutSolidSphere(1.0, 15, 15); glCallList(moon);
glPopMatrix(); glPopMatrix();
} }
Scenery/sun.c
+32 -17
View File
@@ -30,8 +30,7 @@
GLint sun; GLint sun;
static struct CelestialCoord static struct CelestialCoord sunPos;
sunPos;
float xSun, ySun, zSun; float xSun, ySun, zSun;
@@ -95,15 +94,20 @@ struct CelestialCoord fgCalculateSun(struct OrbElements params, struct fgTIME t)
void fgSunInit() void fgSunInit()
{ {
// int i; // int i;
// sun = glGenLists(1);
// glNewList(sun, GL_COMPILE ); sun = glGenLists(1);
glNewList(sun, GL_COMPILE );
// glBegin( GL_POINTS ); // glBegin( GL_POINTS );
fgSolarSystemUpdate(&(pltOrbElements[0]), cur_time_params);
sunPos = fgCalculateSun(pltOrbElements[0], cur_time_params); fgSolarSystemUpdate(&(pltOrbElements[0]), cur_time_params);
#ifdef DEBUG sunPos = fgCalculateSun(pltOrbElements[0], cur_time_params);
printf("Sun found at %f (ra), %f (dec)\n", sunPos.RightAscension, sunPos.Declination); #ifdef DEBUG
#endif printf("Sun found at %f (ra), %f (dec)\n", sunPos.RightAscension,
/* give the moon a temporary color, for testing purposes */ sunPos.Declination);
#endif
/* give the moon a temporary color, for testing purposes */
// glColor3f( 0.0, 1.0, 0.0); // glColor3f( 0.0, 1.0, 0.0);
// glVertex3f( 190000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination), // glVertex3f( 190000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination),
// 190000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination), // 190000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination),
@@ -114,6 +118,7 @@ void fgSunInit()
//xMoon = 190000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination); //xMoon = 190000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination);
//yMoon = 190000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination); //yMoon = 190000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination);
//zMoon = 190000.0 * sin(moonPos.Declination); //zMoon = 190000.0 * sin(moonPos.Declination);
xSun = 60000.0 * cos(sunPos.RightAscension) * cos(sunPos.Declination); xSun = 60000.0 * cos(sunPos.RightAscension) * cos(sunPos.Declination);
ySun = 60000.0 * sin(sunPos.RightAscension) * cos(sunPos.Declination); ySun = 60000.0 * sin(sunPos.RightAscension) * cos(sunPos.Declination);
zSun = 60000.0 * sin(sunPos.Declination); zSun = 60000.0 * sin(sunPos.Declination);
@@ -129,8 +134,12 @@ void fgSunInit()
// glutSolidSphere(1.0, 25, 25); // glutSolidSphere(1.0, 25, 25);
// glEnd(); // glEnd();
//glPopMatrix(); //glPopMatrix();
// glEndList();
glColor3f(0.85, 0.65, 0.05);
glutSolidSphere(1.0, 10, 10);
glEndList();
} }
@@ -176,22 +185,28 @@ void fgSunRender() {
glMaterialfv(GL_FRONT, GL_DIFFUSE, diff); */ glMaterialfv(GL_FRONT, GL_DIFFUSE, diff); */
glDisable( GL_LIGHTING ); glDisable( GL_LIGHTING );
glPushMatrix(); glPushMatrix();
glTranslatef(xSun, ySun, zSun); glTranslatef(xSun, ySun, zSun);
glScalef(1400, 1400, 1400); glScalef(1400, 1400, 1400);
glColor3fv( color );
/* glColor3fv( color ); */
/* glutSolidSphere(1.0, 25, 25); */ /* glutSolidSphere(1.0, 25, 25); */
glutSolidSphere(1.0, 10, 10); glCallList(sun);
//glCallList(sun);
glPopMatrix(); glPopMatrix();
glEnable( GL_LIGHTING ); glEnable( GL_LIGHTING );
} }
/* $Log$ /* $Log$
/* Revision 1.2 1997/11/25 19:25:39 curt /* Revision 1.3 1997/12/09 05:11:56 curt
/* Changes to integrate Durk's moon/sun code updates + clean up. /* Working on tweaking lighting.
/* /*
* Revision 1.2 1997/11/25 19:25:39 curt
* Changes to integrate Durk's moon/sun code updates + clean up.
*
* Revision 1.1 1997/10/25 03:16:11 curt * Revision 1.1 1997/10/25 03:16:11 curt
* Initial revision of code contributed by Durk Talsma. * Initial revision of code contributed by Durk Talsma.
* *