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

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