From ad8f2d8974984993e4e3220b5cd6d8583cdfa020 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Jun 2009 10:39:39 +0000 Subject: [PATCH] Changed build OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to ON and then fixed all the resulting build errors. --- applications/present3D/ReaderWriterP3D.cpp | 4 ++-- applications/present3D/ReaderWriterPaths.cpp | 6 +++--- .../osgshadercompositor/VirtualProgram.cpp | 4 ++-- examples/osgterrain/osgterrain.cpp | 8 ++++---- include/osgAnimation/StatsVisitor | 2 +- include/osgDB/DatabaseRevisions | 2 +- src/osgAnimation/Action.cpp | 2 +- src/osgAnimation/ActionVisitor.cpp | 2 +- src/osgAnimation/StatsHandler.cpp | 20 +++++++++---------- src/osgAnimation/Timeline.cpp | 8 ++++---- src/osgPlugins/dae/daeReader.cpp | 2 +- src/osgPlugins/p3d/ReaderWriterP3D.cpp | 4 ++-- src/osgPlugins/p3d/ReaderWriterPaths.cpp | 6 +++--- .../revisions/ReaderWriterRevisions.cpp | 8 ++++---- src/osgPlugins/vrml/ReaderWriterVRML2.cpp | 10 +++++----- src/osgPlugins/vrml/ReaderWriterVRML2.h | 2 +- src/osgPlugins/zip/ReaderWriterZIP.cpp | 6 +++--- 17 files changed, 48 insertions(+), 48 deletions(-) diff --git a/applications/present3D/ReaderWriterP3D.cpp b/applications/present3D/ReaderWriterP3D.cpp index 15e5af413..199871e5d 100644 --- a/applications/present3D/ReaderWriterP3D.cpp +++ b/applications/present3D/ReaderWriterP3D.cpp @@ -1710,7 +1710,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(const std::string& input.open(fileName); input.readAllDataIntoBuffer(); - return readNode(input, local_opt); + return readNode(input, local_opt.get()); } osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(std::istream& fin, const Options* options) const @@ -1723,7 +1723,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(std::istream& fin, //local_opt->setFindFileCallback(new MyFindFileCallback); local_opt->setReadFileCallback(new MyReadFileCallback); - return readNode(input, local_opt); + return readNode(input, local_opt.get()); } osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(osgDB::XmlNode::Input& input, osgDB::ReaderWriter::Options* options) const diff --git a/applications/present3D/ReaderWriterPaths.cpp b/applications/present3D/ReaderWriterPaths.cpp index 48ad786d3..d5e79d9ca 100644 --- a/applications/present3D/ReaderWriterPaths.cpp +++ b/applications/present3D/ReaderWriterPaths.cpp @@ -93,7 +93,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(const std::string& std::ifstream input(fileName.c_str()); - return readObject(input, local_opt); + return readObject(input, local_opt.get()); } osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(std::istream& fin, const osgDB::Options* options) const @@ -234,12 +234,12 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_rotation_path(std::istre localValue.azim = currValue.azim *r + prevValue.azim * (1.0f-r); localValue.elevation = currValue.elevation *r + prevValue.elevation * (1.0f-r); - localValue.addToPath(animation); + localValue.addToPath(animation.get()); } } else { - currValue.addToPath(animation); + currValue.addToPath(animation.get()); } prevValue = currValue; first = false; diff --git a/examples/osgshadercompositor/VirtualProgram.cpp b/examples/osgshadercompositor/VirtualProgram.cpp index 57fb5a0e5..2a6623596 100644 --- a/examples/osgshadercompositor/VirtualProgram.cpp +++ b/examples/osgshadercompositor/VirtualProgram.cpp @@ -68,7 +68,7 @@ osg::Shader * VirtualProgram::setShader shaderCurrent = shaderNew; } - return shaderCurrent; + return shaderCurrent.release(); } //////////////////////////////////////////////////////////////////////////////// void VirtualProgram::apply( osg::State & state ) const @@ -170,7 +170,7 @@ void VirtualProgram::apply( osg::State & state ) const #endif } - state.applyAttribute( program ); + state.applyAttribute( program.get() ); } else { Program::apply( state ); } diff --git a/examples/osgterrain/osgterrain.cpp b/examples/osgterrain/osgterrain.cpp index 5570c6a26..3c1a20997 100644 --- a/examples/osgterrain/osgterrain.cpp +++ b/examples/osgterrain/osgterrain.cpp @@ -93,14 +93,14 @@ public: // osg::notify(osg::NOTICE)<<"LoadAndCompileOperation "<<_filename< compileSet = - new osgUtil::IncrementalCompileOperation::CompileSet(_loadedModel); - + new osgUtil::IncrementalCompileOperation::CompileSet(_loadedModel.get()); + compileSet->_compileCompletedCallback = new ReleaseBlockOnCompileCompleted(_block.get()); - + _incrementalCompileOperation->add(compileSet.get()); } else diff --git a/include/osgAnimation/StatsVisitor b/include/osgAnimation/StatsVisitor index fc09a4c82..5c6d60c54 100644 --- a/include/osgAnimation/StatsVisitor +++ b/include/osgAnimation/StatsVisitor @@ -36,7 +36,7 @@ namespace osgAnimation StatsActionVisitor(osg::Stats* stats, unsigned int frame); void reset(); const std::vector& getChannels() const { return _channels; } - osg::Stats* getStats() { return _stats; } + osg::Stats* getStats() { return _stats.get(); } void setStats(osg::Stats* stats) { _stats = stats; } void setFrame(unsigned int frame) { _frame = frame; } void apply(Timeline& action); diff --git a/include/osgDB/DatabaseRevisions b/include/osgDB/DatabaseRevisions index 810b39df0..ba33dc144 100644 --- a/include/osgDB/DatabaseRevisions +++ b/include/osgDB/DatabaseRevisions @@ -105,7 +105,7 @@ class OSGDB_EXPORT DatabaseRevisions : public osg::Object void addRevision(DatabaseRevision* revision); void removeRevision(DatabaseRevision* revision); - DatabaseRevision* getDatabaseRevision(unsigned int i) { return i<_revisionList.size() ? _revisionList[i] : 0; } + DatabaseRevision* getDatabaseRevision(unsigned int i) { return i<_revisionList.size() ? _revisionList[i].get() : 0; } DatabaseRevisionList& getDatabaseRevisionList() { return _revisionList; } const DatabaseRevisionList& getDatabaseRevisionList() const { return _revisionList; } diff --git a/src/osgAnimation/Action.cpp b/src/osgAnimation/Action.cpp index 4df412509..fededdf97 100644 --- a/src/osgAnimation/Action.cpp +++ b/src/osgAnimation/Action.cpp @@ -26,7 +26,7 @@ osgAnimation::Action::Callback* osgAnimation::Action::getFrameCallback(unsigned { if (_framesCallback.find(frame) != _framesCallback.end()) { - return _framesCallback[frame]; + return _framesCallback[frame].get(); } return 0; } diff --git a/src/osgAnimation/ActionVisitor.cpp b/src/osgAnimation/ActionVisitor.cpp index acd2d7137..f431be2d8 100644 --- a/src/osgAnimation/ActionVisitor.cpp +++ b/src/osgAnimation/ActionVisitor.cpp @@ -146,7 +146,7 @@ void osgAnimation::ClearActionVisitor::apply(Timeline& tm) _remove.clear(); tm.traverse(*this); for (int i = 0; i < (int)_remove.size(); i++) - tm.removeAction(_remove[i]); + tm.removeAction(_remove[i].get()); } void osgAnimation::ClearActionVisitor::apply(Action& action) { diff --git a/src/osgAnimation/StatsHandler.cpp b/src/osgAnimation/StatsHandler.cpp index ceb7897bd..8ef2e7b2c 100644 --- a/src/osgAnimation/StatsHandler.cpp +++ b/src/osgAnimation/StatsHandler.cpp @@ -377,7 +377,7 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback timeLabelValue->setPosition(pos + osg::Vec3(startBlocks, 0,0)); timeLabelValue->setText("0.0"); - timeLabelValue->setDrawCallback(new ValueTextDrawCallback(stats,"Timeline")); + timeLabelValue->setDrawCallback(new ValueTextDrawCallback(stats.get(),"Timeline")); } } { @@ -389,11 +389,11 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback _statsWidth - 2 * backgroundMargin, (3 + 4.5 * 1) * characterSize + 2 * backgroundMargin, backgroundColor); - geode->addDrawable(_background); + geode->addDrawable(_background.get()); _group->addChild(geode); } - return _group; + return _group.get(); } virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) @@ -435,7 +435,7 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback if (_actions.find(name) == _actions.end()) { osg::Vec4 color(getRandomValueinRange(255)/255.0, getRandomValueinRange(255)/255.0, getRandomValueinRange(255)/255.0, 1.0); _actions[name].init(visitor->getStats(), name, pos, width, height, color); - _group->addChild(_actions[name]._group); + _group->addChild(_actions[name]._group.get()); //_actions[name].touch(); } else { _actions[name].setPosition(pos); @@ -624,7 +624,7 @@ void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer) _camera->setAllowEventFocus(false); _camera->setCullMask(0x1); osgViewer::Viewer* v = dynamic_cast(viewer); - v->getSceneData()->asGroup()->addChild(_camera); + v->getSceneData()->asGroup()->addChild(_camera.get()); _initialized = true; } @@ -647,11 +647,11 @@ void StatsHandler::setUpScene(osgViewer::Viewer* viewer) _group = new osg::Group; _camera->addChild(_switch.get()); - _switch->addChild(_group); + _switch->addChild(_group.get()); for (int i = 0; i < (int)finder._timelines.size(); i++) { StatsTimeline* s = new StatsTimeline; - osg::MatrixTransform* m = s->createStatsForTimeline(finder._timelines[i]); + osg::MatrixTransform* m = s->createStatsForTimeline(finder._timelines[i].get()); m->setUpdateCallback(s); _group->addChild(m); } @@ -671,7 +671,7 @@ void StatAction::init(osg::Stats* stats, const std::string& name, const osg::Vec _label = new osg::Geode; _textLabel = new osgText::Text; - _label->addDrawable(_textLabel); + _label->addDrawable(_textLabel.get()); _textLabel->setDataVariance(osg::Object::DYNAMIC); _textLabel->setColor(color); _textLabel->setFont(font); @@ -684,8 +684,8 @@ void StatAction::init(osg::Stats* stats, const std::string& name, const osg::Vec graph->addStatGraph(stats, stats, color, 1.0, name); _graph = graph; - _group->addChild(_label); - _group->addChild(_graph); + _group->addChild(_label.get()); + _group->addChild(_graph.get()); } void StatAction::setAlpha(float v) { diff --git a/src/osgAnimation/Timeline.cpp b/src/osgAnimation/Timeline.cpp index c3f9a183c..2248adeb7 100644 --- a/src/osgAnimation/Timeline.cpp +++ b/src/osgAnimation/Timeline.cpp @@ -71,9 +71,9 @@ void osgAnimation::Timeline::traverse(ActionVisitor& visitor) void osgAnimation::Timeline::setStats(osg::Stats* stats) { _stats = stats;} -osg::Stats* osgAnimation::Timeline::getStats() { return _stats;} +osg::Stats* osgAnimation::Timeline::getStats() { return _stats.get();} void osgAnimation::Timeline::collectStats(bool state) { _collectStats = state;} -osgAnimation::StatsActionVisitor* osgAnimation::Timeline::getStatsVisitor() { return _statsVisitor; } +osgAnimation::StatsActionVisitor* osgAnimation::Timeline::getStatsVisitor() { return _statsVisitor.get(); } void osgAnimation::Timeline::clearActions() { @@ -98,7 +98,7 @@ void osgAnimation::Timeline::update(double simulationTime) { if (!_statsVisitor) _statsVisitor = new osgAnimation::StatsActionVisitor(); - _statsVisitor->setStats(_stats); + _statsVisitor->setStats(_stats.get()); _statsVisitor->setFrame(_currentFrame); _statsVisitor->reset(); accept(*_statsVisitor); @@ -123,7 +123,7 @@ void osgAnimation::Timeline::update(double simulationTime) { if (!_statsVisitor) _statsVisitor = new StatsActionVisitor; - _statsVisitor->setStats(_stats); + _statsVisitor->setStats(_stats.get()); _statsVisitor->setFrame(_currentFrame); _statsVisitor->reset(); accept(*_statsVisitor); diff --git a/src/osgPlugins/dae/daeReader.cpp b/src/osgPlugins/dae/daeReader.cpp index f4615dffd..34d6cc935 100644 --- a/src/osgPlugins/dae/daeReader.cpp +++ b/src/osgPlugins/dae/daeReader.cpp @@ -161,7 +161,7 @@ osg::Node* daeReader::processVisualScene( domVisual_scene *scene ) } } } - retVal->setStateSet(_rootStateSet); + retVal->setStateSet(_rootStateSet.get()); return retVal; } diff --git a/src/osgPlugins/p3d/ReaderWriterP3D.cpp b/src/osgPlugins/p3d/ReaderWriterP3D.cpp index 6ffb86edb..14eafef2a 100644 --- a/src/osgPlugins/p3d/ReaderWriterP3D.cpp +++ b/src/osgPlugins/p3d/ReaderWriterP3D.cpp @@ -1710,7 +1710,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(const std::string& input.open(fileName); input.readAllDataIntoBuffer(); - return readNode(input, local_opt); + return readNode(input, local_opt.get()); } osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(std::istream& fin, const Options* options) const @@ -1723,7 +1723,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(std::istream& fin, //local_opt->setFindFileCallback(new MyFindFileCallback); local_opt->setReadFileCallback(new MyReadFileCallback); - return readNode(input, local_opt); + return readNode(input, local_opt.get()); } osgDB::ReaderWriter::ReadResult ReaderWriterP3DXML::readNode(osgDB::XmlNode::Input& input, osgDB::ReaderWriter::Options* options) const diff --git a/src/osgPlugins/p3d/ReaderWriterPaths.cpp b/src/osgPlugins/p3d/ReaderWriterPaths.cpp index 48ad786d3..d5e79d9ca 100644 --- a/src/osgPlugins/p3d/ReaderWriterPaths.cpp +++ b/src/osgPlugins/p3d/ReaderWriterPaths.cpp @@ -93,7 +93,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(const std::string& std::ifstream input(fileName.c_str()); - return readObject(input, local_opt); + return readObject(input, local_opt.get()); } osgDB::ReaderWriter::ReadResult ReaderWriterPaths::readObject(std::istream& fin, const osgDB::Options* options) const @@ -234,12 +234,12 @@ osgDB::ReaderWriter::ReadResult ReaderWriterPaths::read_rotation_path(std::istre localValue.azim = currValue.azim *r + prevValue.azim * (1.0f-r); localValue.elevation = currValue.elevation *r + prevValue.elevation * (1.0f-r); - localValue.addToPath(animation); + localValue.addToPath(animation.get()); } } else { - currValue.addToPath(animation); + currValue.addToPath(animation.get()); } prevValue = currValue; first = false; diff --git a/src/osgPlugins/revisions/ReaderWriterRevisions.cpp b/src/osgPlugins/revisions/ReaderWriterRevisions.cpp index 61fa09137..e925a77b8 100644 --- a/src/osgPlugins/revisions/ReaderWriterRevisions.cpp +++ b/src/osgPlugins/revisions/ReaderWriterRevisions.cpp @@ -126,15 +126,15 @@ class ReaderWriterFreeType : public osgDB::ReaderWriter if (ext=="added") { - dbRevision->setFilesAdded(fileList); + dbRevision->setFilesAdded(fileList.get()); } else if (ext=="removed") { - dbRevision->setFilesRemoved(fileList); + dbRevision->setFilesRemoved(fileList.get()); } else if (ext=="modified") { - dbRevision->setFilesModified(fileList); + dbRevision->setFilesModified(fileList.get()); } } } @@ -144,7 +144,7 @@ class ReaderWriterFreeType : public osgDB::ReaderWriter itr != revisionMap.end(); ++itr) { - revisions->addRevision(itr->second); + revisions->addRevision(itr->second.get()); } return revisions.get(); diff --git a/src/osgPlugins/vrml/ReaderWriterVRML2.cpp b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp index 8bc82b2e6..85ebdb4e8 100644 --- a/src/osgPlugins/vrml/ReaderWriterVRML2.cpp +++ b/src/osgPlugins/vrml/ReaderWriterVRML2.cpp @@ -214,7 +214,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string &f for (unsigned i = 0; i < mfn.size(); i++) { openvrml::node *vrml_node = mfn[i].get(); - osg_root->addChild(convertFromVRML(vrml_node).get()); + osg_root->addChild(convertFromVRML(vrml_node)); } osgDB::getDataFilePathList().pop_front(); return osg_root.get(); @@ -225,7 +225,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string &f catch (std::invalid_argument) { return ReadResult::FILE_NOT_HANDLED; } } -osg::ref_ptr ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) const +osg::Node* ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) const { //static int osgLightNum = 0; //light @@ -285,7 +285,7 @@ osg::ref_ptr ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) for (it_npv = node_ptr_vector.begin(); it_npv != node_ptr_vector.end(); it_npv++) { openvrml::node *node = (*(it_npv)).get(); - osg_m->addChild(convertFromVRML(node).get()); + osg_m->addChild(convertFromVRML(node)); } } } @@ -294,7 +294,7 @@ osg::ref_ptr ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) // no children } - return osg_m.get(); + return osg_m.release(); } @@ -467,7 +467,7 @@ osg::ref_ptr ReaderWriterVRML2::convertFromVRML(openvrml::node *obj) } } - return osg_geode.get(); + return osg_geode.release(); } else { diff --git a/src/osgPlugins/vrml/ReaderWriterVRML2.h b/src/osgPlugins/vrml/ReaderWriterVRML2.h index 615530ad6..bc382160e 100644 --- a/src/osgPlugins/vrml/ReaderWriterVRML2.h +++ b/src/osgPlugins/vrml/ReaderWriterVRML2.h @@ -83,7 +83,7 @@ private: typedef std::map > ConeLibrary; typedef std::map > CylinderLibrary; - osg::ref_ptr convertFromVRML(openvrml::node *obj) const; + osg::Node* convertFromVRML(openvrml::node *obj) const; osg::ref_ptr convertVRML97IndexedFaceSet(openvrml::node *vrml_ifs) const; diff --git a/src/osgPlugins/zip/ReaderWriterZIP.cpp b/src/osgPlugins/zip/ReaderWriterZIP.cpp index 34058ff2c..08946dcc2 100644 --- a/src/osgPlugins/zip/ReaderWriterZIP.cpp +++ b/src/osgPlugins/zip/ReaderWriterZIP.cpp @@ -71,7 +71,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter local_opt->getDatabasePathList().push_front(osgDB::getFilePath(file)); // Now pass through to memory zip handler - rresult = readNode(tmpStrmBuffer,local_opt); + rresult = readNode(tmpStrmBuffer,local_opt.get()); // Clean up options local_opt->getDatabasePathList().pop_front(); @@ -81,7 +81,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter return rresult; } - virtual ReadResult readNode(std::istream& fin,const osgDB::Options* options =NULL) const + virtual ReadResult readNode(std::istream& fin,const osgDB::Options* options) const { ReadResult result = ReadResult(ReadResult::FILE_NOT_HANDLED); @@ -145,7 +145,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter local_opt->setPluginStringData("STREAM_FILENAME",osgDB::getSimpleFileName(StreamName)); - result = rw->readNode(buffer,local_opt); + result = rw->readNode(buffer,local_opt.get()); if (result.validNode()) { grp->addChild( result.takeNode() );