[Plib-cvs] plib/src/ssg ssgLoadAC.cxx,1.35,1.36 ssgLoadMDL.cxx,1.54,1.55

[Steve B. <sj...@us...>]

Update of /cvsroot/plib/plib/src/ssg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9553/plib/src/ssg

Modified Files:
	ssgLoadAC.cxx ssgLoadMDL.cxx 
Log Message:
Fixed some MSVC warnings.


Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ssgLoadAC.cxx	1 Dec 2004 08:28:05 -0000	1.35
+++ ssgLoadAC.cxx	15 Jan 2005 20:36:46 -0000	1.36
@@ -57,7 +57,7 @@
 static sgVec2 texrep ;
 static sgVec2 texoff ;
 
-static sgVec2 invalidTexture = { 1e30, } ;
+static sgVec2 invalidTexture = { 1e30f, } ;
 static sgVec3 zero = { 0.0, } ;
 
 static int do_material ( char *s ) ;

Index: ssgLoadMDL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadMDL.cxx,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ssgLoadMDL.cxx	4 Oct 2004 18:33:28 -0000	1.54
+++ ssgLoadMDL.cxx	15 Jan 2005 20:36:46 -0000	1.55
@@ -380,15 +380,15 @@
     int bWrong=FALSE;
     // a lot of debug output follows - sorry!
     sprintf(tsA, "------- %ld %f\n%f, %f, %f\n", 
-              dist, dist/(512.0*32767.0), s_norm[0], s_norm[1], s_norm[2]);
+        dist, ((float)dist)/(512.0f*32767.0f), s_norm[0], s_norm[1], s_norm[2]);
     for(int i = 1; i < numverts; i++)
     {
       ix1 = *ixarr->get( flip ? numverts-i : i);
 //
       SGfloat f = sgScalarProductVec3(s_norm, vertex_array_->get(ix1));
-      sprintf(tsA, "%s%f, ", tsA, (float)f);
-      f = f - dist/(512.0*32767.0);
-      if((f<-0.5) || (f>0.5))
+      sprintf(tsA, "%s%f, ", tsA, f);
+      f = f - ((float)dist)/(512.0f*32767.0f);
+      if((f<-0.5f) || (f>0.5f))
         bWrong = TRUE;
 //
       if ( ix1 >= vertex_array_->getNum() ) {