[Plib-cvs] plib/src/ssgAux ssgaCelestialBody.cxx,1.2,1.3 ssgaSky.cxx,1.2,1.3 ssgaSky.h,1.2,1.3 ssgaSkyDome.cxx,1.1,1.2 ssgaStars.cxx,1.2,1.3

[Steve B. <sj...@us...>]

Update of /cvsroot/plib/plib/src/ssgAux
In directory sc8-pr-cvs1:/tmp/cvs-serv27509/plib/src/ssgAux

Modified Files:
	ssgaCelestialBody.cxx ssgaSky.cxx ssgaSky.h ssgaSkyDome.cxx 
	ssgaStars.cxx 
Log Message:
Replaced 'sun' with 'sol' everywhere it occurs because 'sun' appears to
be a reserved word on Sun Microsystems machines.  This *sucks*.



Index: ssgaCelestialBody.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaCelestialBody.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ssgaCelestialBody.cxx	26 Aug 2003 21:36:04 -0000	1.2
+++ ssgaCelestialBody.cxx	26 Sep 2003 14:54:20 -0000	1.3
@@ -229,7 +229,7 @@
 }
 
 
-bool ssgaCelestialBody::reposition( sgVec3 p, double angle, double rightAscension, double declination, double sun_dist )
+bool ssgaCelestialBody::reposition( sgVec3 p, double angle, double rightAscension, double declination, double sol_dist )
 {
   sgMat4 T1, T2, GST, RA, DEC;
   sgVec3 axis;
@@ -246,7 +246,7 @@
   sgSetVec3( axis, 1.0, 0.0, 0.0 );
   sgMakeRotMat4( DEC, (float)(declination * SGD_RADIANS_TO_DEGREES), axis );
 
-  sgSetVec3( v, 0.0, (float)sun_dist, 0.0 );
+  sgSetVec3( v, 0.0, (float)sol_dist, 0.0 );
   sgMakeTransMat4( T2, v );
 
   sgMat4 TRANSFORM;

Index: ssgaSky.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaSky.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ssgaSky.cxx	26 Aug 2003 21:36:04 -0000	1.2
+++ ssgaSky.cxx	26 Sep 2003 14:54:20 -0000	1.3
@@ -44,7 +44,7 @@
   dome = 0;
   planets = 0;
   stars = 0;
-  sun_ref = 0;
+  sol_ref = 0;
   pre_root = 0;
   post_root = 0;
 
@@ -119,7 +119,7 @@
 
 
[...63 lines suppressed...]
     for ( i = 0; i < bodies.getNum (); i++ )
       bodies.get(i)->repaint();
@@ -245,8 +245,8 @@
     for ( i = 0; i < clouds.getNum (); i++ )
       clouds.get(i)->repaint( cloud_color );
 
-	planets->repaint( sun_angle, nplanets, planet_data );
-	stars->repaint( sun_angle, nstars, star_data );
+	planets->repaint( sol_angle, nplanets, planet_data );
+	stars->repaint( sol_angle, nstars, star_data );
   }
   else {
     // turn off sky
@@ -399,4 +399,4 @@
   } // for
 
   effective_visibility = effvis;
-}
\ No newline at end of file
+}

Index: ssgaSky.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaSky.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ssgaSky.h	26 Aug 2003 21:36:04 -0000	1.2
+++ ssgaSky.h	26 Sep 2003 14:54:20 -0000	1.3
@@ -234,7 +234,7 @@
 
   bool reposition( sgVec3 p, double angle );
 
-  bool repaint( double sun_angle, int num, sgdVec3 *star_data );
+  bool repaint( double sol_angle, int num, sgdVec3 *star_data );
 };
 
 
@@ -267,7 +267,7 @@
   bool repositionFlat( sgVec3 p, double spin );
   bool reposition( sgVec3 p, double lon, double lat, double spin );
 
-  bool repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle, double vis );
+  bool repaint( sgVec3 sky_color, sgVec3 fog_color, double sol_angle, double vis );
 };
 
 
@@ -277,7 +277,7 @@
 
   // components of the sky
   ssgaSkyDome *dome;
-  ssgaCelestialBody* sun_ref;
+  ssgaCelestialBody* sol_ref;
   ssgaCelestialBodyList bodies;
   ssgaCloudLayerList clouds;
   ssgaStars *planets;
@@ -309,8 +309,8 @@
 	  int nplanets, sgdVec3 *planet_data,
 	  int nstars, sgdVec3 *star_data);
 
-  ssgaCelestialBody* addBody( const char *body_tex_path, const char *halo_tex_path, double size, double dist, bool sun = false );
-  ssgaCelestialBody* addBody( ssgSimpleState *orb_state, ssgSimpleState *halo_state, double size, double dist, bool sun = false );
+  ssgaCelestialBody* addBody( const char *body_tex_path, const char *halo_tex_path, double size, double dist, bool sol = false );
+  ssgaCelestialBody* addBody( ssgSimpleState *orb_state, ssgSimpleState *halo_state, double size, double dist, bool sol = false );
   ssgaCelestialBody* getBody(int i) { return bodies.get(i); }
   int getBodyCount() { return bodies.getNum(); }
 
@@ -322,7 +322,7 @@
   bool repositionFlat( sgVec3 view_pos, double spin, double dt );
   bool reposition( sgVec3 view_pos, sgVec3 zero_elev, sgVec3 view_up, double lon, double lat, double alt, double spin, double gst, double dt );
 
-  bool repaint( sgVec4 sky_color, sgVec4 fog_color, sgVec4 cloud_color, double sun_angle,
+  bool repaint( sgVec4 sky_color, sgVec4 fog_color, sgVec4 cloud_color, double sol_angle,
 	  int nplanets, sgdVec3 *planet_data,
 	  int nstars, sgdVec3 *star_data );
 
@@ -394,4 +394,4 @@
   *color = (float)pow(*color, system/reff);
 };
 
-#endif
\ No newline at end of file
+#endif

Index: ssgaSkyDome.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaSkyDome.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ssgaSkyDome.cxx	26 Jul 2003 06:16:19 -0000	1.1
+++ ssgaSkyDome.cxx	26 Sep 2003 14:54:20 -0000	1.2
@@ -317,26 +317,26 @@
 }
 
 
-bool ssgaSkyDome::repaint( sgVec4 sky_color, sgVec4 fog_color, double sun_angle, double vis )
+bool ssgaSkyDome::repaint( sgVec4 sky_color, sgVec4 fog_color, double sol_angle, double vis )
 {
   double diff;
   sgVec3 outer_param, outer_amt, outer_diff;
   sgVec3 middle_param, middle_amt, middle_diff;
   int i, j;
 
-  sun_angle *= SGD_RADIANS_TO_DEGREES;
+  sol_angle *= SGD_RADIANS_TO_DEGREES;
 
   // Check for sunrise/sunset condition
-  if ( (sun_angle > 80.0) ) { // && (sun_angle < 100.0) )
+  if ( (sol_angle > 80.0) ) { // && (sol_angle < 100.0) )
     // 0.0 - 0.4
     sgSetVec3( outer_param,
-      (float)((10.0 - fabs(90.0 - sun_angle)) / 20.0),
-      (float)((10.0 - fabs(90.0 - sun_angle)) / 40.0),
-      (float)(-(10.0 - fabs(90.0 - sun_angle)) / 30.0));
+      (float)((10.0 - fabs(90.0 - sol_angle)) / 20.0),
+      (float)((10.0 - fabs(90.0 - sol_angle)) / 40.0),
+      (float)(-(10.0 - fabs(90.0 - sol_angle)) / 30.0));
 
     sgSetVec3( middle_param,
-      (float)((10.0 - fabs(90.0 - sun_angle)) / 40.0),
-      (float)((10.0 - fabs(90.0 - sun_angle)) / 80.0),
+      (float)((10.0 - fabs(90.0 - sol_angle)) / 40.0),
+      (float)((10.0 - fabs(90.0 - sol_angle)) / 80.0),
       0.0 );
 
     sgScaleVec3( outer_diff, outer_param, 1.0f / 6.0f );

Index: ssgaStars.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaStars.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ssgaStars.cxx	26 Aug 2003 21:36:04 -0000	1.2
+++ ssgaStars.cxx	26 Sep 2003 14:54:20 -0000	1.3
@@ -154,7 +154,7 @@
 }
 
 
-bool ssgaStars::repaint( double sun_angle, int num, sgdVec3 *star_data )
+bool ssgaStars::repaint( double sol_angle, int num, sgdVec3 *star_data )
 {
   double mag, nmag, alpha, factor, cutoff;
   float *color;
@@ -162,38 +162,38 @@
   int phase;
 
   // determine which star structure to draw
-  if ( sun_angle > (0.5 * SGD_PI + 10.0 * SGD_DEGREES_TO_RADIANS ) ) {
+  if ( sol_angle > (0.5 * SGD_PI + 10.0 * SGD_DEGREES_TO_RADIANS ) ) {
     // deep night
     factor = 1.0;
     cutoff = 4.5;
     phase = 0;
   }
-  else if ( sun_angle > (0.5 * SGD_PI + 8.8 * SGD_DEGREES_TO_RADIANS ) ) {
+  else if ( sol_angle > (0.5 * SGD_PI + 8.8 * SGD_DEGREES_TO_RADIANS ) ) {
     factor = 1.0;
     cutoff = 3.8;
     phase = 1;
   }
-  else if ( sun_angle > (0.5 * SGD_PI + 7.5 * SGD_DEGREES_TO_RADIANS ) ) {
+  else if ( sol_angle > (0.5 * SGD_PI + 7.5 * SGD_DEGREES_TO_RADIANS ) ) {
     factor = 0.95;
     cutoff = 3.1;
     phase = 2;
   }
-  else if ( sun_angle > (0.5 * SGD_PI + 7.0 * SGD_DEGREES_TO_RADIANS ) ) {
+  else if ( sol_angle > (0.5 * SGD_PI + 7.0 * SGD_DEGREES_TO_RADIANS ) ) {
     factor = 0.9;
     cutoff = 2.4;
     phase = 3;
   }
-  else if ( sun_angle > (0.5 * SGD_PI + 6.5 * SGD_DEGREES_TO_RADIANS ) ) {
+  else if ( sol_angle > (0.5 * SGD_PI + 6.5 * SGD_DEGREES_TO_RADIANS ) ) {
     factor = 0.85;
     cutoff = 1.8;
     phase = 4;
   }
-  else if ( sun_angle > (0.5 * SGD_PI + 6.0 * SGD_DEGREES_TO_RADIANS ) ) {
+  else if ( sol_angle > (0.5 * SGD_PI + 6.0 * SGD_DEGREES_TO_RADIANS ) ) {
     factor = 0.8;
     cutoff = 1.2;
     phase = 5;
   }
-  else if ( sun_angle > (0.5 * SGD_PI + 5.5 * SGD_DEGREES_TO_RADIANS ) ) {
+  else if ( sol_angle > (0.5 * SGD_PI + 5.5 * SGD_DEGREES_TO_RADIANS ) ) {
     factor = 0.75;
     cutoff = 0.6;
     phase = 6;