[Orxonox-commit 2396] r7111 - code/branches/presentation3/src/orxonox/graphics

rgrieder at orxonox.net rgrieder at orxonox.net
Thu Jun 3 10:51:10 CEST 2010


Author: rgrieder
Date: 2010-06-03 10:51:10 +0200 (Thu, 03 Jun 2010)
New Revision: 7111

Modified:
   code/branches/presentation3/src/orxonox/graphics/Model.cc
Log:
Fixed MSVC build: std::pow(float, double) results in overload ambiguity.
Using std::pow(float, float).

Modified: code/branches/presentation3/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/Model.cc	2010-06-03 07:36:41 UTC (rev 7110)
+++ code/branches/presentation3/src/orxonox/graphics/Model.cc	2010-06-03 08:51:10 UTC (rev 7111)
@@ -142,7 +142,7 @@
                         if( lodLevel_>0 )
                         {
     //                         float factor = scaleFactor*5/lodLevel_;
-                            float factor = pow(volume,2.0/3.0)*15/lodLevel_;
+                            float factor = pow(volume, 2.0f / 3.0f) * 15.0f / lodLevel_;
                             
                             COUT(4) << "LodLevel set with factor: " << factor << endl;
 




More information about the Orxonox-commit mailing list