[Plib-cvs] plib/demos/p-guide/src pGuide.cxx,1.8,1.9 PropertiesWindow.cxx,1.4,1.5 StatusWindow.cxx,1
Brought to you by:
sjbaker
From: Wolfram K. <wol...@us...> - 2002-08-30 14:01:46
|
Update of /cvsroot/plib/plib/demos/p-guide/src In directory usw-pr-cvs1:/tmp/cvs-serv10280 Modified Files: pGuide.cxx PropertiesWindow.cxx StatusWindow.cxx WidgetWindow.cxx Log Message: Removing compiler warnings due to implicit type conversions. Index: pGuide.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/pGuide.cxx,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- pGuide.cxx 18 Aug 2002 01:05:58 -0000 1.8 +++ pGuide.cxx 30 Aug 2002 14:00:17 -0000 1.9 @@ -893,7 +893,7 @@ #endif puSetDefaultStyle ( PUSTYLE_SMALL_SHADED ) ; - puSetDefaultColourScheme ( 0.8, 0.8, 0.8, 1.0 ) ; + puSetDefaultColourScheme ( 0.8f, 0.8f, 0.8f, 1.0f ) ; // Add the properties context menu context_menu = new puPopupMenu( 0, 0 ) ; Index: PropertiesWindow.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/PropertiesWindow.cxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- PropertiesWindow.cxx 18 Aug 2002 01:05:58 -0000 1.4 +++ PropertiesWindow.cxx 30 Aug 2002 14:00:18 -0000 1.5 @@ -83,7 +83,7 @@ /* Clear the screen */ - glClearColor ( 0.1, 0.1, 0.1, 1.0 ) ; + glClearColor ( 0.1f, 0.1f, 0.1f, 1.0f ) ; glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ) ; puDisplay () ; Index: StatusWindow.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/StatusWindow.cxx,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- StatusWindow.cxx 18 Aug 2002 01:05:58 -0000 1.6 +++ StatusWindow.cxx 30 Aug 2002 14:00:18 -0000 1.7 @@ -244,7 +244,7 @@ /* Clear the screen */ - glClearColor ( 0.1, 0.1, 0.1, 1.0 ) ; + glClearColor ( 0.1f, 0.1f, 0.1f, 1.0f ) ; glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ) ; puDisplay () ; @@ -261,7 +261,7 @@ /* Clear the screen */ - glClearColor ( 0.1, 0.1, 0.1, 1.0 ) ; + glClearColor ( 0.1f, 0.1f, 0.1f, 1.0f ) ; glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ) ; puDisplay () ; @@ -1018,7 +1018,7 @@ window_color_r = new puSpinBox ( 270, 285, 320, 305 ) ; window_color_r->setMinValue(0.0); window_color_r->setMaxValue(1.0); - window_color_r->setStepSize(0.05); + window_color_r->setStepSize(0.05f); window_color_r->setLabel ( "Red" ) ; window_color_r->setLabelPlace ( PUPLACE_TOP_CENTERED ) ; window_color_r->setValuator ( &main_window_color_r ) ; @@ -1027,7 +1027,7 @@ window_color_g = new puSpinBox ( 320, 285, 370, 305 ) ; window_color_g->setMinValue(0.0); window_color_g->setMaxValue(1.0); - window_color_g->setStepSize(0.05); + window_color_g->setStepSize(0.05f); window_color_g->setLabel ( "Green" ) ; window_color_g->setLabelPlace ( PUPLACE_TOP_CENTERED ) ; window_color_g->setValuator ( &main_window_color_g ) ; @@ -1036,7 +1036,7 @@ window_color_b = new puSpinBox ( 370, 285, 420, 305 ) ; window_color_b->setMinValue(0.0); window_color_b->setMaxValue(1.0); - window_color_b->setStepSize(0.05); + window_color_b->setStepSize(0.05f); window_color_b->setLabel ( "Blue" ) ; window_color_b->setLabelPlace ( PUPLACE_TOP_CENTERED ) ; window_color_b->setValuator ( &main_window_color_b ) ; @@ -1045,7 +1045,7 @@ window_color_a = new puSpinBox ( 420, 285, 470, 305 ) ; window_color_a->setMinValue(0.0); window_color_a->setMaxValue(1.0); - window_color_a->setStepSize(0.05); + window_color_a->setStepSize(0.05f); window_color_a->setLabel ( "Alpha" ) ; window_color_a->setLabelPlace ( PUPLACE_TOP_CENTERED ) ; window_color_a->setValuator ( &main_window_color_a ) ; Index: WidgetWindow.cxx =================================================================== RCS file: /cvsroot/plib/plib/demos/p-guide/src/WidgetWindow.cxx,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WidgetWindow.cxx 18 Aug 2002 01:05:58 -0000 1.6 +++ WidgetWindow.cxx 30 Aug 2002 14:00:18 -0000 1.7 @@ -86,7 +86,7 @@ /* Clear the screen */ - glClearColor ( 0.1, 0.1, 0.1, 1.0 ) ; + glClearColor ( 0.1f, 0.1f, 0.1f, 1.0f ) ; glClear ( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ) ; puDisplay () ; |