From 20f334b6f8401894a16840c689152eae8967a5e3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 20 Jun 2011 14:09:49 +0000 Subject: [PATCH] Removed unneccesary namespace qualifiers, and issue picked out by cppcheck. --- src/osg/ImageUtils.cpp | 22 +-- src/osg/OcclusionQueryNode.cpp | 172 +++++++----------- src/osgDB/ExternalFileWriter.cpp | 35 ++-- .../OpenFlight/expGeometryRecords.cpp | 4 +- 4 files changed, 99 insertions(+), 134 deletions(-) diff --git a/src/osg/ImageUtils.cpp b/src/osg/ImageUtils.cpp index 33dd829c0..edbaa2f82 100644 --- a/src/osg/ImageUtils.cpp +++ b/src/osg/ImageUtils.cpp @@ -113,7 +113,7 @@ bool offsetAndScaleImage(osg::Image* image, const osg::Vec4& offset, const osg:: { if (!image) return false; - osg::modifyImage(image,osg::OffsetAndScaleOperator(offset, scale)); + modifyImage(image,OffsetAndScaleOperator(offset, scale)); return true; } @@ -304,12 +304,12 @@ bool copyImage(const osg::Image* srcImage, int src_s, int src_t, int src_r, int writeOp._pos = 0; // read the pixels into readOp's _colour array - osg::readRow(width, srcImage->getPixelFormat(), srcImage->getDataType(), srcImage->data(src_s,src_t+row,src_r+slice), readOp); + readRow(width, srcImage->getPixelFormat(), srcImage->getDataType(), srcImage->data(src_s,src_t+row,src_r+slice), readOp); // pass readOp's _colour array contents over to writeOp (note this is just a pointer swap). writeOp._colours.swap(readOp._colours); - osg::modifyRow(width, destImage->getPixelFormat(), destImage->getDataType(), destImage->data(dest_s, dest_t+row,dest_r+slice), writeOp); + modifyRow(width, destImage->getPixelFormat(), destImage->getDataType(), destImage->data(dest_s, dest_t+row,dest_r+slice), writeOp); // return readOp's _colour array contents back to its rightful owner. writeOp._colours.swap(readOp._colours); @@ -364,7 +364,7 @@ unsigned int maximimNumOfComponents(const ImageList& imageList) pixelFormat==GL_BGR || pixelFormat==GL_BGRA) { - max_components = osg::maximum(osg::Image::computeNumComponents(pixelFormat), max_components); + max_components = maximum(Image::computeNumComponents(pixelFormat), max_components); } } return max_components; @@ -396,8 +396,8 @@ osg::Image* createImage3D(const ImageList& imageList, pixelFormat==GL_BGR || pixelFormat==GL_BGRA) { - max_s = osg::maximum(image->s(), max_s); - max_t = osg::maximum(image->t(), max_t); + max_s = maximum(image->s(), max_s); + max_t = maximum(image->t(), max_t); total_r += image->r(); } else @@ -479,9 +479,9 @@ osg::Image* createImage3D(const ImageList& imageList, pixelFormat==GL_BGRA) { - int num_s = osg::minimum(image->s(), image_3d->s()); - int num_t = osg::minimum(image->t(), image_3d->t()); - int num_r = osg::minimum(image->r(), (image_3d->r() - curr_dest_r)); + int num_s = minimum(image->s(), image_3d->s()); + int num_t = minimum(image->t(), image_3d->t()); + int num_r = minimum(image->r(), (image_3d->r() - curr_dest_r)); unsigned int s_offset_dest = (image->s()s())/2 : 0; unsigned int t_offset_dest = (image->t()t())/2 : 0; @@ -516,7 +516,7 @@ osg::Image* createImage3DWithAlpha(const ImageList& imageList, GLenum desiredPixelFormat = 0; bool modulateAlphaByLuminance = false; - unsigned int maxNumComponents = osg::maximimNumOfComponents(imageList); + unsigned int maxNumComponents = maximimNumOfComponents(imageList); if (maxNumComponents==3) { desiredPixelFormat = GL_RGBA; @@ -533,7 +533,7 @@ osg::Image* createImage3DWithAlpha(const ImageList& imageList, { if (modulateAlphaByLuminance) { - osg::modifyImage(image.get(), ModulateAlphaByLuminanceOperator()); + modifyImage(image.get(), ModulateAlphaByLuminanceOperator()); } return image.release(); } diff --git a/src/osg/OcclusionQueryNode.cpp b/src/osg/OcclusionQueryNode.cpp index 171454f1f..b03425fad 100644 --- a/src/osg/OcclusionQueryNode.cpp +++ b/src/osg/OcclusionQueryNode.cpp @@ -54,59 +54,45 @@ namespace osg // Create and return a StateSet appropriate for performing an occlusion // query test (disable lighting, texture mapping, etc). Probably some // room for improvement here. Could disable shaders, for example. -osg::StateSet* -initOQState() +StateSet* initOQState() { - osg::StateSet* state = new osg::StateSet; + StateSet* state = new StateSet; // TBD Possible bug, need to allow user to set render bin number. state->setRenderBinDetails( 9, "RenderBin" ); - state->setMode( GL_LIGHTING, osg::StateAttribute::OFF | - osg::StateAttribute::PROTECTED); - state->setTextureMode( 0, GL_TEXTURE_2D, osg::StateAttribute::OFF | - osg::StateAttribute::PROTECTED); - state->setMode( GL_CULL_FACE, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); + state->setMode( GL_LIGHTING, StateAttribute::OFF | StateAttribute::PROTECTED); + state->setTextureMode( 0, GL_TEXTURE_2D, StateAttribute::OFF | StateAttribute::PROTECTED); + state->setMode( GL_CULL_FACE, StateAttribute::ON | StateAttribute::PROTECTED); - osg::ColorMask* cm = new osg::ColorMask( false, false, false, false ); - state->setAttributeAndModes( cm, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); - osg::Depth* d = new osg::Depth( osg::Depth::LEQUAL, 0.f, 1.f, false ); - state->setAttributeAndModes( d, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); - osg::PolygonMode* pm = new osg::PolygonMode( - osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL ); - state->setAttributeAndModes( pm, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); + ColorMask* cm = new ColorMask( false, false, false, false ); + state->setAttributeAndModes( cm, StateAttribute::ON | StateAttribute::PROTECTED); - osg::PolygonOffset* po = new osg::PolygonOffset( -1., -1. ); - state->setAttributeAndModes( po, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); + Depth* d = new Depth( Depth::LEQUAL, 0.f, 1.f, false ); + state->setAttributeAndModes( d, StateAttribute::ON | StateAttribute::PROTECTED); + + PolygonMode* pm = new PolygonMode( PolygonMode::FRONT_AND_BACK, PolygonMode::FILL ); + state->setAttributeAndModes( pm, StateAttribute::ON | StateAttribute::PROTECTED); + + PolygonOffset* po = new PolygonOffset( -1., -1. ); + state->setAttributeAndModes( po, StateAttribute::ON | StateAttribute::PROTECTED); return state; } // Create and return a StateSet for rendering a debug representation of query geometry. -osg::StateSet* -initOQDebugState() +StateSet* initOQDebugState() { osg::StateSet* debugState = new osg::StateSet; - debugState->setMode( GL_LIGHTING, osg::StateAttribute::OFF | - osg::StateAttribute::PROTECTED); - debugState->setTextureMode( 0, GL_TEXTURE_2D, osg::StateAttribute::OFF | - osg::StateAttribute::PROTECTED); - debugState->setMode( GL_CULL_FACE, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); + debugState->setMode( GL_LIGHTING, StateAttribute::OFF | StateAttribute::PROTECTED); + debugState->setTextureMode( 0, GL_TEXTURE_2D, StateAttribute::OFF | StateAttribute::PROTECTED); + debugState->setMode( GL_CULL_FACE, StateAttribute::ON | StateAttribute::PROTECTED); - osg::PolygonMode* pm = new osg::PolygonMode( - osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::LINE ); - debugState->setAttributeAndModes( pm, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); + PolygonMode* pm = new PolygonMode( PolygonMode::FRONT_AND_BACK, PolygonMode::LINE ); + debugState->setAttributeAndModes( pm, StateAttribute::ON | StateAttribute::PROTECTED); - osg::PolygonOffset* po = new osg::PolygonOffset( -1., -1. ); - debugState->setAttributeAndModes( po, osg::StateAttribute::ON | - osg::StateAttribute::PROTECTED); + PolygonOffset* po = new PolygonOffset( -1., -1. ); + debugState->setAttributeAndModes( po, StateAttribute::ON | StateAttribute::PROTECTED); return debugState; } @@ -484,7 +470,7 @@ OcclusionQueryNode::~OcclusionQueryNode() { } -OcclusionQueryNode::OcclusionQueryNode( const OcclusionQueryNode& oqn, const osg::CopyOp& copyop ) +OcclusionQueryNode::OcclusionQueryNode( const OcclusionQueryNode& oqn, const CopyOp& copyop ) : Group( oqn, copyop ), _passed( false ) { @@ -498,8 +484,7 @@ OcclusionQueryNode::OcclusionQueryNode( const OcclusionQueryNode& oqn, const osg } -bool -OcclusionQueryNode::getPassed( const osg::Camera* camera, osg::NodeVisitor& nv ) +bool OcclusionQueryNode::getPassed( const Camera* camera, NodeVisitor& nv ) { if ( !_enabled ) // Queries are not enabled. The caller should be osgUtil::CullVisitor, @@ -551,8 +536,7 @@ OcclusionQueryNode::getPassed( const osg::Camera* camera, osg::NodeVisitor& nv ) return _passed; } -void -OcclusionQueryNode::traverseQuery( const osg::Camera* camera, osg::NodeVisitor& nv ) +void OcclusionQueryNode::traverseQuery( const Camera* camera, NodeVisitor& nv ) { bool issueQuery; { @@ -568,16 +552,14 @@ OcclusionQueryNode::traverseQuery( const osg::Camera* camera, osg::NodeVisitor& _queryGeode->accept( nv ); } -void -OcclusionQueryNode::traverseDebug( osg::NodeVisitor& nv ) +void OcclusionQueryNode::traverseDebug( NodeVisitor& nv ) { if (_debugBB) // If requested, display the debug geometry _debugGeode->accept( nv ); } -osg::BoundingSphere -OcclusionQueryNode::computeBound() const +BoundingSphere OcclusionQueryNode::computeBound() const { { // Need to make this routine thread-safe. Typically called by the update @@ -590,22 +572,22 @@ OcclusionQueryNode::computeBound() const osg::OcclusionQueryNode* nonConstThis = const_cast( this ); - osg::ComputeBoundsVisitor cbv; + ComputeBoundsVisitor cbv; nonConstThis->accept( cbv ); - osg::BoundingBox bb = cbv.getBoundingBox(); + BoundingBox bb = cbv.getBoundingBox(); - osg::ref_ptr v = new osg::Vec3Array; + osg::ref_ptr v = new Vec3Array; v->resize( 8 ); - (*v)[0] = osg::Vec3( bb._min.x(), bb._min.y(), bb._min.z() ); - (*v)[1] = osg::Vec3( bb._max.x(), bb._min.y(), bb._min.z() ); - (*v)[2] = osg::Vec3( bb._max.x(), bb._min.y(), bb._max.z() ); - (*v)[3] = osg::Vec3( bb._min.x(), bb._min.y(), bb._max.z() ); - (*v)[4] = osg::Vec3( bb._max.x(), bb._max.y(), bb._min.z() ); - (*v)[5] = osg::Vec3( bb._min.x(), bb._max.y(), bb._min.z() ); - (*v)[6] = osg::Vec3( bb._min.x(), bb._max.y(), bb._max.z() ); - (*v)[7] = osg::Vec3( bb._max.x(), bb._max.y(), bb._max.z() ); + (*v)[0] = Vec3( bb._min.x(), bb._min.y(), bb._min.z() ); + (*v)[1] = Vec3( bb._max.x(), bb._min.y(), bb._min.z() ); + (*v)[2] = Vec3( bb._max.x(), bb._min.y(), bb._max.z() ); + (*v)[3] = Vec3( bb._min.x(), bb._min.y(), bb._max.z() ); + (*v)[4] = Vec3( bb._max.x(), bb._max.y(), bb._min.z() ); + (*v)[5] = Vec3( bb._min.x(), bb._max.y(), bb._min.z() ); + (*v)[6] = Vec3( bb._min.x(), bb._max.y(), bb._max.z() ); + (*v)[7] = Vec3( bb._max.x(), bb._max.y(), bb._max.z() ); - osg::Geometry* geom = static_cast< osg::Geometry* >( nonConstThis->_queryGeode->getDrawable( 0 ) ); + Geometry* geom = static_cast< Geometry* >( nonConstThis->_queryGeode->getDrawable( 0 ) ); geom->setVertexArray( v.get() ); geom = static_cast< osg::Geometry* >( nonConstThis->_debugGeode->getDrawable( 0 ) ); @@ -617,28 +599,23 @@ OcclusionQueryNode::computeBound() const // Should only be called outside of cull/draw. No thread issues. -void -OcclusionQueryNode::setQueriesEnabled( bool enable ) +void OcclusionQueryNode::setQueriesEnabled( bool enable ) { _enabled = enable; } // Should only be called outside of cull/draw. No thread issues. -void -OcclusionQueryNode::setDebugDisplay( bool debug ) +void OcclusionQueryNode::setDebugDisplay( bool debug ) { _debugBB = debug; } -bool -OcclusionQueryNode::getDebugDisplay() const + +bool OcclusionQueryNode::getDebugDisplay() const { return _debugBB; } - - -void -OcclusionQueryNode::setQueryStateSet( osg::StateSet* ss ) +void OcclusionQueryNode::setQueryStateSet( StateSet* ss ) { if (!_queryGeode) { @@ -648,8 +625,8 @@ OcclusionQueryNode::setQueryStateSet( osg::StateSet* ss ) _queryGeode->setStateSet( ss ); } -osg::StateSet* -OcclusionQueryNode::getQueryStateSet() + +StateSet* OcclusionQueryNode::getQueryStateSet() { if (!_queryGeode) { @@ -659,8 +636,7 @@ OcclusionQueryNode::getQueryStateSet() return _queryGeode->getStateSet(); } -const osg::StateSet* -OcclusionQueryNode::getQueryStateSet() const +const StateSet* OcclusionQueryNode::getQueryStateSet() const { if (!_queryGeode) { @@ -670,8 +646,7 @@ OcclusionQueryNode::getQueryStateSet() const return _queryGeode->getStateSet(); } -void -OcclusionQueryNode::setDebugStateSet( osg::StateSet* ss ) +void OcclusionQueryNode::setDebugStateSet( StateSet* ss ) { if (!_debugGeode) { @@ -681,8 +656,7 @@ OcclusionQueryNode::setDebugStateSet( osg::StateSet* ss ) _debugGeode->setStateSet( ss ); } -osg::StateSet* -OcclusionQueryNode::getDebugStateSet() +StateSet* OcclusionQueryNode::getDebugStateSet() { if (!_debugGeode.valid()) { @@ -691,8 +665,7 @@ OcclusionQueryNode::getDebugStateSet() } return _debugGeode->getStateSet(); } -const osg::StateSet* -OcclusionQueryNode::getDebugStateSet() const +const StateSet* OcclusionQueryNode::getDebugStateSet() const { if (!_debugGeode.valid()) { @@ -702,15 +675,13 @@ OcclusionQueryNode::getDebugStateSet() const return _debugGeode->getStateSet(); } -bool -OcclusionQueryNode::getPassed() const +bool OcclusionQueryNode::getPassed() const { return _passed; } -void -OcclusionQueryNode::createSupportNodes() +void OcclusionQueryNode::createSupportNodes() { GLushort indices[] = { 0, 1, 2, 3, 4, 5, 6, 7, 0, 3, 6, 5, 2, 1, 4, 7, @@ -718,14 +689,13 @@ OcclusionQueryNode::createSupportNodes() { // Add the test geometry Geode - _queryGeode = new osg::Geode; + _queryGeode = new Geode; _queryGeode->setName( "OQTest" ); - _queryGeode->setDataVariance( osg::Object::DYNAMIC ); + _queryGeode->setDataVariance( Object::DYNAMIC ); - osg::ref_ptr< QueryGeometry > geom = new QueryGeometry( getName() ); - geom->setDataVariance( osg::Object::DYNAMIC ); - geom->addPrimitiveSet( new osg::DrawElementsUShort( - osg::PrimitiveSet::QUADS, 24, indices ) ); + ref_ptr< QueryGeometry > geom = new QueryGeometry( getName() ); + geom->setDataVariance( Object::DYNAMIC ); + geom->addPrimitiveSet( new DrawElementsUShort( PrimitiveSet::QUADS, 24, indices ) ); _queryGeode->addDrawable( geom.get() ); } @@ -733,20 +703,19 @@ OcclusionQueryNode::createSupportNodes() { // Add a Geode that is a visual representation of the // test geometry for debugging purposes - _debugGeode = new osg::Geode; + _debugGeode = new Geode; _debugGeode->setName( "Debug" ); - _debugGeode->setDataVariance( osg::Object::DYNAMIC ); + _debugGeode->setDataVariance( Object::DYNAMIC ); - osg::ref_ptr geom = new osg::Geometry; - geom->setDataVariance( osg::Object::DYNAMIC ); + ref_ptr geom = new Geometry; + geom->setDataVariance( Object::DYNAMIC ); - osg::ref_ptr ca = new osg::Vec4Array; - ca->push_back( osg::Vec4( 1.f, 1.f, 1.f, 1.f ) ); + ref_ptr ca = new Vec4Array; + ca->push_back( Vec4( 1.f, 1.f, 1.f, 1.f ) ); geom->setColorArray( ca.get() ); - geom->setColorBinding( osg::Geometry::BIND_OVERALL ); + geom->setColorBinding( Geometry::BIND_OVERALL ); - geom->addPrimitiveSet( new osg::DrawElementsUShort( - osg::PrimitiveSet::QUADS, 24, indices ) ); + geom->addPrimitiveSet( new DrawElementsUShort( PrimitiveSet::QUADS, 24, indices ) ); _debugGeode->addDrawable( geom.get() ); } @@ -759,8 +728,7 @@ OcclusionQueryNode::createSupportNodes() } -void -OcclusionQueryNode::releaseGLObjects( osg::State* state ) const +void OcclusionQueryNode::releaseGLObjects( State* state ) const { if(_queryGeode->getDrawable( 0 ) != NULL) { @@ -771,15 +739,13 @@ OcclusionQueryNode::releaseGLObjects( osg::State* state ) const } } -void -OcclusionQueryNode::flushDeletedQueryObjects( unsigned int contextID, double currentTime, double& availableTime ) +void OcclusionQueryNode::flushDeletedQueryObjects( unsigned int contextID, double currentTime, double& availableTime ) { // Query object discard and deletion is handled by QueryGeometry support class. QueryGeometry::flushDeletedQueryObjects( contextID, currentTime, availableTime ); } -void -OcclusionQueryNode::discardDeletedQueryObjects( unsigned int contextID ) +void OcclusionQueryNode::discardDeletedQueryObjects( unsigned int contextID ) { // Query object discard and deletion is handled by QueryGeometry support class. QueryGeometry::discardDeletedQueryObjects( contextID ); diff --git a/src/osgDB/ExternalFileWriter.cpp b/src/osgDB/ExternalFileWriter.cpp index c269f29ca..bc3eed5bf 100644 --- a/src/osgDB/ExternalFileWriter.cpp +++ b/src/osgDB/ExternalFileWriter.cpp @@ -32,9 +32,8 @@ static unsigned int countNbDirsUp(const std::string & path) // Algorithm: // - For each path component, count +1 for "..", 0 for ".", and -1 for anything else // - Ignore everything after the last ".." of the path. - if (osgDB::isAbsolutePath(path)) return 0; + if (isAbsolutePath(path)) return 0; int result(0), tempResult(0); - //for(osgDB::PathIterator it(path); it.valid(); ++it) std::vector pathElems; getPathElements(path, pathElems); for(std::vector::const_iterator it(pathElems.begin()), itEnd(pathElems.end()); it!=itEnd; ++it) @@ -131,12 +130,12 @@ inline const std::string & getFileName(const osg::Object & obj, WriteType type) inline bool doWrite(const osg::Object & obj, WriteType type, const std::string& fileName, const Options * options) { switch(type) { - case WRITE_TYPE_IMAGE: return osgDB::writeImageFile (static_cast(obj), fileName, options); - case WRITE_TYPE_HEIGHT_FIELD: return osgDB::writeHeightFieldFile(static_cast(obj), fileName, options); - case WRITE_TYPE_NODE: return osgDB::writeNodeFile (static_cast(obj), fileName, options); - case WRITE_TYPE_SHADER: return osgDB::writeShaderFile (static_cast(obj), fileName, options); - default: // WRITE_TYPE_OBJECT - return osgDB::writeObjectFile(obj, fileName, options); + case WRITE_TYPE_IMAGE: return writeImageFile (static_cast(obj), fileName, options); + case WRITE_TYPE_HEIGHT_FIELD: return writeHeightFieldFile(static_cast(obj), fileName, options); + case WRITE_TYPE_NODE: return writeNodeFile (static_cast(obj), fileName, options); + case WRITE_TYPE_SHADER: return writeShaderFile (static_cast(obj), fileName, options); + // WRITE_TYPE_OBJECT + default: return writeObjectFile(obj, fileName, options); } } @@ -154,7 +153,7 @@ ExternalFileWriter::ExternalFileWriter(const std::string & destDirectory) {} -bool ExternalFileWriter::write(const osg::Object & obj, const osgDB::Options * options, std::string * out_absolutePath, std::string * out_relativePath) +bool ExternalFileWriter::write(const osg::Object & obj, const Options * options, std::string * out_absolutePath, std::string * out_relativePath) { ObjectsSet::iterator it( _objects.find(&obj) ); if (it != _objects.end()) @@ -173,9 +172,9 @@ bool ExternalFileWriter::write(const osg::Object & obj, const osgDB::Options * o std::string absoluteSourcePath; if (_keepRelativePaths && !originalFileName.empty()) // if keepRelativePaths is false, absoluteSourcePath is not used, then we can skip this part { - if (osgDB::isAbsolutePath(originalFileName)) absoluteSourcePath = originalFileName; - else absoluteSourcePath = osgDB::concatPaths(_srcDirectory, originalFileName); - absoluteSourcePath = osgDB::getRealPath(osgDB::convertFileNameToNativeStyle(absoluteSourcePath)); // getRealPath() here is only used to canonize the path, not to add current directory in front of relative paths, hence the "concatPaths(_srcDirectory, ...)" just above + if (isAbsolutePath(originalFileName)) absoluteSourcePath = originalFileName; + else absoluteSourcePath = concatPaths(_srcDirectory, originalFileName); + absoluteSourcePath = getRealPath(convertFileNameToNativeStyle(absoluteSourcePath)); // getRealPath() here is only used to canonize the path, not to add current directory in front of relative paths, hence the "concatPaths(_srcDirectory, ...)" just above } // Compute destination paths from the source path @@ -192,23 +191,23 @@ bool ExternalFileWriter::write(const osg::Object & obj, const osgDB::Options * o if (_keepRelativePaths) { // We'll try to keep images relative path. - relativeDestinationPath = osgDB::getPathRelative(_srcDirectory, absoluteSourcePath); + relativeDestinationPath = getPathRelative(_srcDirectory, absoluteSourcePath); unsigned int nbDirsUp = countNbDirsUp(relativeDestinationPath); // TODO if nbDirsUp>nb dirs in _destDirectory, then issue a warning, and use simple file name - if (nbDirsUp > _allowUpDirs) relativeDestinationPath = osgDB::getSimpleFileName(absoluteSourcePath); + if (nbDirsUp > _allowUpDirs) relativeDestinationPath = getSimpleFileName(absoluteSourcePath); } else { // We keep only the simple file name. - relativeDestinationPath = osgDB::getSimpleFileName(absoluteSourcePath); + relativeDestinationPath = getSimpleFileName(absoluteSourcePath); } - absoluteDestinationPath = osgDB::getRealPath(osgDB::convertFileNameToNativeStyle( osgDB::concatPaths(_destDirectory, relativeDestinationPath) )); + absoluteDestinationPath = getRealPath(convertFileNameToNativeStyle( concatPaths(_destDirectory, relativeDestinationPath) )); // TODO Check for absolute paths collisions between multiple objects } // Write object bool written(false); - if (!osgDB::makeDirectoryForFile(absoluteDestinationPath)) + if (!makeDirectoryForFile(absoluteDestinationPath)) { OSG_NOTICE << "Can't create directory for file '" << absoluteDestinationPath << "'. May fail creating the image file." << std::endl; } @@ -250,7 +249,7 @@ void ExternalFileWriter::generateObjectName(std::string & out_relativePath, std: std::ostringstream oss; oss << FILE_PREFIX[type] << number << FILE_EXTENSION[type]; out_relativePath = oss.str(); - out_absolutePath = osgDB::concatPaths(_destDirectory, out_relativePath); + out_absolutePath = concatPaths(_destDirectory, out_relativePath); if (!absoluteObjectPathExists(out_absolutePath)) { diff --git a/src/osgPlugins/OpenFlight/expGeometryRecords.cpp b/src/osgPlugins/OpenFlight/expGeometryRecords.cpp index 9eb500e31..3bfb1ef4e 100644 --- a/src/osgPlugins/OpenFlight/expGeometryRecords.cpp +++ b/src/osgPlugins/OpenFlight/expGeometryRecords.cpp @@ -164,7 +164,7 @@ FltExportVisitor::writeFace( const osg::Geode& geode, const osg::Geometry& geom, if (c && (c->size() > 0)) { packedColorRaw = (*c)[0]; - transparency = flt::uint16((1. - packedColorRaw[3]) * (double)0xffff); + transparency = uint16((1. - packedColorRaw[3]) * (double)0xffff); } if ( isLit( geom ) ) @@ -370,7 +370,7 @@ FltExportVisitor::writeMesh( const osg::Geode& geode, const osg::Geometry& geom if (c && (c->size() > 0)) { packedColorRaw = (*c)[0]; - transparency = flt::uint16((1. - packedColorRaw[3]) * (double)0xffff); + transparency = uint16((1. - packedColorRaw[3]) * (double)0xffff); } if (isLit( geom ))