Oops, a couple more sky tweaks.

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

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index 17248992860e687e2fc7939d39e447b45d3cdbcd..88cbf9b79e7708c938df0698903e78315f206e63 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -22,12 +22,22 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
+
+#include <plib/sg.h>
 #include <plib/ssg.h>
 
 
 // return a sphere object as an ssgBranch
 ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
-                         double radius, int slices, int stacks )
+                         double radius, int slices, int stacks,
+                         ssgCallback predraw, ssgCallback postdraw )
 {
     float rho, drho, theta, dtheta;
     float x, y, z;
@@ -38,26 +48,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 = SG_PI / (float) stacks;
+    dtheta = 2.0 * SG_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
@@ -118,7 +110,18 @@ 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 );
 
        sphere->addKid( slice );