[Plib-cvs] plib/demos/ttt3d/src cell.cxx,1.3,1.4 gfx.cxx,1.4,1.5 gui.cxx,1.2,1.3 material.cxx,1.3,1.4 ttt3d.cxx,1.4,1.5

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

Update of /cvsroot/plib/plib/demos/ttt3d/src
In directory usw-pr-cvs1:/tmp/cvs-serv12438

Modified Files:
	cell.cxx gfx.cxx gui.cxx material.cxx ttt3d.cxx 
Log Message:
Removing compiler warnings due to implicit type conversions.

Index: cell.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/src/cell.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cell.cxx	18 Aug 2002 00:09:46 -0000	1.3
+++ cell.cxx	30 Aug 2002 14:05:59 -0000	1.4
@@ -48,10 +48,10 @@
 
   sgSetVec3 ( normal [ 0 ], 0, 0, 1 ) ;
 
-  sgSetVec3 ( scoord [ 0 ], -60, -60, -5.6 ) ;
-  sgSetVec3 ( scoord [ 1 ],  60, -60, -5.6 ) ;
-  sgSetVec3 ( scoord [ 2 ],  60,  60, -5.6 ) ;
-  sgSetVec3 ( scoord [ 3 ], -60,  60, -5.6 ) ;
+  sgSetVec3 ( scoord [ 0 ], -60, -60, -5.6f ) ;
+  sgSetVec3 ( scoord [ 1 ],  60, -60, -5.6f ) ;
+  sgSetVec3 ( scoord [ 2 ],  60,  60, -5.6f ) ;
+  sgSetVec3 ( scoord [ 3 ], -60,  60, -5.6f ) ;
 
   ssgVTable *vt1 =  new ssgVTable ( (GLenum) GL_TRIANGLE_FAN,
                                4, scoord,
@@ -242,7 +242,7 @@
 {
   ssgaSphere *OOO = new ssgaSphere ( 300 ) ;
 
-  OOO -> setSize ( 0.7 ) ;
+  OOO -> setSize ( 0.7f ) ;
   OOO -> setKidState ( O_gst ) ;
 
   return OOO ;

Index: gfx.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/src/gfx.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gfx.cxx	18 Aug 2002 00:09:46 -0000	1.4
+++ gfx.cxx	30 Aug 2002 14:05:59 -0000	1.5
@@ -102,9 +102,9 @@
   sgVec4 skycol ;
   sgVec4 white = { 1.0, 1.0, 1.0, 1.0 } ;
 
-  sgSetVec3 ( sunposn, -0.2, -0.5, 0.2 ) ;
+  sgSetVec3 ( sunposn, -0.2f, -0.5f, 0.2f ) ;
 
-  sgSetVec4 ( skycol, 0.4, 0.4, 0.8, 1.0 ) ;
+  sgSetVec4 ( skycol, 0.4f, 0.4f, 0.8f, 1.0f ) ;
 
   ssgGetLight ( 0 ) -> setPosition ( sunposn ) ;
   ssgGetLight ( 0 ) -> setColour ( GL_AMBIENT , white ) ;
@@ -118,7 +118,7 @@
 
   glEnable ( GL_DEPTH_TEST ) ;
 
-  glFogf ( GL_FOG_DENSITY, 3.0 / 100.0f ) ;
+  glFogf ( GL_FOG_DENSITY, 3.0f / 100.0f ) ;
   glFogfv( GL_FOG_COLOR  , skycol ) ;
   glFogf ( GL_FOG_START  , 0.0       ) ;
   glFogi ( GL_FOG_MODE   , GL_EXP    ) ;

Index: gui.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/src/gui.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gui.cxx	18 Aug 2002 00:09:46 -0000	1.2
+++ gui.cxx	30 Aug 2002 14:05:59 -0000	1.3
@@ -128,7 +128,7 @@
   puFont ff ( font, 15 ) ;
   puSetDefaultFonts        ( ff, ff ) ;
   puSetDefaultStyle        ( PUSTYLE_SMALL_SHADED ) ;
-  puSetDefaultColourScheme ( 0.8, 0.8, 0.8, 0.6 ) ;
+  puSetDefaultColourScheme ( 0.8f, 0.8f, 0.8f, 0.6f ) ;
 
   /* Make the menu bar */
 

Index: material.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/src/material.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- material.cxx	18 Aug 2002 00:09:46 -0000	1.3
+++ material.cxx	30 Aug 2002 14:05:59 -0000	1.4
@@ -29,11 +29,11 @@
 static Material gs_setup [] =
 {
   /*    gst          texture_map       clamp, trans,aref,light,frctn,0 */
-  { &default_gst, "",                  FALSE, TRUE , 0.0, FALSE, 1.0, 0 },
-  { & ground_gst, "images/ground.rgb", FALSE, FALSE, 0.2, FALSE, 1.0, 0 },
-  { & ctrls_gst, "images/controls.rgb",FALSE, TRUE , 0.2, FALSE, 1.0, 0 },
-  { &      X_gst, "images/X.rgb"     , FALSE, FALSE, 0.2, TRUE , 1.0, 0 },
-  { &      O_gst, "images/O.rgb"     , FALSE, FALSE, 0.2, TRUE , 1.0, 0 },
+  { &default_gst, "",                  FALSE, TRUE , 0.0f, FALSE, 1.0, 0 },
+  { & ground_gst, "images/ground.rgb", FALSE, FALSE, 0.2f, FALSE, 1.0, 0 },
+  { & ctrls_gst, "images/controls.rgb",FALSE, TRUE , 0.2f, FALSE, 1.0, 0 },
+  { &      X_gst, "images/X.rgb"     , FALSE, FALSE, 0.2f, TRUE , 1.0, 0 },
+  { &      O_gst, "images/O.rgb"     , FALSE, FALSE, 0.2f, TRUE , 1.0, 0 },
   { NULL, "", FALSE, FALSE, 0.0, FALSE, 1.0, 0 }
 } ;
 
@@ -62,7 +62,7 @@
   (*gst) -> disable ( GL_COLOR_MATERIAL ) ;
   (*gst) -> enable ( GL_CULL_FACE      ) ;
   (*gst) -> setColourMaterial ( GL_AMBIENT_AND_DIFFUSE ) ;
-  (*gst) -> setMaterial ( GL_AMBIENT, 0.3, 0.3, 0.3, 1 ) ;
+  (*gst) -> setMaterial ( GL_AMBIENT, 0.3f, 0.3f, 0.3f, 1 ) ;
   (*gst) -> setMaterial ( GL_DIFFUSE, 1, 1, 1, 1 ) ;
   (*gst) -> setMaterial ( GL_EMISSION, 0, 0, 0, 1 ) ;
   (*gst) -> setMaterial ( GL_SPECULAR, 0, 0, 0, 1 ) ;

Index: ttt3d.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/src/ttt3d.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ttt3d.cxx	18 Aug 2002 00:09:46 -0000	1.4
+++ ttt3d.cxx	30 Aug 2002 14:05:59 -0000	1.5
@@ -196,7 +196,7 @@
 
 void zoomIn ()
 {
-  zoom *= 1.1 ;
+  zoom *= 1.1f ;
 
   if ( zoom > 160 ) zoom = 160 ;
 
@@ -207,7 +207,7 @@
 {
   if ( zoom < 6 ) zoom = 6 ;
 
-  zoom /= 1.1 ;
+  zoom /= 1.1f ;
 
   ssgSetFOV ( zoom, zoom * 3.0f/4.0f ) ;
 }