From 41218272c447b7f7a93e5df39d620755022f20e2 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 29 Feb 2000 23:31:32 +0000
Subject: [PATCH] Working on skydome ... some actual progress has been made.
 :-)  Still something goofy with sunrise, sunset effects.

---
 simgear/ephemeris/Makefile.am              |  2 +-
 simgear/ephemeris/{sky.cxx => skydome.cxx} | 93 ++++++++++++----------
 simgear/ephemeris/{sky.hxx => skydome.hxx} | 25 +++---
 3 files changed, 63 insertions(+), 57 deletions(-)
 rename simgear/ephemeris/{sky.cxx => skydome.cxx} (90%)
 rename simgear/ephemeris/{sky.hxx => skydome.hxx} (87%)

diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am
index 0d21c976..efca10b8 100644
--- a/simgear/ephemeris/Makefile.am
+++ b/simgear/ephemeris/Makefile.am
@@ -9,7 +9,7 @@ libAstro_a_SOURCES = \
 	neptune.cxx neptune.hxx \
 	pluto.hxx \
 	saturn.cxx saturn.hxx \
-	sky.cxx sky.hxx \
+	skydome.cxx skydome.hxx \
 	solarsystem.cxx solarsystem.hxx \
 	star.cxx star.hxx \
 	stars.cxx stars.hxx \
diff --git a/simgear/ephemeris/sky.cxx b/simgear/ephemeris/skydome.cxx
similarity index 90%
rename from simgear/ephemeris/sky.cxx
rename to simgear/ephemeris/skydome.cxx
index a8d8bca7..f71f98bd 100644
--- a/simgear/ephemeris/sky.cxx
+++ b/simgear/ephemeris/skydome.cxx
@@ -1,8 +1,9 @@
-// sky.cxx -- model sky with an upside down "bowl"
+// skydome.cxx -- model sky with an upside down "bowl"
 //
 // Written by Curtis Olson, started December 1997.
+// SSG-ified by Curtis Olson, February 2000.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997-2000  Curtis L. Olson  - curt@flightgear.org
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -44,7 +45,7 @@
 #include <Time/event.hxx>
 #include <Time/fg_time.hxx>
 
-#include "sky.hxx"
+#include "skydome.hxx"
 
 
 #ifdef __MWERKS__
@@ -68,32 +69,32 @@
 #define BOTTOM_ELEV   -2000.0
 
 
-static float inner_vertex[12][3];
-static float middle_vertex[12][3];
-static float outer_vertex[12][3];
-static float bottom_vertex[12][3];
+// static float inner_vertex[12][3];
+// static float middle_vertex[12][3];
+// static float outer_vertex[12][3];
+// static float bottom_vertex[12][3];
 
-static GLubyte upper_color[12][4];
-static GLubyte middle_color[12][4];
-static GLubyte lower_color[12][4];
+// static GLubyte upper_color[12][4];
+// static GLubyte middle_color[12][4];
+// static GLubyte lower_color[12][4];
 
 
 // Defined the shared sky object here
-FGSky current_sky;
+FGSkyDome current_sky;
 
 
 // Constructor
-FGSky::FGSky( void ) {
+FGSkyDome::FGSkyDome( void ) {
 }
 
 
 // Destructor
-FGSky::~FGSky( void ) {
+FGSkyDome::~FGSkyDome( void ) {
 }
 
 
 // initialize the sky object and connect it into the scene graph
-bool FGSky::initialize( ssgRoot *root ) {
+bool FGSkyDome::initialize( ssgRoot *root ) {
     sgVec3 color;
 
     float theta;
@@ -106,11 +107,12 @@ bool FGSky::initialize( ssgRoot *root ) {
     } else {
 	sky_state->setShadeModel( GL_FLAT );
     }
+    sky_state->disable( GL_LIGHTING );
     sky_state->disable( GL_DEPTH_TEST );
-    sky_state->enable( GL_LIGHTING );
-    sky_state->disable( GL_FOG );
     sky_state->disable( GL_CULL_FACE );
-    sky_state->disable( GL_TEXTURE_2D );
+    sky_state->disable( GL_TEXTURE );
+    sky_state->enable( GL_COLOR_MATERIAL );
+    sky_state->setColourMaterial( GL_AMBIENT_AND_DIFFUSE );
 
     // initialize arrays
     center_disk_vl = new ssgVertexArray( 14 );
@@ -262,7 +264,7 @@ bool FGSky::initialize( ssgRoot *root ) {
 // 0 degrees = high noon
 // 90 degrees = sun rise/set
 // 180 degrees = darkest midnight
-bool FGSky::repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle ) {
+bool FGSkyDome::repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle ) {
     double diff;
     sgVec3 outer_param, outer_amt, outer_diff;
     sgVec3 middle_param, middle_amt, middle_diff;
@@ -302,7 +304,6 @@ bool FGSky::repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle ) {
     // First, recalulate the basic colors
     //
 
-    sgVec3 center_color;
     sgVec3 upper_color[12];
     sgVec3 middle_color[12];
     sgVec3 lower_color[12];
@@ -315,21 +316,19 @@ bool FGSky::repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle ) {
 	    // printf("sky = %.2f  fog = %.2f  diff = %.2f\n", 
 	    //        l->sky_color[j], l->fog_color[j], diff);
 
-	    upper_color[i][j] = (GLubyte)((sky_color[j] - diff * 0.3) * 255);
-	    middle_color[i][j] = (GLubyte)((sky_color[j] - diff * 0.9 
-					   + middle_amt[j]) * 255);
-	    lower_color[i][j] = (GLubyte)((fog_color[j] + outer_amt[j]) 
-					  * 255);
+	    upper_color[i][j] = sky_color[j] - diff * 0.3;
+	    middle_color[i][j] = sky_color[j] - diff * 0.9 + middle_amt[j];
+	    lower_color[i][j] = fog_color[j] + outer_amt[j];
 
-	    if ( upper_color[i][j] > 255 ) { upper_color[i][j] = 255; }
-	    if ( upper_color[i][j] < 25 ) { upper_color[i][j] = 25; }
-	    if ( middle_color[i][j] > 255 ) { middle_color[i][j] = 255; }
-	    if ( middle_color[i][j] < 25 ) { middle_color[i][j] = 25; }
-	    if ( lower_color[i][j] > 255 ) { lower_color[i][j] = 255; }
-	    if ( lower_color[i][j] < 25 ) { lower_color[i][j] = 25; }
+	    if ( upper_color[i][j] > 1.0 ) { upper_color[i][j] = 1.0; }
+	    if ( upper_color[i][j] < 0.1 ) { upper_color[i][j] = 0.1; }
+	    if ( middle_color[i][j] > 1.0 ) { middle_color[i][j] = 1.0; }
+	    if ( middle_color[i][j] < 0.1 ) { middle_color[i][j] = 0.1; }
+	    if ( lower_color[i][j] > 1.0 ) { lower_color[i][j] = 1.0; }
+	    if ( lower_color[i][j] < 0.1 ) { lower_color[i][j] = 0.1; }
 	}
 	// upper_color[i][3] = middle_color[i][3] = lower_color[i][3] = 
-	//                     (GLubyte)(sky_color[3] * 255);
+	//                     (GLubyte)(sky_color[3] * 1.0);
 
 	for ( j = 0; j < 3; j++ ) {
 	    outer_amt[j] -= outer_diff[j];
@@ -358,21 +357,19 @@ bool FGSky::repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle ) {
 	    // printf("sky = %.2f  fog = %.2f  diff = %.2f\n", 
 	    //        sky_color[j], fog_color[j], diff);
 
-	    upper_color[i][j] = (GLubyte)((sky_color[j] - diff * 0.3) * 255);
-	    middle_color[i][j] = (GLubyte)((sky_color[j] - diff * 0.9 
-					    + middle_amt[j]) * 255);
-	    lower_color[i][j] = (GLubyte)((fog_color[j] + outer_amt[j]) 
-					  * 255);
+	    upper_color[i][j] = sky_color[j] - diff * 0.3;
+	    middle_color[i][j] = sky_color[j] - diff * 0.9 + middle_amt[j];
+	    lower_color[i][j] = fog_color[j] + outer_amt[j];
 
-	    if ( upper_color[i][j] > 255 ) { upper_color[i][j] = 255; }
-	    if ( upper_color[i][j] < 25 ) { upper_color[i][j] = 25; }
-	    if ( middle_color[i][j] > 255 ) { middle_color[i][j] = 255; }
-	    if ( middle_color[i][j] < 25 ) { middle_color[i][j] = 25; }
-	    if ( lower_color[i][j] > 255 ) { lower_color[i][j] = 255; }
+	    if ( upper_color[i][j] > 1.0 ) { upper_color[i][j] = 1.0; }
+	    if ( upper_color[i][j] < 0.1 ) { upper_color[i][j] = 0.1; }
+	    if ( middle_color[i][j] > 1.0 ) { middle_color[i][j] = 1.0; }
+	    if ( middle_color[i][j] < 0.1 ) { middle_color[i][j] = 0.1; }
+	    if ( lower_color[i][j] > 1.0 ) { lower_color[i][j] = 1.0; }
 	    if ( lower_color[i][j] < 35 ) { lower_color[i][j] = 35; }
 	}
 	// upper_color[i][3] = middle_color[i][3] = lower_color[i][3] = 
-	//                     (GLubyte)(sky_color[3] * 255);
+	//                     (GLubyte)(sky_color[3] * 1.0);
 
 	for ( j = 0; j < 3; j++ ) {
 	    outer_amt[j] += outer_diff[j];
@@ -405,7 +402,9 @@ bool FGSky::repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle ) {
     // update the center disk color arrays
     counter = 0;
     slot = center_disk_cl->get( counter++ );
-    sgCopyVec3( slot, center_color );
+    // sgVec3 red;
+    // sgSetVec3( red, 1.0, 0.0, 0.0 );
+    sgCopyVec3( slot, sky_color );
     for ( i = 11; i >= 0; i-- ) {
 	slot = center_disk_cl->get( counter++ );
 	sgCopyVec3( slot, upper_color[i] );
@@ -467,7 +466,7 @@ bool FGSky::repaint( sgVec3 sky_color, sgVec3 fog_color, double sun_angle ) {
 // lat specifies a rotation about the new Y axis
 // spin specifies a rotation about the new Z axis (and orients the
 // sunrise/set effects
-bool FGSky::reposition( sgVec3 p, double lon, double lat, double spin ) {
+bool FGSkyDome::reposition( sgVec3 p, double lon, double lat, double spin ) {
     sgMat4 T, LON, LAT, SPIN;
     sgVec3 axis;
 
@@ -510,6 +509,11 @@ bool FGSky::reposition( sgVec3 p, double lon, double lat, double spin ) {
 }
 
 
+#if 0
+
+// depricated code from here to the end 
+
+
 // Calculate the sky structure vertices
 void fgSkyVerticesInit() {
     float theta;
@@ -807,3 +811,4 @@ void fgSkyRender() {
 }
 
 
+#endif
diff --git a/simgear/ephemeris/sky.hxx b/simgear/ephemeris/skydome.hxx
similarity index 87%
rename from simgear/ephemeris/sky.hxx
rename to simgear/ephemeris/skydome.hxx
index 17cf2edb..7d9b159f 100644
--- a/simgear/ephemeris/sky.hxx
+++ b/simgear/ephemeris/skydome.hxx
@@ -1,8 +1,9 @@
-// sky.hxx -- model sky with an upside down "bowl"
+// skydome.hxx -- model sky with an upside down "bowl"
 //
 // Written by Curtis Olson, started December 1997.
+// SSG-ified by Curtis Olson, February 2000.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997-2000  Curtis L. Olson  - curt@flightgear.org
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -21,8 +22,8 @@
 // $Id$
 
 
-#ifndef _SKY_HXX
-#define _SKY_HXX
+#ifndef _SKYDOME_HXX
+#define _SKYDOME_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -33,7 +34,7 @@
 #include <plib/ssg.h>		// plib include
 
 
-class FGSky {
+class FGSkyDome {
 
     ssgSelector *sky_selector;
     ssgTransform *sky_transform;
@@ -54,10 +55,10 @@ class FGSky {
 public:
 
     // Constructor
-    FGSky( void );
+    FGSkyDome( void );
 
     // Destructor
-    ~FGSky( void );
+    ~FGSkyDome( void );
 
     // initialize the sky object and connect it into the scene graph
     // as a kid to to the specified root
@@ -90,19 +91,19 @@ public:
 };
 
 
-extern FGSky current_sky;
+extern FGSkyDome current_sky;
 
 
 // (Re)generate the display list
-void fgSkyInit();
+// void fgSkyInit();
 
 // (Re)calculate the sky colors at each vertex
-void fgSkyColorsInit();
+// void fgSkyColorsInit();
 
 // Draw the Sky
-void fgSkyRender();
+// void fgSkyRender();
 
 
-#endif // _SKY_HXX
+#endif // _SKYDOM_HXX
 
 
-- 
2.39.5