Complete overhaul of the sky/sun/moon/stars/planets. It is now an ssg

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

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index c4f1d7afb20b77d02b44c11a9d52d1d769379a71..d43cbc8536f0ecbb094b49e9c1a65a4b67efd504 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -27,7 +27,8 @@
 
 // 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;
@@ -44,8 +45,8 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
        cl = new ssgColourArray( 1 );
     }
 
-    sgVec3 color;
-    sgSetVec3( color, 1.0, 1.0, 1.0 );
+    sgVec4 color;
+    sgSetVec4( color, 1.0, 1.0, 1.0, 1.0 );
 
     if ( cl->getNum() > 1 ) {
        cl->removeAll();
@@ -86,10 +87,11 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
 
            // 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 );
@@ -102,6 +104,7 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
 
            // glNormal3f( x*nsign, y*nsign, z*nsign );
            sgSetVec3( vec3, x*nsign, y*nsign, z*nsign );
+           sgNormalizeVec3( vec3 );
            nl->add( vec3 );
 
            // glTexCoord2f(s,t-dt);
@@ -117,6 +120,8 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
        ssgLeaf *slice = 
            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 );