From 203e5f7ef80d0d3c9c089582debb14c10cd97544 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 2 Jun 2016 14:22:25 +0100 Subject: [PATCH] Removed redudent codepaths, standardizing on the most portable Texture2D path. --- src/osgDB/ReadFile.cpp | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/src/osgDB/ReadFile.cpp b/src/osgDB/ReadFile.cpp index 0afb5d777..700670ce6 100644 --- a/src/osgDB/ReadFile.cpp +++ b/src/osgDB/ReadFile.cpp @@ -226,39 +226,19 @@ osg::ref_ptr osgDB::readRefNodeFiles(osg::ArgumentParser& arguments,const // start the stream playing. imageStream->play(); - osg::ref_ptr pictureQuad = 0; + osg::ref_ptr pictureQuad = osg::createTexturedQuadGeometry(osg::Vec3(0.0f,0.0f,0.0f), + osg::Vec3(image->s(),0.0f,0.0f), + osg::Vec3(0.0f,0.0f,image->t()), + 0.0f, flip ? 1.0f : 0.0f , 1.0f, flip ? 0.0f : 1.0f); - bool useTextureRectangle = true; - if (useTextureRectangle) - { - pictureQuad = osg::createTexturedQuadGeometry(osg::Vec3(0.0f,0.0f,0.0f), - osg::Vec3(image->s(),0.0f,0.0f), - osg::Vec3(0.0f,0.0f,image->t()), - 0.0f, flip ? image->t() : 0.0, image->s(), flip ? 0.0 : image->t()); + pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0, + new osg::Texture2D(image.get()), + osg::StateAttribute::ON); - pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0, - new osg::TextureRectangle(image.get()), - osg::StateAttribute::ON); - } - else - { - pictureQuad = osg::createTexturedQuadGeometry(osg::Vec3(0.0f,0.0f,0.0f), - osg::Vec3(image->s(),0.0f,0.0f), - osg::Vec3(0.0f,0.0f,image->t()), - 0.0f, flip ? 1.0f : 0.0f , 1.0f, flip ? 0.0f : 1.0f); - pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0, - new osg::Texture2D(image.get()), - osg::StateAttribute::ON); - } - - if (pictureQuad.valid()) - { - osg::ref_ptr geode = new osg::Geode; - geode->addDrawable(pictureQuad.get()); - nodeList.push_back(geode.get()); - - } + osg::ref_ptr geode = new osg::Geode; + geode->addDrawable(pictureQuad.get()); + nodeList.push_back(geode.get()); } else if (image.valid()) {