X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Astro%2Fmoon.c;h=3b18a4885653abac19fd3f044d28449ac3cae836;hb=20cf326fec07113e0702a7367a162febf0fade88;hp=227743e9302e78fefa371525fde7c3d37f8b549a;hpb=b6b503a1907f942a0c12187c5d5329204c125b23;p=simgear.git

diff --git a/Astro/moon.c b/Astro/moon.c
index 227743e9..3b18a488 100644
--- a/Astro/moon.c
+++ b/Astro/moon.c
@@ -23,129 +23,29 @@
 
 #include <math.h>
 #include <GL/glut.h>
-#include "../XGL/xgl.h"
+#include <XGL/xgl.h>
 
-#include "orbits.h"
-#include "moon.h"
+#include <Astro/orbits.h>
+#include <Astro/moon.h>
 
-#include "../Aircraft/aircraft.h"
-#include "../Include/constants.h"
-#include "../Include/general.h"
-#include "../Main/views.h"
-#include "../Time/fg_time.h"
+#include <Aircraft/aircraft.h>
+#include <Include/fg_constants.h>
+#include <Include/general.h>
+#include <Main/views.h>
+#include <Time/fg_time.h>
+#include <Main/fg_debug.h>
 
 struct CelestialCoord moonPos;
 
 static float xMoon, yMoon, zMoon;
-static GLint moon;
+static GLint moon = 0;
 
-/*
-static GLfloat vdata[12][3] =
-{
-   {-X, 0.0, Z }, { X, 0.0, Z }, {-X, 0.0, -Z}, {X, 0.0, -Z },
-   { 0.0, Z, X }, { 0.0, Z, -X}, {0.0, -Z, -X}, {0.0, -Z, -X},
-   { Z, X, 0.0 }, { -Z, X, 0.0}, {Z, -X, 0.0 }, {-Z, -X, 0.0}
-};
-
-static GLuint tindices[20][3] =
-{
-   {0,4,1}, {0,9,4}, {9,5,4}, {4,5,8}, {4,8,1},
-   {8,10,1}, {8,3,10}, {5,3,8}, {5,2,3}, {2,7,3},
-   {7,10,3}, {7,6,10}, {7,11,6}, {11,0,6}, {0,1,6},
-   {6,1,10}, {9,0,11}, {9,11,2}, {9,2,5}, {7,2,11}
-};*/
-
-/* -------------------------------------------------------------
-      This section contains the code that generates a yellow
-      Icosahedron. It's under development... (of Course)
-______________________________________________________________*/
-/*
-void NormalizeVector(float v[3])
-{
-   GLfloat d = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-   if (d == 0.0)
-   {
-      printf("zero length vector\n");
-      return;
-   }
-   v[0] /= d;
-   v[1] /= d;
-   v[2] /= d;
-}
-
-void drawTriangle(float *v1, float *v2, float *v3)
-{
-   xglBegin(GL_POLYGON);
-   //xglBegin(GL_POINTS);
-      xglNormal3fv(v1);
-      xglVertex3fv(v1);
-      xglNormal3fv(v2);
-      xglVertex3fv(v2);
-      xglNormal3fv(v3);
-      xglVertex3fv(v3);
-   xglEnd();
-}
-
-void subdivide(float *v1, float *v2, float *v3, long depth)
-{
-   GLfloat v12[3], v23[3], v31[3];
-   GLint i;
 
-   if (!depth)
-   {
-     drawTriangle(v1, v2, v3);
-     return;
-   }
-   for (i = 0; i < 3; i++)
-   {
-       v12[i] = (v1[i] + v2[i]);
-       v23[i] = (v2[i] + v3[i]);
-       v31[i] = (v3[i] + v1[i]);
-   }
-   NormalizeVector(v12);
-   NormalizeVector(v23);
-   NormalizeVector(v31);
-   subdivide(v1, v12, v31, depth - 1);
-   subdivide(v2, v23, v12, depth - 1);
-   subdivide(v3, v31, v23, depth - 1);
-   subdivide(v12, v23, v31,depth - 1);
-
-} */
-/*
-void display(void)
-{
-   int i;
-   xglClear(GL_COLOR_BUFFER_BIT);
-   xglPushMatrix();
-   xglRotatef(spin, 0.0, 0.0, 0.0);
-   xglColor3f(1.0, 1.0, 0.0);
-//   xglBegin(GL_LINE_LOOP);
-   for (i = 0; i < 20; i++)
-   {
-
-       //xglVertex3fv(&vdata[tindices[i][0]][0]);
-       //xglVertex3fv(&vdata[tindices[i][1]][0]);
-       //xglVertex3fv(&vdata[tindices[i][2]][0]);
-
-       subdivide(&vdata[tindices[i][0]][0],
-                 &vdata[tindices[i][1]][0],
-                 &vdata[tindices[i][2]][0], 3);
-
-
-   }
-//   xglEnd();
-  // xglFlush();
-  xglPopMatrix();
-  glutSwapBuffers();
-} */
 
 /* --------------------------------------------------------------
-
       This section contains the code that calculates the actual
       position of the moon in the night sky.
-
 ----------------------------------------------------------------*/
-
 struct CelestialCoord fgCalculateMoon(struct OrbElements params,
                                       struct OrbElements sunParams,
                                       struct fgTIME t)
@@ -153,73 +53,78 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements params,
   struct CelestialCoord
     geocCoord, topocCoord; 
   
-  
   double
     eccAnom, ecl, lonecl, latecl, actTime,
     xv, yv, v, r, xh, yh, zh, xg, yg, zg, xe, ye, ze,
     Ls, Lm, D, F, mpar, gclat, rho, HA, g;
   
-  struct fgAIRCRAFT *a;
-  struct fgFLIGHT *f;
+  fgAIRCRAFT *a;
+  fgFLIGHT *f;
 
   a = &current_aircraft;
-  f = &a->flight;
+  f = a->flight;
   
-/* calculate the angle between ecliptic and equatorial coordinate system */
+  /* calculate the angle between ecliptic and equatorial coordinate
+   * system, in Radians */
   actTime = fgCalcActTime(t);
-  ecl = fgDegToRad(23.4393 - 3.563E-7 * actTime);  // in radians of course
+  ecl = ((DEG_TO_RAD * 23.4393) - (DEG_TO_RAD * 3.563E-7) * actTime);
+  /*ecl = 0.409093 - 6.2186E-9 * actTime; */
 							
   /* calculate the eccentric anomaly */
   eccAnom = fgCalcEccAnom(params.M, params.e);
 
-  /* calculate the moon's distance (d) and  true anomaly (v) */
+  /* calculate the moon's distance (r) and  true anomaly (v) */
   xv = params.a * ( cos(eccAnom) - params.e);
   yv = params.a * ( sqrt(1.0 - params.e*params.e) * sin(eccAnom));
   v =atan2(yv, xv);
   r = sqrt(xv*xv + yv*yv);
   
   /* estimate the geocentric rectangular coordinates here */
-  xh = r * (cos(params.N) * cos(v + params.w) - sin(params.N) * sin(v + params.w) * cos(params.i));
-  yh = r * (sin(params.N) * cos(v + params.w) + cos(params.N) * sin(v + params.w) * cos(params.i));
+  xh = r * (cos (params.N) * cos (v + params.w) -
+	    sin (params.N) * sin (v + params.w) * cos (params.i));
+  yh = r * (sin (params.N) * cos (v + params.w) +
+	    cos (params.N) * sin (v + params.w) * cos (params.i));
   zh = r * (sin(v + params.w) * sin(params.i));
   
   /* calculate the ecliptic latitude and longitude here */
   lonecl = atan2( yh, xh);
   latecl = atan2( zh, sqrt( xh*xh + yh*yh));
 
-  /* calculate a number of perturbations */
+  /* calculate a number of perturbations, i.e. disturbances caused by
+   * the gravitational influence of the sun and the other mayor
+   * planets. The largest of these even have their own names */
   Ls = sunParams.M + sunParams.w;
   Lm =    params.M +    params.w + params.N;
   D = Lm - Ls;
   F = Lm - params.N;
   
-  lonecl += fgDegToRad(
-		       - 1.274 * sin (params.M - 2*D)    			// the Evection
-		       + 0.658 * sin (2 * D)							// the Variation
-		       - 0.186 * sin (sunParams.M)					// the yearly variation
-		       - 0.059 * sin (2*params.M - 2*D)
-		       - 0.057 * sin (params.M - 2*D + sunParams.M)
-		       + 0.053 * sin (params.M + 2*D)
-		       + 0.046 * sin (2*D - sunParams.M)
-		       + 0.041 * sin (params.M - sunParams.M)
-		       - 0.035 * sin (D)                             // the Parallactic Equation
-		       - 0.031 * sin (params.M + sunParams.M)
-		       - 0.015 * sin (2*F - 2*D)
-		       + 0.011 * sin (params.M - 4*D)
-		       ); /* Pheeuuwwww */
-  latecl += fgDegToRad(
-		       - 0.173 * sin (F - 2*D)
-		       - 0.055 * sin (params.M - F - 2*D)
-		       - 0.046 * sin (params.M + F - 2*D)
-		       + 0.033 * sin (F + 2*D)
-		       + 0.017 * sin (2 * params.M + F)
-		       );  /* Yep */
-
+  lonecl += DEG_TO_RAD * (
+			  - 1.274 * sin (params.M - 2*D)    			/* the Evection         */
+			  + 0.658 * sin (2 * D)				        /* the Variation        */
+			  - 0.186 * sin (sunParams.M)				/* the yearly variation */
+			  - 0.059 * sin (2*params.M - 2*D)
+			  - 0.057 * sin (params.M - 2*D + sunParams.M)
+			  + 0.053 * sin (params.M + 2*D)
+			  + 0.046 * sin (2*D - sunParams.M)
+			  + 0.041 * sin (params.M - sunParams.M)
+			  - 0.035 * sin (D)                                      /* the Parallactic Equation */
+			  - 0.031 * sin (params.M + sunParams.M)
+			  - 0.015 * sin (2*F - 2*D)
+			  + 0.011 * sin (params.M - 4*D)
+			  );
+  latecl += DEG_TO_RAD * (
+			  - 0.173 * sin (F - 2*D)
+			  - 0.055 * sin (params.M - F - 2*D)
+			  - 0.046 * sin (params.M + F - 2*D)
+			  + 0.033 * sin (F + 2*D)
+			  + 0.017 * sin (2 * params.M + F)
+			  );
+  
   r += (
 	- 0.58 * cos(params.M - 2*D)
 	- 0.46 * cos(2*D)
-	); /* Ok! */
-
+	);
+  
   xg = r * cos(lonecl) * cos(latecl);
   yg = r * sin(lonecl) * cos(latecl);
   zg = r *               sin(latecl);
@@ -237,10 +142,11 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements params,
   /* New since 25 december 1997 */
   /* Calculate the moon's topocentric position instead of it's geocentric! */
 
-  mpar = asin( 1 / r); /* calculate the moon's parrallax, i.e. the apparent size of the
-			  (equatorial) radius of the Earth, as seen from the moon */
-  gclat = FG_Latitude - 0.083358 * sin (2 * fgDegToRad( FG_Latitude));
-  rho = 0.99883 + 0.00167 * cos(2 * fgDegToRad(FG_Latitude));
+  /* calculate the moon's parrallax, i.e. the apparent size of the
+   * (equatorial) radius of the Earth, as seen from the moon */
+  mpar = asin( 1 / r); 
+  gclat = FG_Latitude - 0.083358 * sin (2 * DEG_TO_RAD *  FG_Latitude);
+  rho = 0.99883 + 0.00167 * cos(2 * DEG_TO_RAD * FG_Latitude);
 
   if (geocCoord.RightAscension < 0)
     geocCoord.RightAscension += (2*FG_PI);
@@ -251,79 +157,80 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements params,
 
      
 
-  topocCoord.RightAscension = geocCoord.RightAscension - mpar * rho * cos(gclat) * sin(HA) / cos(geocCoord.Declination);
-  topocCoord.Declination = geocCoord.Declination - mpar * rho * sin(gclat) * sin(g - geocCoord.Declination) / sin(g);
+  topocCoord.RightAscension = geocCoord.RightAscension -
+      mpar * rho * cos (gclat) * sin (HA) / cos (geocCoord.Declination);
+  topocCoord.Declination = geocCoord.Declination -
+      mpar * rho * sin (gclat) * sin (g - geocCoord.Declination) / sin (g);
   return topocCoord;
 }
 
 
 void fgMoonInit( void ) {
-    struct fgLIGHT *l;
-    static int dl_exists = 0;
-
-    printf("Initializing the Moon\n");
+    GLfloat moonColor[4] = {0.85, 0.75, 0.35, 1.0};
+    GLfloat black[4] = { 0.0, 0.0, 0.0, 1.0 };
 
-    l = &cur_light_params;
-
-    /* position the moon */
+    fgPrintf( FG_ASTRO, FG_INFO, "Initializing the Moon\n");
     fgSolarSystemUpdate(&(pltOrbElements[1]), cur_time_params);
     moonPos = fgCalculateMoon(pltOrbElements[1], pltOrbElements[0], 
 			      cur_time_params);
-#ifdef DEBUG
-    printf("Moon found at %f (ra), %f (dec)\n", moonPos.RightAscension, 
-	   moonPos.Declination);
-#endif
+    fgPrintf( FG_ASTRO, FG_DEBUG, 
+	      "Moon found at %f (ra), %f (dec)\n", moonPos.RightAscension, 
+	      moonPos.Declination);
 
     xMoon = 60000.0 * cos(moonPos.RightAscension) * cos(moonPos.Declination);
     yMoon = 60000.0 * sin(moonPos.RightAscension) * cos(moonPos.Declination);
     zMoon = 60000.0 * sin(moonPos.Declination);
 
-    if ( !dl_exists ) {
-	dl_exists = 1;
-
-	/* printf("First time through, creating moon display list\n"); */
-
-	moon = xglGenLists(1);
-	xglNewList(moon, GL_COMPILE );
-
-	/* xglMaterialfv(GL_FRONT, GL_AMBIENT, l->scene_clear);
-	   xglMaterialfv(GL_FRONT, GL_DIFFUSE, moon_color); */
-
-
-	glutSolidSphere(1.0, 10, 10);
-
-	xglEndList();
+    if (moon) {
+ 	xglDeleteLists (moon, 1);
     }
+
+    moon = xglGenLists (1);
+    xglNewList (moon, GL_COMPILE);
+  
+    xglMaterialfv (GL_FRONT, GL_AMBIENT, black);
+    xglMaterialfv (GL_FRONT, GL_DIFFUSE, moonColor);
+    xglPushMatrix ();
+    xglTranslatef (xMoon, yMoon, zMoon);
+    xglScalef (1400, 1400, 1400);
+  
+    glutSolidSphere (1.0, 10, 10);
+    xglPopMatrix ();
+    xglEndList ();
 }
 
 
 /* Draw the moon */
 void fgMoonRender( void ) {
-    struct fgLIGHT *l;
-    GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
-
-    /* printf("Rendering moon\n"); */
-
-    l = &cur_light_params;
-
-    xglMaterialfv(GL_FRONT, GL_AMBIENT, l->sky_color );
-    xglMaterialfv(GL_FRONT, GL_DIFFUSE, white);
-
-    xglPushMatrix();
-    xglTranslatef(xMoon, yMoon, zMoon);
-    xglScalef(1400, 1400, 1400);
-
     xglCallList(moon);
-
-    xglPopMatrix();
 }
 
 
 /* $Log$
-/* Revision 1.2  1998/01/19 18:40:16  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.7  1998/02/23 19:07:54  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/07 15:29:32  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.5  1998/02/02 20:53:21  curt
+ * To version 0.29
+ *
+ * Revision 1.4  1998/01/27 00:47:46  curt
+ * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.3  1998/01/19 19:26:57  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.2  1998/01/19 18:40:16  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.1  1998/01/07 03:16:16  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *