Changeset 13190

Timestamp:

05/24/13 19:16:57 (less than one hour ago)

Author:

robert

Message:

Resrtuctured the use of static's in the Uniform::getNameID() method to avoid problems under Android.

Files:

• OpenSceneGraph/trunk/examples/osgmultiplemovies/osgmultiplemovies.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgmultiplemovies/osgmultiplemovies.cpp

@@ -652 +652 @@
         movie_event_handler = new MovieEventHandler();
 
-        unsigned int num_files_per_row = std::max(osg::round(sqrt(static_cast<float>(std::min(max_videos, static_cast<unsigned int>(files.size()))))), 1.0f);
+        unsigned int num_files_per_row = std::max(osg::round(sqrt(static_cast<double>(std::min(max_videos, static_cast<unsigned int>(files.size()))))), 1.0);
         static const float new_row_at = num_files_per_row * desired_height * 16 / 9.0;