Added gdbm to SimGear. Many systems will already have gdbm installed so

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

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index c7eabd0fd7ae1596225f2e0f3550decccb65113c..d43cbc8536f0ecbb094b49e9c1a65a4b67efd504 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -26,8 +26,10 @@
 
 
 // return a sphere object as an ssgBranch
-ssgBranch *ssgMakeSphere( ssgSimpleState *state, double radius, int slices,
-                         int stacks ) {
+ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
+                         double radius, int slices, int stacks,
+                         ssgCallback predraw, ssgCallback postdraw )
+{
     float rho, drho, theta, dtheta;
     float x, y, z;
     float s, t, ds, dt;
@@ -37,6 +39,24 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, double radius, int slices,
     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;
 
@@ -67,10 +87,11 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, double radius, int slices,
 
            // glNormal3f( x*nsign, y*nsign, z*nsign );
            sgSetVec3( vec3, x*nsign, y*nsign, z*nsign );
+           sgNormalizeVec3( vec3 );
            nl->add( vec3 );
 
            // glTexCoord2f(s,t);
-           sgSetVec2( vec2, 2, t );
+           sgSetVec2( vec2, s, t );
            tl->add( vec2 );
 
            // glVertex3f( x*radius, y*radius, z*radius );
@@ -83,6 +104,7 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, double radius, int slices,
 
            // glNormal3f( x*nsign, y*nsign, z*nsign );
            sgSetVec3( vec3, x*nsign, y*nsign, z*nsign );
+           sgNormalizeVec3( vec3 );
            nl->add( vec3 );
 
            // glTexCoord2f(s,t-dt);
@@ -96,8 +118,10 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, double radius, int slices,
        }
 
        ssgLeaf *slice = 
-           new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, NULL );
+           new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, cl );
        slice->setState( state );
+       slice->setCallback( SSG_CALLBACK_PREDRAW, predraw );
+       slice->setCallback( SSG_CALLBACK_POSTDRAW, postdraw );
 
        sphere->addKid( slice );