Fixed compile errors for when ref_ptr<> auto conversion is disabled
This commit is contained in:
parent
99313d225b
commit
d542961ca3
@ -103,7 +103,7 @@ createStateSet()
|
||||
osg::notify( osg::ALWAYS ) << "Can't open image file osg128.png" << std::endl;
|
||||
return( NULL );
|
||||
}
|
||||
osg::Texture2D* texLogo = new osg::Texture2D( iLogo );
|
||||
osg::Texture2D* texLogo = new osg::Texture2D( iLogo.get() );
|
||||
texLogo->setFilter( osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR );
|
||||
texLogo->setFilter( osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR );
|
||||
|
||||
@ -136,7 +136,7 @@ int main( int argc, char **argv )
|
||||
geom->setInitialBound( bb );
|
||||
// Add geometric data and the PrimitiveSet. Specify numInstances as 32*32 or 1024.
|
||||
createDAIGeometry( *geom, 32*32 );
|
||||
geode->addDrawable( geom );
|
||||
geode->addDrawable( geom.get() );
|
||||
|
||||
// Create a StateSet to render the instanced Geometry.
|
||||
osg::ref_ptr< osg::StateSet > ss = createStateSet();
|
||||
|
@ -1249,9 +1249,9 @@ int main( int argc, char **argv )
|
||||
|
||||
osg::ref_ptr<osgVolume::Volume> volume = new osgVolume::Volume;
|
||||
osg::ref_ptr<osgVolume::VolumeTile> tile = new osgVolume::VolumeTile;
|
||||
volume->addChild(tile);
|
||||
volume->addChild(tile.get());
|
||||
|
||||
osg::ref_ptr<osgVolume::Layer> layer = new osgVolume::ImageLayer(image_3d);
|
||||
osg::ref_ptr<osgVolume::Layer> layer = new osgVolume::ImageLayer(image_3d.get());
|
||||
|
||||
if (matrix)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user