MSVC5 portability changes contributed by Bruce Finney.

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

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index 285c38f09ba406bed3ef6be0d63834044d057243..d9732c8e5b08fee990345f70b34d9236fc9a3aba 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -22,11 +22,18 @@
 // $Id$
 
 
-#include <plib/ssg.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
+#include <plib/ssg.h>
+#include <simgear/constants.h>
 
 // return a sphere object as an ssgBranch
-ssgBranch *ssgMakeSphere( 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;
@@ -36,8 +43,26 @@ ssgBranch *ssgMakeSphere( double radius, int slices, int stacks ) {
     sgVec2 vec2;
     sgVec3 vec3;
 
-    drho = M_PI / (float) stacks;
-    dtheta = 2.0 * M_PI / (float) slices;
+    // 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;
 
     /* 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
@@ -66,10 +91,11 @@ ssgBranch *ssgMakeSphere( double radius, int slices, int stacks ) {
 
            // 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 );
@@ -82,6 +108,7 @@ ssgBranch *ssgMakeSphere( double radius, int slices, int stacks ) {
 
            // glNormal3f( x*nsign, y*nsign, z*nsign );
            sgSetVec3( vec3, x*nsign, y*nsign, z*nsign );
+           sgNormalizeVec3( vec3 );
            nl->add( vec3 );
 
            // glTexCoord2f(s,t-dt);
@@ -95,7 +122,10 @@ ssgBranch *ssgMakeSphere( double radius, int slices, int stacks ) {
        }
 
        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 );