X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Astro%2Fplanets.c;h=552547a8ea30bf98efcd842e1c8141c44d641076;hb=20cf326fec07113e0702a7367a162febf0fade88;hp=71d254f60a45709c16344f4e69575bf97c94e08c;hpb=ccc3af8937ba7e16aa5b8723e8173c3cb541b3a4;p=simgear.git

diff --git a/Astro/planets.c b/Astro/planets.c
index 71d254f6..552547a8 100644
--- a/Astro/planets.c
+++ b/Astro/planets.c
@@ -23,56 +23,57 @@
  **************************************************************************/
 
 
+#ifdef WIN32
+#  include <windows.h>
+#endif
+
+#include <GL/glut.h>
+#include <XGL/xgl.h>
+
 #include <Time/fg_time.h>
 #include <Astro/orbits.h>
 #include <Astro/planets.h>
 #include <Astro/sun.h>
+#include <Include/fg_constants.h>
+#include <Main/fg_debug.h>
 
+GLint planets = 0;
 
 struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
                                         struct OrbElements theSun,
                                         struct fgTIME t, int idx)
 {
-   struct CelestialCoord
-		result;
+    struct CelestialCoord result;
 
-    struct SunPos
-    	SolarPosition;
+    fgSUNPOS SolarPosition;
 
-	double
-        eccAnom, r, v, ecl, actTime, R, s, ir, Nr, B, FV, ring_magn,
+    double eccAnom, r, v, ecl, actTime, R, s, ir, Nr, B, FV, ring_magn,
         xv, yv, xh, yh, zh, xg, yg, zg, xe, ye, ze;
 
-      actTime = fgCalcActTime(t);
-      /* calculate the angle between ecliptic and equatorial coordinate system */
-      ecl = fgDegToRad(23.4393 - 3.563E-7 * actTime);
-
+    actTime = fgCalcActTime(t);
+    /*calculate the angle between ecliptic and equatorial coordinate system */
+    ecl = DEG_TO_RAD * (23.4393 - 3.563E-7 * actTime);
 
     /* calculate the eccentric anomaly */
-	eccAnom  = fgCalcEccAnom(planet.M, planet.e);
+    eccAnom  = fgCalcEccAnom(planet.M, planet.e);
 
     /* calculate the planets distance (r) and true anomaly (v) */
     xv = planet.a * (cos(eccAnom) - planet.e);
     yv = planet.a * (sqrt(1.0 - planet.e*planet.e) * sin(eccAnom));
     v = atan2(yv, xv);
     r = sqrt ( xv*xv + yv*yv);
-
+    
     /* calculate the planets position in 3-dimensional space */
-    xh = r * ( cos(planet.N) * cos(v+planet.w) - sin(planet.N) * sin(v+planet.w) * cos(planet.i));
-    yh = r * ( sin(planet.N) * cos(v+planet.w) + cos(planet.N) * sin(v+planet.w) * cos(planet.i));
+    xh = r * (cos (planet.N) * cos (v + planet.w) -
+ 	      sin (planet.N) * sin (v + planet.w) * cos (planet.i));
+    yh = r * (sin (planet.N) * cos (v + planet.w) +
+ 	      cos (planet.N) * sin (v + planet.w) * cos (planet.i));
     zh = r * ( sin(v+planet.w) * sin(planet.i));
 
-    /* calculate the ecleptic longitude and latitude */
-
-    /*
-    lonecl = atan2(yh, xh);
-    latecl = atan2(zh, sqrt ( xh*xh + yh*yh));
-    */
-    /* calculate the solar position */
+    /* calculate the ecliptic longitude and latitude */
 
-    SolarPosition = fgCalcSunPos(theSun);
-    xg = xh + SolarPosition.xs;
-    yg = yh + SolarPosition.ys;
+    xg = xh + solarPosition.xs;
+    yg = yh + solarPosition.ys;
     zg = zh;
 
     xe = xg;
@@ -81,7 +82,6 @@ struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
 
     result.RightAscension = atan2(ye,xe);
     result.Declination = atan2(ze, sqrt(xe*xe + ye*ye));
-
 	 
     /* Let's calculate the brightness of the planet */
     R = sqrt ( xg*xg + yg*yg + zg*zg);
@@ -107,8 +107,10 @@ struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
 	ir = 0.4897394;
 	Nr = 2.9585076 + 6.6672E-7*actTime;
 	
-	B = asin ( sin (result.Declination) * cos(ir) - cos(result.Declination) * sin (ir) * sin (result.RightAscension - Nr));
-	ring_magn = -2.6 * sin (abs(B)) + 1.2 * pow(sin(B),2);
+	B = asin (sin (result.Declination) * cos (ir) -
+		  cos (result.Declination) * sin (ir) *
+		  sin (result.RightAscension - Nr));
+	ring_magn = -2.6 * sin (fabs(B)) + 1.2 * pow(sin(B),2);
 	result.magnitude = -9.0 + 5*log10( r*R ) + 0.044 * FV + ring_magn;
 	break;
       case 7: /* Uranus */
@@ -118,25 +120,116 @@ struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
 	result.magnitude = -6.90 + 5*log10 (r*R) + 0.001 *FV;
 	break;
       default:
-	printf("index %d out of range !!!!\n", idx);
+	fgPrintf( FG_ASTRO, FG_ALERT, "index %d out of range !!!!\n", idx);
       }
-    printf("    Planet found at %f (ra), %f (dec)\n", 
-	   result.RightAscension, result.Declination);
-    printf("      Geocentric dist     %f\n"
-           "      Heliocentric dist   %f\n"
-	   "      Distance to the sun %f\n"
-	   "      Phase angle         %f\n"
-	   "      Brightness          %f\n", R, r, s, FV, result.magnitude);
+    fgPrintf( FG_ASTRO, FG_DEBUG,
+	      "    Planet found at %f (ra), %f (dec)\n",
+	      result.RightAscension, result.Declination);
+    fgPrintf( FG_ASTRO, FG_DEBUG,
+	      "      Geocentric dist     %f\n"
+	      "      Heliocentric dist   %f\n"
+	      "      Distance to the sun %f\n"
+	      "      Phase angle         %f\n"
+	      "      Brightness          %f\n", R, r, s, FV, result.magnitude);
     return result;
 }
 
 
+void fgPlanetsInit( void )
+{
+  struct fgLIGHT *l;
+  int i;
+  struct CelestialCoord pltPos;
+  double magnitude;
+
+  l = &cur_light_params;
+  /* if the display list was already built during a previous init,
+     then recycle it */
+
+  if (planets) {
+      xglDeleteLists(planets, 1);
+  }
+
+  planets = xglGenLists(1);
+  xglNewList( planets, GL_COMPILE );
+  xglBegin( GL_POINTS );
+
+
+  /* Add the planets to all four display lists */
+  for ( i = 2; i < 9; i++ ) {
+    fgSolarSystemUpdate(&(pltOrbElements[i]), cur_time_params);
+    pltPos = fgCalculatePlanet(pltOrbElements[i], 
+			       pltOrbElements[0], cur_time_params, i);
+    
+    magnitude = (0.0 - pltPos.magnitude) / 5.0 + 1.0;
+    
+    /* scale magnitudes again so they look ok */
+    /* magnitude = 
+       magnitude * 0.7 + (((FG_STAR_LEVELS - 1) - i) * 0.1); */
+
+    /* the following statement could be made a little more sopisticated
+       for the moment: Stick to this one */
+    magnitude = magnitude * 0.7 + (3 * 0.1);
+    if ( magnitude > 1.0 ) { magnitude = 1.0; }
+    if ( magnitude < 0.0 ) { magnitude = 0.0; }
+    
+    /* Add planets to the display list, based on sun_angle and current
+       magnitude It's pretty experimental... */
+
+    if ((double) (l->sun_angle - FG_PI_2) > 
+	((magnitude - 1.0) * -20 * DEG_TO_RAD))
+ 	{
+ 	    xglColor3f (magnitude, magnitude, magnitude);
+ 	    printf ("Sun Angle to Horizon (in Rads) = %f\n", 
+		    (double) (l->sun_angle - FG_PI_2));
+ 	    printf ("Transformed Magnitude is :%f  %f\n", 
+		    magnitude, (magnitude - 1.0) * -20 * DEG_TO_RAD);
+ 
+ 	    xglVertex3f (50000.0 * cos (pltPos.RightAscension) *
+ 			 cos (pltPos.Declination),
+ 			 50000.0 * sin (pltPos.RightAscension) *
+ 			 cos (pltPos.Declination),
+ 			 50000.0 * sin (pltPos.Declination));
+ 	}
+  }
+  xglEnd();
+  xglEndList();
+
+}
+
+
+void fgPlanetsRender( void ) {
+	xglCallList(planets);
+}
+
 
 /* $Log$
-/* Revision 1.2  1998/01/19 19:26:59  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.7  1998/02/23 19:07:55  curt
+/* Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
+/* calculation code between sun display, and other FG sections that use this
+/* for things like lighting.
 /*
+ * Revision 1.6  1998/02/12 21:59:36  curt
+ * Incorporated code changes contributed by Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.5  1998/02/03 23:20:12  curt
+ * Lots of little tweaks to fix various consistency problems discovered by
+ * Solaris' CC.  Fixed a bug in fg_debug.c with how the fgPrintf() wrapper
+ * passed arguments along to the real printf().  Also incorporated HUD changes
+ * by Michele America.
+ *
+ * Revision 1.4  1998/02/02 20:53:23  curt
+ * To version 0.29
+ *
+ * Revision 1.3  1998/01/27 00:47:47  curt
+ * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.2  1998/01/19 19:26:59  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.1  1998/01/07 03:16:18  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *