From b5a2dc4cfbb77690870cc1b408b2a1bb737b5d1a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 9 Jan 2009 15:55:25 +0000 Subject: [PATCH] Fixed warnings --- src/osgPlugins/dae/daeRGeometry.cpp | 3 ++- src/osgPlugins/dae/daeRSceneObjects.cpp | 17 +++++++++-------- src/osgPlugins/dae/daeReader.cpp | 17 ++++++++--------- src/osgPlugins/dae/daeReader.h | 6 +++--- src/osgPlugins/dae/daeWGeometry.cpp | 8 ++++++-- src/osgPlugins/dae/daeWriter.cpp | 3 ++- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/osgPlugins/dae/daeRGeometry.cpp b/src/osgPlugins/dae/daeRGeometry.cpp index 4b759a2a8..076f9c846 100644 --- a/src/osgPlugins/dae/daeRGeometry.cpp +++ b/src/osgPlugins/dae/daeRGeometry.cpp @@ -181,7 +181,8 @@ osg::Geode *daeReader::processGeometry( domGeometry *geo ) // 1 // 0..* , , , , , , // 0..* - size_t count = mesh->getContents().getCount(); + + // size_t count = mesh->getContents().getCount(); // 1..* SourceMap sources; diff --git a/src/osgPlugins/dae/daeRSceneObjects.cpp b/src/osgPlugins/dae/daeRSceneObjects.cpp index 4bfe77610..2852c8b61 100644 --- a/src/osgPlugins/dae/daeRSceneObjects.cpp +++ b/src/osgPlugins/dae/daeRSceneObjects.cpp @@ -145,7 +145,7 @@ osg::Node* daeReader::processOsgSequence(domTechnique* teq) osg::notify(osg::WARN) << "Expected element 'LastFrameTime' not found" << std::endl; } - osg::Sequence::LoopMode loopmode; + osg::Sequence::LoopMode loopmode = osg::Sequence::LOOP; any = daeSafeCast< domAny >(teq->getChild("LoopMode")); if (any) { @@ -558,8 +558,8 @@ osg::Node* daeReader::processCamera( domCamera * dcamera ) osg::notify(osg::WARN) << "Expected or in '" << dcamera->getId() << "'" << std::endl; } - domTargetableFloat *pZnear = daeSafeCast< domTargetableFloat >(pDomPerspective->getZnear()); - domTargetableFloat *pZfar = daeSafeCast< domTargetableFloat >(pDomPerspective->getZfar()); + //domTargetableFloat *pZnear = daeSafeCast< domTargetableFloat >(pDomPerspective->getZnear()); + //domTargetableFloat *pZfar = daeSafeCast< domTargetableFloat >(pDomPerspective->getZfar()); // TODO The current osg::CameraView does not support storage of near far } @@ -569,15 +569,16 @@ osg::Node* daeReader::processCamera( domCamera * dcamera ) // 1 , , and , and , and // 1 // 1 - domTargetableFloat *pXmag = daeSafeCast< domTargetableFloat >(pDomOrthographic->getXmag()); - domTargetableFloat *pYmag = daeSafeCast< domTargetableFloat >(pDomOrthographic->getYmag()); - domTargetableFloat *pAspectRatio = daeSafeCast< domTargetableFloat >(pDomOrthographic->getAspect_ratio()); + + //domTargetableFloat *pXmag = daeSafeCast< domTargetableFloat >(pDomOrthographic->getXmag()); + //domTargetableFloat *pYmag = daeSafeCast< domTargetableFloat >(pDomOrthographic->getYmag()); + //domTargetableFloat *pAspectRatio = daeSafeCast< domTargetableFloat >(pDomOrthographic->getAspect_ratio()); // TODO The current osg::CameraView does not support an orthographic view osg::notify(osg::WARN) << "Orthographic in '" << dcamera->getId() << "' not supported" << std::endl; - domTargetableFloat *pZnear = daeSafeCast< domTargetableFloat >(pDomOrthographic->getZnear()); - domTargetableFloat *pZfar = daeSafeCast< domTargetableFloat >(pDomOrthographic->getZfar()); + //domTargetableFloat *pZnear = daeSafeCast< domTargetableFloat >(pDomOrthographic->getZnear()); + //domTargetableFloat *pZfar = daeSafeCast< domTargetableFloat >(pDomOrthographic->getZfar()); // TODO The current osg::CameraView does not support storage of near far } diff --git a/src/osgPlugins/dae/daeReader.cpp b/src/osgPlugins/dae/daeReader.cpp index dfcf4af02..990cbd3c3 100644 --- a/src/osgPlugins/dae/daeReader.cpp +++ b/src/osgPlugins/dae/daeReader.cpp @@ -21,17 +21,16 @@ using namespace osgdae; -daeReader::daeReader(DAE *dae_) : dae(dae_), - rootNode(NULL), - m_numlights(0), - currentEffect(NULL), - currentInstance_effect(NULL), - geometryMap(), - materialMap(), - m_AuthoringTool(UNKNOWN), +daeReader::daeReader(DAE *dae_) : m_AssetUnitName("meter"), m_AssetUnitMeter(1.0), - m_AssetUp_axis(UPAXISTYPE_Y_UP) + m_AssetUp_axis(UPAXISTYPE_Y_UP), + dae(dae_), + rootNode(NULL), + m_numlights(0), + currentInstance_effect(NULL), + currentEffect(NULL), + m_AuthoringTool(UNKNOWN) { } diff --git a/src/osgPlugins/dae/daeReader.h b/src/osgPlugins/dae/daeReader.h index 2a8757591..ea55a9f3e 100644 --- a/src/osgPlugins/dae/daeReader.h +++ b/src/osgPlugins/dae/daeReader.h @@ -220,11 +220,11 @@ protected: typedef std::map< std::string, osg::StateSet*> MaterialStateSetMap; /// Maps geometry to a Geode - domGeometryGeodeMap geometryMap; + domGeometryGeodeMap geometryMap; // Maps material target to stateset - domMaterialStateSetMap materialMap; + domMaterialStateSetMap materialMap; // Maps material symbol to stateset - MaterialStateSetMap materialMap2; + MaterialStateSetMap materialMap2; enum AuthoringTool { diff --git a/src/osgPlugins/dae/daeWGeometry.cpp b/src/osgPlugins/dae/daeWGeometry.cpp index fd6e15699..00df0cb93 100644 --- a/src/osgPlugins/dae/daeWGeometry.cpp +++ b/src/osgPlugins/dae/daeWGeometry.cpp @@ -111,17 +111,21 @@ void daeWriter::appendGeometryIndices(osg::Geometry *geom, p->getValue().append( verts.inds!=NULL?verts.inds->index( vindex ):vindex ); if ( norm != NULL ) + { if ( geom->getNormalBinding() == osg::Geometry::BIND_PER_VERTEX ) p->getValue().append( normals.inds!=NULL?normals.inds->index( vindex ):vindex ); else p->getValue().append( normals.inds!=NULL?normals.inds->index( ncount ):ncount ); - + } + if ( color != NULL ) + { if ( geom->getColorBinding() == osg::Geometry::BIND_PER_VERTEX ) p->getValue().append( colors.inds!=NULL?colors.inds->index( vindex ):vindex ); else p->getValue().append( colors.inds!=NULL?colors.inds->index( ccount ):ccount ); - + } + for ( unsigned int ti = 0; ti < texcoords.size(); ti++ ) { //ArrayNIndices &tc = texcoords[ti]; diff --git a/src/osgPlugins/dae/daeWriter.cpp b/src/osgPlugins/dae/daeWriter.cpp index b169bda6b..a86e662ad 100644 --- a/src/osgPlugins/dae/daeWriter.cpp +++ b/src/osgPlugins/dae/daeWriter.cpp @@ -43,10 +43,11 @@ std::string toString(osg::Matrix value) daeWriter::daeWriter( DAE *dae_, const std::string &fileURI, bool _usePolygons, bool GoogleMode, TraversalMode tm, bool _writeExtras) : osg::NodeVisitor( tm ), dae(dae_), + writeExtras(_writeExtras), rootName(*dae_), usePolygons (_usePolygons), m_GoogleMode(GoogleMode), - writeExtras(_writeExtras) + m_CurrentRenderingHint(osg::StateSet::DEFAULT_BIN) { success = true;