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

Fixed build issues when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION is set to OFF

Browse Source
This commit is contained in:
Robert Osfield 2016-06-02 12:22:51 +01:00
parent 88a01aa09d
commit b1b7d17633
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/osgdeferred/osgdeferred.cpp
View File

@ -129,7 +129,7 @@ Pipeline createPipelinePlainOSG(
pass2->attach(osg::Camera::COLOR_BUFFER1, p.pass2Normals);
pass2->attach(osg::Camera::COLOR_BUFFER2, p.pass2Colors);
pass2->addChild(scene.get());
osg::StateSet *ss = setShaderProgram(pass2, "shaders/pass2.vert", "shaders/pass2.frag");
osg::ref_ptr<osg::StateSet> ss = setShaderProgram(pass2, "shaders/pass2.vert", "shaders/pass2.frag");
ss->setTextureAttributeAndModes(0, createTexture("Images/whitemetal_diffuse.jpg"));
ss->setTextureAttributeAndModes(1, createTexture("Images/whitemetal_normal.jpg"));
ss->addUniform(new osg::Uniform("diffMap", 0));
@ -284,7 +284,7 @@ void setAnimationPath(osg::ref_ptr<osg::MatrixTransform> node,
osg::AnimationPath::ControlPoint(pos, rot));
}
// Assign it.
node->setUpdateCallback(new osg::AnimationPathCallback(path));
node->setUpdateCallback(new osg::AnimationPathCallback(path.get()));
}
osg::ref_ptr<osg::StateSet> setShaderProgram(osg::ref_ptr<osg::Camera> pass,
@ -314,7 +314,7 @@ int main()
osg::ref_ptr<osgShadow::SoftShadowMap> shadowMap = new osgShadow::SoftShadowMap;
shadowMap->setJitteringScale(16);
shadowMap->addShader(osgDB::readShaderFile("shaders/pass1Shadow.frag"));
shadowMap->setLight(light);
shadowMap->setLight(light.get());
osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene = new osgShadow::ShadowedScene;
shadowedScene->setShadowTechnique(shadowMap.get());
shadowedScene->addChild(scene.get());

2
src/osg/OcclusionQueryNode.cpp
View File

@ -332,7 +332,7 @@ QueryGeometry::drawImplementation( osg::RenderInfo& renderInfo ) const
OSG_FATAL << "osgOQ: QG: Invalid RQCB." << std::endl;
return;
}
rqcb->add( tr );
rqcb->add( tr.get() );
OSG_DEBUG <<
"osgOQ: QG: Querying for: " << _oqnName << std::endl;