Clean up several stray warnings that have accumulated.

diff --git a/simgear/math/fastmath.cxx b/simgear/math/fastmath.cxx
index 19968109b5532e0be7aa6aecea759ecbd25688a4..51973cae96c287a776744a6486c267f91c82164a 100644 (file)
--- a/simgear/math/fastmath.cxx
+++ b/simgear/math/fastmath.cxx
@@ -41,7 +41,7 @@ double fast_exp(double val) {
     const double a = 1048576/M_LN2;
     const double b_c = 1072632447; /* 1072693248 - 60801 */
 
-    _eco.n.i = a*val + b_c;
+    _eco.n.i = (int)(a*val + b_c);
 
     return _eco.d;
 }

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 565b1f429c6fafb95d3efae224e9dd731b86a099..7b25faeb23fe538be5e7ef3bd61e48b84a1f3d78 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -90,7 +90,7 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
 {
                                // Gather the path(s) to the texture(s)
   vector<SGPropertyNode_ptr> textures = props->getChildren("texture");
-  for (int i = 0; i < textures.size(); i++)
+  for (unsigned int i = 0; i < textures.size(); i++)
   {
     string tname = textures[i]->getStringValue();
     if (tname == "") {
@@ -227,7 +227,7 @@ SGMaterial::build_ssg_state( bool defer_tex_load )
 {
     GLenum shade_model = GL_SMOOTH;
     
-    for (int i = 0; i < _status.size(); i++)
+    for (unsigned int i = 0; i < _status.size(); i++)
     {
         ssgSimpleState *state = new ssgSimpleState();
         state->ref();

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index 5f14a3065f45aafa53bb49e002b0f4ce5fbf15f6..fd519415ed6ac75716eb4848dc7a7c7feef1b7ee 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -217,7 +217,7 @@ private:
   vector<_internal_state> _status;
 
   // Round-robin counter
-  int _current_ptr;
+  unsigned int _current_ptr;
 
   // texture size
   double xsize, ysize;

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 2165153d584d1c9ba625ab1a191fdd2678ada42f..22309400ad5302d69a4312c20a858b5890b61b92 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -174,56 +174,6 @@ static int gen_taxiway_dir_light_map( int r, int g, int b, int alpha ) {
 }
 
 
-// generate the directional vasi light environment texture map
-static int gen_vasi_light_map_old() {
-    const int env_tex_res = 256;
-    int half_res = env_tex_res / 2;
-
-    static unsigned char env_map[env_tex_res][env_tex_res][4];
-    GLuint tex_name;
-
-    for ( int i = 0; i < env_tex_res; ++i ) {
-        for ( int j = 0; j < env_tex_res; ++j ) {
-            double x = (i - half_res) / (double)half_res;
-            double y = (j - half_res) / (double)half_res;
-            double dist = sqrt(x*x + y*y);
-            if ( dist > 1.0 ) { dist = 1.0; }
-            double bright = cos( dist * SGD_PI_2 );
-
-            // top half white, bottom half red
-            env_map[i][j][0] = 255;
-            if ( i > half_res ) {
-                // white
-                env_map[i][j][1] = 255;
-                env_map[i][j][2] = 255;
-            } else if ( i == half_res - 1 || i == half_res ) {
-                // pink
-                env_map[i][j][1] = 127;
-                env_map[i][j][2] = 127;
-            } else {
-                // red
-                env_map[i][j][1] = 0;
-                env_map[i][j][2] = 0;
-            }
-            env_map[i][j][3] = (int)(bright * 255);
-        }
-    }
-
-    glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
-    glGenTextures( 1, &tex_name );
-    glBindTexture( GL_TEXTURE_2D, tex_name );
-  
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, env_tex_res, env_tex_res, 0,
-                  GL_RGBA, GL_UNSIGNED_BYTE, env_map);
-
-    return tex_name;
-}
-
-
 // Load a library of material properties
 bool SGMaterialLib::load( const string &fg_root, const string& mpath ) {
 

diff --git a/simgear/scene/model/animation.cxx b/simgear/scene/model/animation.cxx
index ce6870861af67379c66d01ffd74f774250203678..ac305760289689e026d0026e0e6dedbba9b7bcf7 100644 (file)
--- a/simgear/scene/model/animation.cxx
+++ b/simgear/scene/model/animation.cxx
@@ -498,14 +498,14 @@ SGBlendAnimation::SGBlendAnimation( SGPropertyNode *prop_root,
                                         SGPropertyNode_ptr props )
   : SGAnimation(props, new ssgTransform),
     _prop((SGPropertyNode *)prop_root->getNode(props->getStringValue("property", "/null"), true)),
+    _table(read_interpolation_table(props)),
+    _prev_value(1.0),
     _offset(props->getDoubleValue("offset", 0.0)),
     _factor(props->getDoubleValue("factor", 1.0)),
-    _table(read_interpolation_table(props)),
     _has_min(props->hasValue("min")),
     _min(props->getDoubleValue("min", 0.0)),
     _has_max(props->hasValue("max")),
-    _max(props->getDoubleValue("max", 1.0)),
-    _prev_value(1.0)
+    _max(props->getDoubleValue("max", 1.0))
 {
 }
 

diff --git a/simgear/scene/sky/oursun.cxx b/simgear/scene/sky/oursun.cxx
index 11c7f8940bd094bfbaf78ef1a056e17b53ad0883..10c6129a46f02db28b4a1bf1472a372b01fc8b0c 100644 (file)
--- a/simgear/scene/sky/oursun.cxx
+++ b/simgear/scene/sky/oursun.cxx
@@ -49,6 +49,8 @@
 #include "sphere.hxx"
 #include "oursun.hxx"
 
+static double sun_exp2_punch_through;
+
 // Set up sun rendering call backs
 static int sgSunOrbPreDraw( ssgEntity *e ) {
     /* cout << endl << "Sun orb pre draw" << endl << "----------------" 

diff --git a/simgear/scene/sky/oursun.hxx b/simgear/scene/sky/oursun.hxx
index 981c54410f9ab6c48a4e4c3d512d032d87a428c4..3c33fd73405f6e62076f34d14b447f8ffa01026d 100644 (file)
--- a/simgear/scene/sky/oursun.hxx
+++ b/simgear/scene/sky/oursun.hxx
@@ -34,8 +34,6 @@
 
 #include <simgear/misc/sg_path.hxx>
 
-static double sun_exp2_punch_through;
-
 class SGSun {
 
     ssgTransform *sun_transform;