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

Various clean ups for the release.

Browse Source
This commit is contained in:
Robert Osfield
2001-12-24 14:12:38 +00:00
parent fb5fee6c5e
commit 3652bd9015
27 changed files with 149 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
FAQ
View File

@@ -345,5 +345,4 @@ o Is there a mailing list?
o How do I submit my contributions?
We will eventually be setting up CVS access, possibly with SourceForge.
Up till then send your changes, to <robert@openscenegraph.org>

18
INSTALL
View File

@@ -9,11 +9,21 @@ OSG has it own native ascii file format, and .rgb image reader inbuilt which
allows you read the example data with any dependencies other than C++, STL and
OpenGL.
The new osgText library adds the dependency of the freetype library for support
of true type fonts, however it is not essential to the core library, so you can
comment it out from compilation by modifying the src/Makefile, and src/Demos/Makefile.
I you wish to use fonts then you can download freetype from www.freetype.org. The
osgText library also requires an up to date GLU implementation which supports
GLU1.3 tessellation routines. If you your current GLU is out of date you'll need
to download the latest, for instance the sgi's sample implementation for
GLU from the www.opengl.org website.
The OSG also has a set of plug-ins which support non-native 3d database and
image formats, several have no dependencies on external libraries (flt,3ds,obj,
lwo,dw, tga & pic), while others (pfb,jpeg,gif,tiff) require other libraries
to be installed to compile them. If you don't already have them installed then
don't worry, you'll still be able to use the OSG. The core osg library and
don't worry, you'll still be able to use the OSG, just comment out the plugins
you can't compile from the src/osgPlugins/Makefile. The core osg library and
viewer has been designed to load the plug-ins at run-time only and if they
are required to load a specific data set. If you don't need them for your
datasets then it won't matter that you haven't been able to compile
@@ -42,7 +52,7 @@ Environmental settings under Unix
setenv OSGHOME <location of OSG root>
setenv OSGDATA <location of OSG data root>
setenv OSGFILEPATH ./:${OSGDATA}:${OSGDATA}/Images:
setenv OSGFILEPATH ./:${OSGDATA}:
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${OSGHOME}/lib
setenv PATH ${PATH}:${OSGHOME}/bin
@@ -221,7 +231,7 @@ Compiling under MacOS X (instructions written by Phil Atkin)
Then you are in Unix land, and it's all very familiar.
You will need a .cshrc file with $OSGHOME (as in your instructions), and
You will need a .cshrc file with $OSGHOME (as above), and
this is a filename that the Mac won't let you see from the Finder or in fact
generate from an app, so I used vi to create that. Then I just went
@@ -307,6 +317,8 @@ Running the demos
or
osgviews glider.osg
To
(Note: the file is picked up by checking the directories pointed to

1
Makefile
View File

@@ -138,6 +138,7 @@ stats :
cat include/osgDB/* src/osgDB/*.cpp | wc -l
cat include/osgGLUT/* src/osgGLUT/*.cpp | wc -l
cat include/osgWX/* src/osgWX/*.cpp | wc -l
cat include/osgText/* src/osgText/*.cpp | wc -l
cat include/*/* src/*/*.cpp | wc -l
cat src/Demos/*/*.cpp | wc -l
cat src/osgPlugins/*/*.cpp src/osgPlugins/*/*.h | wc -l

36
TODO
View File

@@ -46,6 +46,31 @@ o Core OSG Library
. manipulator decoration nodes?
. spacial subdivision decoration nodes?
. improved osgUtil:TriStringVisitor to replace NvTriStrip code.
. update of osgText to latest FTGL.
. create osg::Drawable::PrimtiveFunrctor
. support for volume rendering.
. improved stereo support.
. occlusion culling.
. integrated osgEnv.
. implement a osg::CameraRelativeNode for earth sky/HUD's etc.
. thread safety.
. osgMultipipe.
. multi-textureing -> multi-pass support for platforms which do not
support multi-texturing.
. improve tri-intersection code.
. osgParticles - support for particle effects.
. osgAnimation - support for skinning etc.
. osgShader - suppor for shader languages.
. improved makefiles.
. improved impostor implementation - use depth textures?
. clean up multi-bin control.
. improve the node callback mechanism.
. osgUtil::MultiSceneView/Multi-channel configuration.
. support for node kits via the plugins mechanism.
. Added tracking of matrix stacks in osg::State.
. Added ImageGroup's which can be attached to textures for animation.
- Visitors
. improve state sorting of opaque bins in osg::RenderBin.
. add statistics visitor for logging the stats of the scene graph.
@@ -53,11 +78,9 @@ o Core OSG Library
- IO/Plug-in support
. improve the ascii parsing class osg::Field, osg::FieldReader etc.
. change the osg::Registry to timestamp registrations of objects/RW's.
. add support for file path logging into osg::Input.
. add binary data reading and writing into osg::Input/osg::Output to
support part binary .osg files.
. return error messages of on failed loading/saving.
o Reader/writer plug-ins
@@ -66,10 +89,8 @@ o Reader/writer plug-ins
- .dxf Autocads ascii format.
- .dem digital elevation map.
- .d3d? MS's Direct 3D file formats if they have one..
- .bmp Windows Bitmap files.
- .Z Automatic unzipping of Unix Compress files.
- .tar Automatic unpacking of directories and loading of contents.
- 3D Studio plugin to export to .osg.
- Miya plugin to export to .osg.
o Viewers & Application plug-ins
===============================
@@ -144,3 +165,6 @@ o Work completed
- osg::Plane class.
- add osg::Camera class.
- add osg::EarthSky class for rendering earth and sky backgrounds.
- return error messages of on failed loading/saving.
- .bmp Windows Bitmap files.
- .tar Automatic unpacking of directories and loading of contents.

8
doc/stereo.html
View File

@@ -13,7 +13,7 @@ The OSG has support for stereo out of the box. Currently both anaglyphic
stereo (i.e. red/green or red/cyan glasses) and quad buffered stereo (i.e.
active stereo using shutter glasses, or passive stereo using polarised
projectors &amp; glasses). It is planned to extend this support horizontal
and virtical spli window based stereo implementations.
and virtical split window stereo implementations.
<p>Almost all OSG applications have the potential for stereo support simply
by setting the relevent environmental variables, or via command line arguments.
Little or no code changes will be required, the support is handled transparently
@@ -24,6 +24,7 @@ in this case refer to the VR toolkits handling of stereo, and do not invoke
the OSG's native support, i.e. keep all the OSG's stereo specific environment
varibles (below) set to OFF, or set the values to off within own your own
applications.
<br>
<h3>
The environmental variables of interest:</h3>
@@ -84,10 +85,9 @@ The environmental variables of interest:</h3>
<td>set the eye seperation - interoccular distance (default shown.)</td>
</tr>
</table>
<br>
<h3>
Command line arguments can be used to override these settings:</h3>
&nbsp;
<table CELLSPACING=5 >
<tr>
<td><b>-stereo</b></td>
@@ -129,7 +129,7 @@ Command line arguments can be used to override these settings:</h3>
<td>Switch on QUAD_BUFFER stereo.</td>
</tr>
</table>
<br>
<h3>
Examples:</h3>
To invoke stereo from the comandline:

5
src/Demos/Makefile
View File

@@ -1,7 +1,10 @@
#!smake
SHELL=/bin/sh
DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews osgtext hangglide osgcluster
DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide osgcluster
# comment out if you don't have the freetype and GLU1.3 library installed.
DIRS += osgtext
all :
for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done

2
src/Demos/hangglide/base.cpp
View File

@@ -66,7 +66,7 @@ Node *makeBase( void )
Texture *tex = new Texture;
tex->setImage(osgDB::readImageFile("water.rgb"));
tex->setImage(osgDB::readImageFile("Images/water.rgb"));
tex->setWrap( Texture::WRAP_S, Texture::REPEAT );
tex->setWrap( Texture::WRAP_T, Texture::REPEAT );

2
src/Demos/hangglide/sky.cpp
View File

@@ -89,7 +89,7 @@ Node *makeSky( void )
gset->setPrimLengths( lengths );
Texture *tex = new Texture;
tex->setImage(osgDB::readImageFile("white.rgb"));
tex->setImage(osgDB::readImageFile("Images/white.rgb"));
StateSet *dstate = new StateSet;

2
src/Demos/hangglide/tank.cpp
View File

@@ -116,7 +116,7 @@ Node *makeTank( void )
tex->setWrap( Texture::WRAP_S, Texture::REPEAT );
tex->setWrap( Texture::WRAP_T, Texture::REPEAT );
tex->setImage(osgDB::readImageFile("tank.rgb"));
tex->setImage(osgDB::readImageFile("Images/tank.rgb"));
StateSet *dstate = new StateSet;
dstate->setAttributeAndModes( tex, StateAttribute::ON );

2
src/Demos/hangglide/terrain.cpp
View File

@@ -118,7 +118,7 @@ Node *makeTerrain( void )
Texture *tex = new Texture;
tex->setImage(osgDB::readImageFile("lz.rgb"));
tex->setImage(osgDB::readImageFile("Images/lz.rgb"));
StateSet *dstate = new StateSet;
dstate->setMode( GL_LIGHTING, StateAttribute::OFF );

2
src/Demos/hangglide/trees.cpp
View File

@@ -219,7 +219,7 @@ Node *makeTrees( void )
struct _tree *t;
Texture *tex = new Texture;
tex->setImage(osgDB::readImageFile("tree0.rgba"));
tex->setImage(osgDB::readImageFile("Images/tree0.rgba"));
StateSet *dstate = new StateSet;

2
src/Demos/osgimpostor/osgimpostor.cpp
View File

@@ -79,7 +79,7 @@ int main( int argc, char **argv )
osg::Node* model = osgDB::readNodeFiles(commandLine);
if (!model)
{
write_usage(osg::notify(osg::NOTICE),argv[0]);
// write_usage(osg::notify(osg::NOTICE),argv[0]);
return 1;
}

4
src/Demos/osgreflect/osgreflect.cpp
View File

@@ -164,7 +164,7 @@ int main( int argc, char **argv )
if (!loadedModel)
{
write_usage(osg::notify(osg::NOTICE),argv[0]);
// write_usage(osg::notify(osg::NOTICE),argv[0]);
return 1;
}
@@ -347,7 +347,7 @@ int main( int argc, char **argv )
osg::Transparency* trans = new osg::Transparency;
trans->setFunction(osg::Transparency::ONE,osg::Transparency::ONE);
osg::StateSet* statesetBin5 = createMirrorTexturedState("tank.rgb");
osg::StateSet* statesetBin5 = createMirrorTexturedState("Images/tank.rgb");
statesetBin5->setRenderBinDetails(5,"RenderBin");
statesetBin5->setMode(GL_CULL_FACE,osg::StateAttribute::OFF);

12
src/Demos/osgtext/main.cpp
View File

@@ -45,16 +45,8 @@ using namespace osgGLUT;
#define TEXT_COL_3D osg::Vec4(.99,.3,.2,1)
#ifdef WIN32
std::string ttfPath("./fonts/times.ttf");
std::string ttfPath1("./fonts/verdana.ttf");
#else
std::string ttfPath("dirtydoz.ttf");
std::string ttfPath1("fudd.ttf");
#endif
std::string ttfPath("fonts/dirtydoz.ttf");
std::string ttfPath1("fonts/fudd.ttf");
int gFontSize=18;
int gFontSize1=24;

2
src/Demos/osgviews/osgviews.cpp
View File

@@ -77,7 +77,7 @@ int main( int argc, char **argv )
osg::Node* rootnode = osgDB::readNodeFiles(commandLine);
if (!rootnode)
{
write_usage(osg::notify(osg::NOTICE),argv[0]);
// write_usage(osg::notify(osg::NOTICE),argv[0]);
return 1;
}

2
src/Demos/sgv/sgv.cpp
View File

@@ -80,7 +80,7 @@ int main( int argc, char **argv )
osg::Node* rootnode = osgDB::readNodeFiles(commandLine);
if (!rootnode)
{
write_usage(osg::notify(osg::NOTICE),argv[0]);
// write_usage(osg::notify(osg::NOTICE),argv[0]);
return 1;
}

7
src/Makefile
View File

@@ -1,8 +1,13 @@
#!smake
SHELL=/bin/sh
DIRS = osg osgDB osgUtil osgGLUT
DIRS = osg osgDB osgUtil osgText osgGLUT Demos osgPlugins
# comment out if you don't have the freetype and GLU1.3 library installed.
DIRS += osgText
DIRS += Demos
DIRS += osgPlugins
all :
for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done

20
src/osg/Light.cpp
View File

@@ -12,16 +12,16 @@ Light::Light( void )
init();
// notify(DEBUG) << "_ambient "<<_ambient<<endl;
// notify(DEBUG) << "_diffuse "<<_diffuse<<endl;
// notify(DEBUG) << "_specular "<<_specular<<endl;
// notify(DEBUG) << "_position "<<_position<<endl;
// notify(DEBUG) << "_direction "<<_direction<<endl;
// notify(DEBUG) << "_spot_exponent "<<_spot_exponent<<endl;
// notify(DEBUG) << "_spot_cutoff "<<_spot_cutoff<<endl;
// notify(DEBUG) << "_constant_attenuation "<<_constant_attenuation<<endl;
// notify(DEBUG) << "_linear_attenuation "<<_linear_attenuation<<endl;
// notify(DEBUG) << "_quadratic_attenuation "<<_quadratic_attenuation<<endl;
// notify(DEBUG) << "_ambient "<<_ambient<<std::endl;
// notify(DEBUG) << "_diffuse "<<_diffuse<<std::endl;
// notify(DEBUG) << "_specular "<<_specular<<std::endl;
// notify(DEBUG) << "_position "<<_position<<std::endl;
// notify(DEBUG) << "_direction "<<_direction<<std::endl;
// notify(DEBUG) << "_spot_exponent "<<_spot_exponent<<std::endl;
// notify(DEBUG) << "_spot_cutoff "<<_spot_cutoff<<std::endl;
// notify(DEBUG) << "_constant_attenuation "<<_constant_attenuation<<std::endl;
// notify(DEBUG) << "_linear_attenuation "<<_linear_attenuation<<std::endl;
// notify(DEBUG) << "_quadratic_attenuation "<<_quadratic_attenuation<<std::endl;
}

3
src/osg/Matrix.cpp
View File

@@ -87,9 +87,6 @@ void Matrix::setTrans( float tx, float ty, float tz )
void Matrix::setTrans( const Vec3& v )
{
#ifdef WARN_DEPRECATED
notify(NOTICE) << "Matrix::setTrans is deprecated."<<endl;
#endif
_mat[3][0] = v[0];
_mat[3][1] = v[1];
_mat[3][2] = v[2];

19
src/osgPlugins/Makefile
View File

@@ -1,8 +1,23 @@
#!smake
SHELL=/bin/sh
#DIRS = osg rgb lib3ds flt pfb obj lwo dw bmp pic png jpeg tga tiff gif osgtgz tgz zip
DIRS = osg rgb lib3ds flt obj lwo dw bmp pic png jpeg tga tiff gif osgtgz tgz zip
DIRS = osg rgb lib3ds flt obj lwo dw bmp pic tga osgtgz tgz zip
# comment in if you have Performer installed.
# DIRS += pfb
# comment in if you have libpng installed.
DIRS += png
# comment in if you have libjpeg installed.
DIRS += jpeg
# comment in if you have libungif installed.
DIRS += gif
# comment in if you have libtiff installed.
DIRS += tiff
all :
for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done

76
src/osgPlugins/pfb/ConvertFromPerformer.cpp
View File

@@ -94,7 +94,7 @@ osg::Object* ConvertFromPerformer::getOsgObject(pfObject* pfObj)
PfObjectToOsgObjectMap::iterator fitr = _pfToOsgMap.find(pfObj);
if (fitr != _pfToOsgMap.end())
{
// osg::notify(DEBUG) << "Found shared object"<<endl;
// osg::notify(DEBUG) << "Found shared object"<<std::endl;
return (*fitr).second;
}
else return NULL;
@@ -254,7 +254,7 @@ osg::Node* ConvertFromPerformer::visitSwitch(osg::Group* osgParent,pfSwitch* swi
osg::Node* ConvertFromPerformer::visitSequence(osg::Group* osgParent,pfSequence* sequence)
{
osg::notify(osg::WARN)<<"Warning : cannot convert pfSequence as no osg::Sequence exists, using osg::Switch instead."<<endl;
osg::notify(osg::WARN)<<"Warning : cannot convert pfSequence as no osg::Sequence exists, using osg::Switch instead."<<std::endl;
osg::Switch* osgSequence = dynamic_cast<osg::Switch*>(getOsgObject(sequence));
if (osgSequence)
@@ -724,38 +724,38 @@ osg::StateSet* ConvertFromPerformer::visitGeoState(osg::GeoSet* osgGeoSet,pfGeoS
// Don could you fill in some of these blanks???
unsigned int inherit = geostate->getInherit();
// osg::notify(DEBUG) << endl << "Inherit = "<<inherit<<endl;
// if (inherit & PFSTATE_TRANSPARENCY) osg::notify(DEBUG) << "Inherit PFSTATE_TRANSPARENCY"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_TRANSPARENCY"<<endl;
// if (inherit & PFSTATE_ENTEXTURE) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXTURE"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXTURE"<<endl;
// if (inherit & PFSTATE_CULLFACE) osg::notify(DEBUG) << "Inherit PFSTATE_CULLFACE"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_CULLFACE"<<endl;
// if (inherit & PFSTATE_ENLIGHTING) osg::notify(DEBUG) << "Inherit PFSTATE_ENLIGHTING"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENLIGHTING"<<endl;
// if (inherit & PFSTATE_ENFOG) osg::notify(DEBUG) << "Inherit PFSTATE_ENFOG"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENFOG"<<endl;
// if (inherit & PFSTATE_ENWIREFRAME) osg::notify(DEBUG) << "Inherit PFSTATE_ENWIREFRAME"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENWIREFRAME"<<endl;
// if (inherit & PFSTATE_ENTEXMAT) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXMAT"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXMAT"<<endl;
// if (inherit & PFSTATE_ENTEXGEN) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXGEN"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXGEN"<<endl;
// osg::notify(DEBUG) << endl << "Inherit = "<<inherit<<std::endl;
// if (inherit & PFSTATE_TRANSPARENCY) osg::notify(DEBUG) << "Inherit PFSTATE_TRANSPARENCY"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_TRANSPARENCY"<<std::endl;
// if (inherit & PFSTATE_ENTEXTURE) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXTURE"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXTURE"<<std::endl;
// if (inherit & PFSTATE_CULLFACE) osg::notify(DEBUG) << "Inherit PFSTATE_CULLFACE"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_CULLFACE"<<std::endl;
// if (inherit & PFSTATE_ENLIGHTING) osg::notify(DEBUG) << "Inherit PFSTATE_ENLIGHTING"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENLIGHTING"<<std::endl;
// if (inherit & PFSTATE_ENFOG) osg::notify(DEBUG) << "Inherit PFSTATE_ENFOG"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENFOG"<<std::endl;
// if (inherit & PFSTATE_ENWIREFRAME) osg::notify(DEBUG) << "Inherit PFSTATE_ENWIREFRAME"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENWIREFRAME"<<std::endl;
// if (inherit & PFSTATE_ENTEXMAT) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXMAT"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXMAT"<<std::endl;
// if (inherit & PFSTATE_ENTEXGEN) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXGEN"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXGEN"<<std::endl;
//
// if (inherit & PFSTATE_ANTIALIAS) osg::notify(DEBUG) << "Inherit PFSTATE_ANTIALIAS"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ANTIALIAS"<<endl;
// if (inherit & PFSTATE_DECAL) osg::notify(DEBUG) << "Inherit PFSTATE_DECAL"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_DECAL"<<endl;
// if (inherit & PFSTATE_ALPHAFUNC) osg::notify(DEBUG) << "Inherit PFSTATE_ALPHAFUNC"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ALPHAFUNC"<<endl;
// if (inherit & PFSTATE_ENCOLORTABLE) osg::notify(DEBUG) << "Inherit PFSTATE_ENCOLORTABLE"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENCOLORTABLE"<<endl;
// if (inherit & PFSTATE_ENHIGHLIGHTING) osg::notify(DEBUG) << "Inherit PFSTATE_ENHIGHLIGHTING"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENHIGHLIGHTING"<<endl;
// if (inherit & PFSTATE_ENLPOINTSTATE) osg::notify(DEBUG) << "Inherit PFSTATE_ENLPOINTSTATE"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENLPOINTSTATE"<<endl;
// if (inherit & PFSTATE_ENTEXLOD) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXLOD"<<endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXLOD"<<endl;
// if (inherit & PFSTATE_ANTIALIAS) osg::notify(DEBUG) << "Inherit PFSTATE_ANTIALIAS"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ANTIALIAS"<<std::endl;
// if (inherit & PFSTATE_DECAL) osg::notify(DEBUG) << "Inherit PFSTATE_DECAL"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_DECAL"<<std::endl;
// if (inherit & PFSTATE_ALPHAFUNC) osg::notify(DEBUG) << "Inherit PFSTATE_ALPHAFUNC"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ALPHAFUNC"<<std::endl;
// if (inherit & PFSTATE_ENCOLORTABLE) osg::notify(DEBUG) << "Inherit PFSTATE_ENCOLORTABLE"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENCOLORTABLE"<<std::endl;
// if (inherit & PFSTATE_ENHIGHLIGHTING) osg::notify(DEBUG) << "Inherit PFSTATE_ENHIGHLIGHTING"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENHIGHLIGHTING"<<std::endl;
// if (inherit & PFSTATE_ENLPOINTSTATE) osg::notify(DEBUG) << "Inherit PFSTATE_ENLPOINTSTATE"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENLPOINTSTATE"<<std::endl;
// if (inherit & PFSTATE_ENTEXLOD) osg::notify(DEBUG) << "Inherit PFSTATE_ENTEXLOD"<<std::endl;
// else osg::notify(DEBUG) << "Define PFSTATE_ENTEXLOD"<<std::endl;
if (inherit & PFSTATE_TRANSPARENCY) osgStateSet->setMode(GL_BLEND,osg::StateAttribute::INHERIT);
else
@@ -921,8 +921,8 @@ osg::StateSet* ConvertFromPerformer::visitGeoState(osg::GeoSet* osgGeoSet,pfGeoS
osgStateSet->setAttribute(osgTexGen);
break;
case(PFTG_EYE_LINEAR_IDENT) :
cerr << "TexGen Mode PFTG_EYE_LINEAR_IDENT not currently supported by the OSG,"<<endl;
cerr << " assuming osg::TexGen::EYE_LINEAR."<<endl;
cerr << "TexGen Mode PFTG_EYE_LINEAR_IDENT not currently supported by the OSG,"<<std::endl;
cerr << " assuming osg::TexGen::EYE_LINEAR."<<std::endl;
case(PFTG_EYE_LINEAR) :
osgTexGen->setMode(osg::TexGen::EYE_LINEAR);
osgStateSet->setAttribute(osgTexGen);
@@ -935,15 +935,15 @@ osg::StateSet* ConvertFromPerformer::visitGeoState(osg::GeoSet* osgGeoSet,pfGeoS
osgTexGen->setStateSetModes(*osgStateSet,osg::StateAttribute::OFF);
break;
case(PFTG_OBJECT_DISTANCE_TO_LINE) :
cerr << "TexGen Mode PFTG_OBJECT_DISTANCE_TO_LINE not currently supported by the OSG."<<endl;
cerr << "TexGen Mode PFTG_OBJECT_DISTANCE_TO_LINE not currently supported by the OSG."<<std::endl;
osgTexGen->setStateSetModes(*osgStateSet,osg::StateAttribute::OFF);
break;
case(PFTG_EYE_DISTANCE_TO_LINE) :
cerr << "TexGen Mode PFTG_EYE_DISTANCE_TO_LINE not currently supported by the OSG."<<endl;
cerr << "TexGen Mode PFTG_EYE_DISTANCE_TO_LINE not currently supported by the OSG."<<std::endl;
osgTexGen->setStateSetModes(*osgStateSet,osg::StateAttribute::OFF);
break;
default:
cerr << "TexGen Mode "<<mode<<" not currently supported by the OSG."<<endl;
cerr << "TexGen Mode "<<mode<<" not currently supported by the OSG."<<std::endl;
osgTexGen->setStateSetModes(*osgStateSet,osg::StateAttribute::OFF);
break;
}

8
src/osgPlugins/pfb/ConvertToPerformer.cpp
View File

@@ -95,7 +95,7 @@ pfObject* ConvertToPerformer::getPfObject(osg::Object* osgObj)
OsgObjectToPfObjectMap::iterator fitr = _osgToPfMap.find(osgObj);
if (fitr != _osgToPfMap.end())
{
osg::notify(osg::DEBUG_INFO) << "Found shared object"<<endl;
osg::notify(osg::DEBUG_INFO) << "Found shared object"<<std::endl;
return (*fitr).second;
}
else return NULL;
@@ -304,21 +304,21 @@ pfGeoSet* ConvertToPerformer::visitGeoSet(osg::GeoSet* geoset)
osg::GeoSet::IndexPointer& cindex = geoset->getCoordIndices();
if (cindex.valid() && !cindex._is_ushort)
{
osg::notify(osg::WARN)<<"Warning: Cannot convert osg::GeoSet to pfGeoSet due to uint coord index."<<endl;
osg::notify(osg::WARN)<<"Warning: Cannot convert osg::GeoSet to pfGeoSet due to uint coord index."<<std::endl;
return NULL;
}
osg::GeoSet::IndexPointer& nindex = geoset->getNormalIndices();
if (nindex.valid() && !nindex._is_ushort)
{
osg::notify(osg::WARN)<<"Warning: Cannot convert osg::GeoSet to pfGeoSet due to uint normal index."<<endl;
osg::notify(osg::WARN)<<"Warning: Cannot convert osg::GeoSet to pfGeoSet due to uint normal index."<<std::endl;
return NULL;
}
osg::GeoSet::IndexPointer& colindex = geoset->getColorIndices();
if (colindex.valid() && !colindex._is_ushort)
{
osg::notify(osg::WARN)<<"Warning: Cannot convert osg::GeoSet to pfGeoSet due to uint color index."<<endl;
osg::notify(osg::WARN)<<"Warning: Cannot convert osg::GeoSet to pfGeoSet due to uint color index."<<std::endl;
return NULL;
}

4
src/osgPlugins/png/new_ReaderWriterPNG.cpp
View File

@@ -64,7 +64,7 @@ warn_callback(png_structp /*ps*/, png_const_charp pc)
/*FIXME: notify? */
osg::notify(osg::WARN)<<"Warning in .png reader: ";
if (pc) osg::notify(osg::WARN)<< pc;
osg::notify(osg::WARN)<<endl;
osg::notify(osg::WARN)<<std::endl;
}
static void
@@ -75,7 +75,7 @@ err_callback(png_structp /*ps*/, png_const_charp pc)
osg::notify(osg::WARN)<<"Error in .png reader: ";
if (pc) osg::notify(osg::WARN)<< pc;
osg::notify(osg::WARN)<<endl;
osg::notify(osg::WARN)<<std::endl;
}
int

2
src/osgText/Font.cpp
View File

@@ -51,7 +51,7 @@ std::string findFontFile(const std::string& str)
filename = osgDB::findFileInPath(str.c_str(),s_FontFilePath);
if (filename) return std::string(filename);
}
osg::notify(osg::WARN)<<"Warning: font file \""<<str<<"\" not found."<<endl;
osg::notify(osg::WARN)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;
return std::string();
}

2
src/osgUtil/FlightManipulator.cpp
View File

@@ -43,7 +43,7 @@ void FlightManipulator::home(const GUIEventAdapter& ea,GUIActionAdapter& us)
const osg::BoundingSphere& boundingSphere=_node->getBound();
_camera->setLookAt(
boundingSphere._center+osg::Vec3( 0.0,-2.0f * boundingSphere._radius,0.0f),
boundingSphere._center+osg::Vec3( 0.0,-3.0f * boundingSphere._radius,0.0f),
boundingSphere._center,
osg::Vec3(0.0f,0.0f,1.0f));

4
src/osgUtil/RenderBin.cpp
View File

@@ -20,7 +20,7 @@ RenderBinPrototypeList* renderBinPrototypeList()
RenderBin* RenderBin::createRenderBin(const std::string& binName)
{
// cout << "creating RB "<<binName<<endl;
// cout << "creating RB "<<binName<<std::endl;
RenderBinPrototypeList::iterator itr = renderBinPrototypeList()->find(binName);
if (itr != renderBinPrototypeList()->end()) return dynamic_cast<RenderBin*>(itr->second->clone());
@@ -32,7 +32,7 @@ void RenderBin::addRenderBinPrototype(RenderBin* proto)
if (proto)
{
(*renderBinPrototypeList())[proto->className()] = proto;
// cout << "Adding RB "<<proto->className()<<endl;
// cout << "Adding RB "<<proto->className()<<std::endl;
}
}

4
src/osgUtil/TrackballManipulator.cpp
View File

@@ -43,7 +43,7 @@ void TrackballManipulator::home(const GUIEventAdapter& ,GUIActionAdapter& us)
const osg::BoundingSphere& boundingSphere=_node->getBound();
_camera->setView(boundingSphere._center+osg::Vec3( 0.0,-2.0f * boundingSphere._radius,0.0f),
_camera->setView(boundingSphere._center+osg::Vec3( 0.0,-3.0f * boundingSphere._radius,0.0f),
boundingSphere._center,
osg::Vec3(0.0f,0.0f,1.0f));
@@ -285,7 +285,7 @@ bool TrackballManipulator::calcMovement()
else
{
// notify(DEBUG_INFO) << "Pushing forward"<<endl;
// notify(DEBUG_INFO) << "Pushing forward"<<std::endl;
// push the camera forward.
float scale = 0.0015f*fd;
osg::Vec3 dv = _camera->getLookVector()*(dy*scale);