First quick hack at panel shading.

[simgear.git] / simgear / sky / sphere.cxx

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index fc20bee13bf2bc8ff1da135911e6de87a927c7f2..21e25be41ac3e6e5c5f7754e502e28cc4c10af47 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -26,8 +26,12 @@
 #  include <config.h>
 #endif
 
-#include <plib/ssg.h>
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 
+#include <plib/ssg.h>
+#include <simgear/constants.h>
 
 // return a sphere object as an ssgBranch
 ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
@@ -43,26 +47,8 @@ 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 = M_PI / (float) stacks;
-    dtheta = 2.0 * M_PI / (float) slices;
+    drho = FG_PI / (float) stacks;
+    dtheta = 2.0 * FG_PI / (float) slices;
 
     /* texturing: s goes from 0.0/0.25/0.5/0.75/1.0 at +y/+x/-y/-x/+y
        axis t goes from -1.0/+1.0 at z = -radius/+radius (linear along
@@ -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 );