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

From Michael Platings, "the build is broken if you have the OSG_REF_PTR_IMPLICIT_OUTPUT_CONVERSION turned off - the attached files fix this."

Browse Source
This commit is contained in:
Robert Osfield 2010-11-22 17:37:35 +00:00
parent e36c4d3a3b
commit 78cdf41d53
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/Geometry.cpp
View File

@ -516,7 +516,7 @@ void Geometry::setPrimitiveSetList(const PrimitiveSetList& primitives)
{ {
for (unsigned int primitiveSetIndex=0;primitiveSetIndex<_primitives.size();++primitiveSetIndex) for (unsigned int primitiveSetIndex=0;primitiveSetIndex<_primitives.size();++primitiveSetIndex)
{ {
addElementBufferObjectIfRequired(_primitives[primitiveSetIndex]); addElementBufferObjectIfRequired(_primitives[primitiveSetIndex].get());
} }
} }

2
src/osgDB/DatabasePager.cpp
View File

@ -1020,7 +1020,7 @@ void DatabasePager::DatabaseThread::run()
OSG_NOTICE<<"Using IncrementalCompileOperation"<<std::endl; OSG_NOTICE<<"Using IncrementalCompileOperation"<<std::endl;
osgUtil::IncrementalCompileOperation::CompileSet* compileSet = new osgUtil::IncrementalCompileOperation::CompileSet(databaseRequest->_loadedModel.get()); osgUtil::IncrementalCompileOperation::CompileSet* compileSet = new osgUtil::IncrementalCompileOperation::CompileSet(databaseRequest->_loadedModel.get());
compileSet->_compileCompletedCallback = new DatabasePagerCompileCompletedCallback(_pager, databaseRequest); compileSet->_compileCompletedCallback = new DatabasePagerCompileCompletedCallback(_pager, databaseRequest.get());
_pager->_incrementalCompileOperation->add(compileSet); _pager->_incrementalCompileOperation->add(compileSet);

4
src/osgDB/ObjectWrapper.cpp
View File

@ -116,7 +116,7 @@ BaseSerializer* ObjectWrapper::getSerializer( const std::string& name )
for ( SerializerList::iterator itr=_serializers.begin(); itr!=_serializers.end(); ++itr ) for ( SerializerList::iterator itr=_serializers.begin(); itr!=_serializers.end(); ++itr )
{ {
if ( (*itr)->getName()==name ) if ( (*itr)->getName()==name )
return *itr; return itr->get();
} }
for ( StringList::const_iterator itr=_associates.begin(); itr!=_associates.end(); ++itr ) for ( StringList::const_iterator itr=_associates.begin(); itr!=_associates.end(); ++itr )
@ -134,7 +134,7 @@ BaseSerializer* ObjectWrapper::getSerializer( const std::string& name )
aitr!=assocWrapper->_serializers.end(); ++aitr ) aitr!=assocWrapper->_serializers.end(); ++aitr )
{ {
if ( (*aitr)->getName()==name ) if ( (*aitr)->getName()==name )
return *aitr; return aitr->get();
} }
} }
return NULL; return NULL;

4
src/osgUtil/IncrementalCompileOperation.cpp
View File

@ -226,7 +226,7 @@ void CompileOperator::runTimingTests(osg::RenderInfo& renderInfo)
unsigned int numVertices = pow(2.0,double(i)); unsigned int numVertices = pow(2.0,double(i));
osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO); osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO);
double size = geometry->getGLObjectSizeHint(); double size = geometry->getGLObjectSizeHint();
double time = timeCompile(renderInfo, geometry); double time = timeCompile(renderInfo, geometry.get());
OSG_NOTICE<<" numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl; OSG_NOTICE<<" numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl;
} }
} }
@ -239,7 +239,7 @@ void CompileOperator::runTimingTests(osg::RenderInfo& renderInfo)
unsigned int numVertices = pow(2.0,double(i)); unsigned int numVertices = pow(2.0,double(i));
osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO); osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO);
double size = geometry->getGLObjectSizeHint(); double size = geometry->getGLObjectSizeHint();
double time = timeCompile(renderInfo, geometry); double time = timeCompile(renderInfo, geometry.get());
OSG_NOTICE<<" numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl; OSG_NOTICE<<" numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl;
} }
} }