Added a touch of error checking to the screen dump routine, i.e. don't

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

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index c7eabd0fd7ae1596225f2e0f3550decccb65113c..b67f2cc6389e921db31fdce6950cfaff973569f8 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -5,29 +5,42 @@
 // Original gluSphere code is Copyright (C) 1999-2000  Brian Paul and
 // licensed under the GPL
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
+// Library General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA  02111-1307, USA.
 //
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
+
+#include <plib/sg.h>
 #include <plib/ssg.h>
 
+FG_USING_NAMESPACE(std);
 
 // 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,8 +50,8 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, double radius, int slices,
     sgVec2 vec2;
     sgVec3 vec3;
 
-    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
@@ -67,10 +80,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 +97,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 +111,19 @@ 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 );
+
+       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 );