From 114d08ebd02c9c32164daa26cef28f8db94a9a80 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 29 Aug 1997 17:55:27 +0000 Subject: [PATCH] Worked on properly aligning the stars. --- Scenery/scenery.c | 9 ++++++--- Scenery/stars.c | 28 ++++++++++++++++++++++------ Scenery/stars.h | 17 ++++++----------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/Scenery/scenery.c b/Scenery/scenery.c index 28cbdbdb7..d1a4c38c7 100644 --- a/Scenery/scenery.c +++ b/Scenery/scenery.c @@ -50,7 +50,7 @@ struct SCENERY scenery; /* Initialize the Scenery Management system */ void fgSceneryInit() { /* set the default terrain detail level */ - scenery.terrain_skip = 2; + scenery.terrain_skip = 6; } @@ -88,9 +88,12 @@ void fgSceneryRender() { /* $Log$ -/* Revision 1.16 1997/08/27 21:32:29 curt -/* Restructured view calculation code. Added stars. +/* Revision 1.17 1997/08/29 17:55:27 curt +/* Worked on properly aligning the stars. /* + * Revision 1.16 1997/08/27 21:32:29 curt + * Restructured view calculation code. Added stars. + * * Revision 1.15 1997/08/27 03:30:32 curt * Changed naming scheme of basic shared structures. * diff --git a/Scenery/stars.c b/Scenery/stars.c index b001c0d6c..af868804e 100644 --- a/Scenery/stars.c +++ b/Scenery/stars.c @@ -31,14 +31,21 @@ #include #include #include +#include #include #include "stars.h" +#include "../constants.h" #include "../general.h" #include "../GLUT/views.h" +#include "../Aircraft/aircraft.h" + + +#define EpochStart (631065600) +#define DaysSinceEpoch(secs) (((secs)-EpochStart)*(1.0/(24*3600))) static GLint stars; @@ -97,7 +104,7 @@ void fgStarsInit() { count++; magnitude = magnitude * 0.8 + 0.2; mag[0] = mag[1] = mag[2] = magnitude; - glColor3f( magnitude, magnitude, magnitude ); + glColor3f( mag[0], mag[1], mag[2] ); glVertex3f( 190000.0 * sin(right_ascension) * cos(declination), 190000.0 * cos(right_ascension) * cos(declination), 190000.0 * sin(declination) ); @@ -113,9 +120,11 @@ void fgStarsInit() { /* Draw the Stars */ void fgStarsRender() { + struct FLIGHT *f; struct VIEW *v; - GLfloat amb[3], diff[3]; + double angle; + f = ¤t_aircraft.flight; v = ¤t_view; printf("RENDERING STARS\n"); @@ -130,7 +139,11 @@ void fgStarsRender() { glLightfv(GL_LIGHT0, GL_AMBIENT, amb ); glLightfv(GL_LIGHT0, GL_DIFFUSE, diff ); */ - glTranslatef(v->view_pos.x, v->view_pos.y, v->view_pos.z); + glTranslatef( v->view_pos.x, v->view_pos.y, v->view_pos.z ); + + angle = FG_2PI * fmod(DaysSinceEpoch(time(NULL)), 1.0); + glRotatef( -angle * RAD_TO_DEG, 0.0, 0.0, 1.0 ); + printf("Rotating stars by %.2f\n", -angle * RAD_TO_DEG); glCallList(stars); @@ -141,10 +154,13 @@ void fgStarsRender() { /* $Log$ -/* Revision 1.2 1997/08/27 21:32:30 curt -/* Restructured view calculation code. Added stars. +/* Revision 1.3 1997/08/29 17:55:28 curt +/* Worked on properly aligning the stars. /* + * Revision 1.2 1997/08/27 21:32:30 curt + * Restructured view calculation code. Added stars. + * * Revision 1.1 1997/08/27 03:34:48 curt - * Initial revisio. + * Initial revision. * */ diff --git a/Scenery/stars.h b/Scenery/stars.h index ee331fec0..9e8e2d1f0 100644 --- a/Scenery/stars.h +++ b/Scenery/stars.h @@ -31,14 +31,6 @@ #define FG_MAX_STARS 1000 -/* Define a structure containing star information */ -/* struct STAR { - double right_ascension; - double declination; - double magnitude; -}; */ - - /* Initialize the Star Management Subsystem */ void fgStarsInit(); @@ -50,10 +42,13 @@ void fgStarsRender(); /* $Log$ -/* Revision 1.2 1997/08/27 21:32:30 curt -/* Restructured view calculation code. Added stars. +/* Revision 1.3 1997/08/29 17:55:28 curt +/* Worked on properly aligning the stars. /* + * Revision 1.2 1997/08/27 21:32:30 curt + * Restructured view calculation code. Added stars. + * * Revision 1.1 1997/08/27 03:34:50 curt - * Initial revisio. + * Initial revision. * */ -- 2.39.2