FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation problems under Windows due to changes in using std::ostream etc.

Browse Source
This commit is contained in:
Robert Osfield 2001-12-11 16:00:32 +00:00
parent 6c38b61185
commit b3cfed2cb2
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osg/Matrix
View File

@ -14,6 +14,7 @@
#else
#include <iostream>
using std::ostream;
using std::endl;
#endif
// temporary #define to keep backwards compatibility.

3
include/osg/Notify
View File

@ -15,6 +15,9 @@
#include <fstream>
using std::ostream;
using std::ofstream;
using std::endl;
using std::cout;
using std::cerr;
#endif

4
src/osgUtil/SceneView.cpp
View File

@ -303,7 +303,7 @@ void SceneView::draw()
{
osg::ref_ptr<osg::Camera> left_camera = new osg::Camera(*_camera);
osg::ref_ptr<osg::Camera> right_camera = new osg::Camera(*_camera);
float iod = 0.05;
float iod = 0.05f;
left_camera->adjustEyeOffsetForStereo(osg::Vec3(-iod*0.5,0.0f,0.0f),_screenDistance);
right_camera->adjustEyeOffsetForStereo(osg::Vec3(iod*0.5,0.0f,0.0f),_screenDistance);
@ -323,7 +323,7 @@ void SceneView::draw()
{
osg::ref_ptr<osg::Camera> left_camera = new osg::Camera(*_camera);
osg::ref_ptr<osg::Camera> right_camera = new osg::Camera(*_camera);
float iod = 0.05;
float iod = 0.05f;
left_camera->adjustEyeOffsetForStereo(osg::Vec3(-iod*0.5,0.0f,0.0f),_screenDistance);
right_camera->adjustEyeOffsetForStereo(osg::Vec3(iod*0.5,0.0f,0.0f),_screenDistance);

3
src/osgUtil/TriStripVisitor.cpp
View File

@ -7,6 +7,7 @@
#include <osg/GeoSet>
#include <osg/Geode>
#include <osg/Types>
#include <osg/Notify>
#include <osgUtil/TriStripVisitor>
@ -293,7 +294,7 @@ void TriStripVisitor::stripify(GeoSet& gset)
}
else
{
cout << "No triangles to stripify"<<endl;
notify(INFO) << "No triangles to stripify"<<endl;
}
}