[Plib-cvs] plib/src/ssgAux ssgaFire.cxx,1.3,1.4 ssgaLensFlare.cxx,1.2,1.3 ssgaWaveSystem.cxx,1.8,1.9

[Wolfram K. <wol...@us...>]

Update of /cvsroot/plib/plib/src/ssgAux
In directory usw-pr-cvs1:/tmp/cvs-serv19312

Modified Files:
	ssgaFire.cxx ssgaLensFlare.cxx ssgaWaveSystem.cxx 
Log Message:
Removing compiler warning due to implicit type conversion.

Index: ssgaFire.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaFire.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ssgaFire.cxx	28 Aug 2002 17:35:39 -0000	1.3
+++ ssgaFire.cxx	30 Aug 2002 12:51:21 -0000	1.4
@@ -43,7 +43,7 @@
     if ( sizeTable [ i ] >= 1.5 ) sizeTable [ i ] = 1.5 ;
 
     sgScaleVec3 ( & colourTable [   i  * 4 ],
-		  & colourTable [ (i-1)* 4 ], 0.90 ) ;
+		  & colourTable [ (i-1)* 4 ], 0.90f ) ;
 
     colourTable [ i * 4 + 3 ] = 1.0f ;
   }
@@ -53,7 +53,7 @@
 void ssgaFire::createParticle ( int idx, ssgaParticle *p )
 {
   float xx = (float)(rand()%1000)/500.0f * radius - radius ;
-  float yy = sqrt ( radius * radius - xx * xx ) ;
+  float yy = (float)sqrt ( radius * radius - xx * xx ) ;
 
   yy = (float)(rand()%1000)/500.0f * yy - yy ;
 

Index: ssgaLensFlare.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaLensFlare.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ssgaLensFlare.cxx	24 Aug 2002 17:49:12 -0000	1.2
+++ ssgaLensFlare.cxx	30 Aug 2002 12:51:21 -0000	1.3
@@ -93,12 +93,12 @@
 
 static float flareTexCoords [ 6 ][ 4 ][ 2 ] =
 {
-  { { 0.00, 0.50 }, { 0.25, 0.50 }, { 0.25, 1.00 }, { 0.00, 1.00 } },
-  { { 0.25, 0.50 }, { 0.50, 0.50 }, { 0.50, 1.00 }, { 0.25, 1.00 } },
-  { { 0.27, 0.70 }, { 0.48, 0.70 }, { 0.48, 0.80 }, { 0.27, 0.80 } },
-  { { 0.50, 0.50 }, { 0.75, 0.50 }, { 0.75, 1.00 }, { 0.50, 1.00 } },
-  { { 0.75, 0.50 }, { 1.00, 0.50 }, { 1.00, 1.00 }, { 0.75, 1.00 } },
-  { { 0.75, 0.00 }, { 1.00, 0.00 }, { 1.00, 0.50 }, { 0.75, 0.50 } }
+  { { 0.00f, 0.50f }, { 0.25f, 0.50f }, { 0.25f, 1.00f }, { 0.00f, 1.00f } },
+  { { 0.25f, 0.50f }, { 0.50f, 0.50f }, { 0.50f, 1.00f }, { 0.25f, 1.00f } },
+  { { 0.27f, 0.70f }, { 0.48f, 0.70f }, { 0.48f, 0.80f }, { 0.27f, 0.80f } },
+  { { 0.50f, 0.50f }, { 0.75f, 0.50f }, { 0.75f, 1.00f }, { 0.50f, 1.00f } },
+  { { 0.75f, 0.50f }, { 1.00f, 0.50f }, { 1.00f, 1.00f }, { 0.75f, 1.00f } },
+  { { 0.75f, 0.00f }, { 1.00f, 0.00f }, { 1.00f, 0.50f }, { 0.75f, 0.50f } }
 } ;
 
 
@@ -213,9 +213,9 @@
 
 #ifndef CONTINUOUS_DISPLAY_SURFACE
   vt -> getBSphere () -> setCenter ( 0, 0, 0 ) ;
-  vt -> getBSphere () -> setRadius ( 0.1 ) ;
+  vt -> getBSphere () -> setRadius ( 0.1f ) ;
         getBSphere () -> setCenter ( 0, 0, 0 ) ;
-        getBSphere () -> setRadius ( 0.1 ) ;
+        getBSphere () -> setRadius ( 0.1f ) ;
 #else
   vt -> recalcBSphere () ;
 	recalcBSphere () ;

Index: ssgaWaveSystem.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssgAux/ssgaWaveSystem.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ssgaWaveSystem.cxx	11 Aug 2002 19:23:48 -0000	1.8
+++ ssgaWaveSystem.cxx	30 Aug 2002 12:51:21 -0000	1.9
@@ -54,9 +54,9 @@
     {
       adjSpeed   [num_trains] = train [ i ] -> getSpeed () * G *
                                                       tim / windSpeed ;
-      sinHeading [num_trains] = -sin ( train[i]->getHeading () *
+      sinHeading [num_trains] = (float) -sin ( train[i]->getHeading () *
                                                       SG_DEGREES_TO_RADIANS ) ;
-      cosHeading [num_trains] =  cos ( train[i]->getHeading () *
+      cosHeading [num_trains] = (float) cos ( train[i]->getHeading () *
                                                       SG_DEGREES_TO_RADIANS ) ;
       length     [num_trains] = train [ i ] -> getLength     () ;
       lambda     [num_trains] = train [ i ] -> getLambda     () ;