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

Fixed build issues when compiling with OSG_PROVIDE_READFILE to OFF

Browse Source
This commit is contained in:
Robert Osfield 2017-11-27 11:05:31 +00:00
parent 93a5213b99
commit a72a929d12
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/osgdeferred/osgdeferred.cpp
View File

@ -188,12 +188,12 @@ osg::ref_ptr<osg::Group> createSceneRoom()
{ {
// Room. // Room.
osg::ref_ptr<osg::MatrixTransform> room = new osg::MatrixTransform; osg::ref_ptr<osg::MatrixTransform> room = new osg::MatrixTransform;
osg::ref_ptr<osg::Node> roomModel = osgDB::readNodeFile("simpleroom.osgt"); osg::ref_ptr<osg::Node> roomModel = osgDB::readRefNodeFile("simpleroom.osgt");
room->addChild(roomModel); room->addChild(roomModel);
room->setMatrix(osg::Matrix::translate(0, 0, 1)); room->setMatrix(osg::Matrix::translate(0, 0, 1));
// Torus. // Torus.
osg::ref_ptr<osg::MatrixTransform> torus = new osg::MatrixTransform; osg::ref_ptr<osg::MatrixTransform> torus = new osg::MatrixTransform;
osg::ref_ptr<osg::Node> torusModel = osgDB::readNodeFile("torus.osgt"); osg::ref_ptr<osg::Node> torusModel = osgDB::readRefNodeFile("torus.osgt");
torus->addChild(torusModel); torus->addChild(torusModel);
setAnimationPath(torus, osg::Vec3(0, 0, 15), 6, 16); setAnimationPath(torus, osg::Vec3(0, 0, 15), 6, 16);
// Torus2. // Torus2.
@ -240,7 +240,7 @@ osg::Geode *createScreenQuad(float width,
osg::Texture2D *createTexture(const std::string &fileName) osg::Texture2D *createTexture(const std::string &fileName)
{ {
osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D; osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
texture->setImage(osgDB::readImageFile(fileName)); texture->setImage(osgDB::readRefImageFile(fileName));
texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::REPEAT); texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::REPEAT);
texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::REPEAT); texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::REPEAT);
texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR); texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
@ -292,8 +292,8 @@ osg::ref_ptr<osg::StateSet> setShaderProgram(osg::ref_ptr<osg::Camera> pass,
const std::string& frag) const std::string& frag)
{ {
osg::ref_ptr<osg::Program> program = new osg::Program; osg::ref_ptr<osg::Program> program = new osg::Program;
program->addShader(osgDB::readShaderFile(vert)); program->addShader(osgDB::readRefShaderFile(vert));
program->addShader(osgDB::readShaderFile(frag)); program->addShader(osgDB::readRefShaderFile(frag));
osg::ref_ptr<osg::StateSet> ss = pass->getOrCreateStateSet(); osg::ref_ptr<osg::StateSet> ss = pass->getOrCreateStateSet();
ss->setAttributeAndModes( ss->setAttributeAndModes(
program.get(), program.get(),
@ -313,7 +313,7 @@ int main()
// Shadowed scene. // Shadowed scene.
osg::ref_ptr<osgShadow::SoftShadowMap> shadowMap = new osgShadow::SoftShadowMap; osg::ref_ptr<osgShadow::SoftShadowMap> shadowMap = new osgShadow::SoftShadowMap;
shadowMap->setJitteringScale(16); shadowMap->setJitteringScale(16);
shadowMap->addShader(osgDB::readShaderFile("shaders/pass1Shadow.frag")); shadowMap->addShader(osgDB::readRefShaderFile("shaders/pass1Shadow.frag"));
shadowMap->setLight(light.get()); shadowMap->setLight(light.get());
osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene = new osgShadow::ShadowedScene; osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene = new osgShadow::ShadowedScene;
shadowedScene->setShadowTechnique(shadowMap.get()); shadowedScene->setShadowTechnique(shadowMap.get());

4
examples/osgtext3D/osgtext3D.cpp
View File

@ -250,7 +250,9 @@ int main(int argc, char** argv)
} }
if (arguments.read("--add-axes")) if (arguments.read("--add-axes"))
group->addChild(osgDB::readNodeFile("axes.osgt")); {
group->addChild(osgDB::readRefNodeFile("axes.osgt"));
}
std::string mode; std::string mode;
if (arguments.read("--character-size-mode", mode)) if (arguments.read("--character-size-mode", mode))

2
examples/osgviewerFLTK/osgviewerFLTK.cpp
View File

@ -140,7 +140,7 @@ int main( int argc, char **argv )
osg::ArgumentParser arguments(&argc, argv); osg::ArgumentParser arguments(&argc, argv);
// load the scene. // load the scene.
osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments); osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
if (!loadedModel) if (!loadedModel)
{ {
std::cout << argv[0] <<": No data loaded." << std::endl; std::cout << argv[0] <<": No data loaded." << std::endl;