First quick hack at panel shading.

diff --git a/simgear/sky/oursun.cxx b/simgear/sky/oursun.cxx
index 0761fc5056a0523db379474e65c28a2745ad4c54..6b03214bc3a1e2c122f4ffb0a4fada288a64ffb7 100644 (file)
--- a/simgear/sky/oursun.cxx
+++ b/simgear/sky/oursun.cxx
@@ -231,7 +231,6 @@ ssgBranch * SGSun::build( FGPath path, double sun_size ) {
     path.append( "halo.rgba" );
     halo_state = new ssgSimpleState();
     halo_state->setTexture( (char *)path.c_str() );
-    // halo_state->setTexture( sun_texid );
     halo_state->enable( GL_TEXTURE_2D );
     halo_state->disable( GL_LIGHTING );
     halo_state->setShadeModel( GL_SMOOTH );

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index d9732c8e5b08fee990345f70b34d9236fc9a3aba..21e25be41ac3e6e5c5f7754e502e28cc4c10af47 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -26,6 +26,10 @@
 #  include <config.h>
 #endif
 
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
+
 #include <plib/ssg.h>
 #include <simgear/constants.h>
 
@@ -43,24 +47,6 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
     sgVec2 vec2;
     sgVec3 vec3;
 
-    // handle cl whether it is preinitialized or not
-    if ( cl == NULL ) {
-       // create a new array if needed
-       cl = new ssgColourArray( 1 );
-    }
-
-    sgVec4 color;
-    sgSetVec4( color, 1.0, 1.0, 1.0, 1.0 );
-
-    if ( cl->getNum() > 1 ) {
-       cl->removeAll();
-       cl->add( color );
-    } else if ( cl->getNum() == 0 ) {
-       cl->add( color );
-    } else {
-       // accept value as given to us in
-    }
-
     drho = FG_PI / (float) stacks;
     dtheta = 2.0 * FG_PI / (float) slices;
 
@@ -123,6 +109,15 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
 
        ssgLeaf *slice = 
            new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, cl );
+
+       if ( vl->getNum() != nl->getNum() ) {
+           cout << "bad sphere1\n";
+           exit(-1);
+       }
+       if ( vl->getNum() != tl->getNum() ) {
+           cout << "bad sphere2\n";
+           exit(-1);
+       }
        slice->setState( state );
        slice->setCallback( SSG_CALLBACK_PREDRAW, predraw );
        slice->setCallback( SSG_CALLBACK_POSTDRAW, postdraw );