Changeset 13190

Show
Ignore:
Timestamp:
10/21/14 17:10:27 (4 days ago)
Author:
robert
Message:

Added shaders to support experimental shader based displacement mapping technique osgTerrain::ShaderTerrain?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgmultiplemovies/osgmultiplemovies.cpp

    r13189 r13190  
    652652        movie_event_handler = new MovieEventHandler(); 
    653653 
    654         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); 
     654        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); 
    655655        static const float new_row_at = num_files_per_row * desired_height * 16 / 9.0; 
    656656