FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improove texture sharing.

Browse Source
This commit is contained in:
frohlich
2007-11-09 05:55:50 +00:00
parent cd9e3648e9
commit 084a24e958
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simgear/scene/model/model.cxx
View File

@@ -136,6 +136,9 @@ public:
if (!texture) if (!texture)
return; return;
// Hmm, true??
texture->setDataVariance(osg::Object::STATIC);
osg::Image* image = texture->getImage(0); osg::Image* image = texture->getImage(0);
if (!image) if (!image)
return; return;
@@ -379,6 +382,7 @@ SGLoadTexture2D(const std::string& path, bool wrapu, bool wrapv, int)
osg::Image* image = osgDB::readImageFile(path); osg::Image* image = osgDB::readImageFile(path);
osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D; osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
texture->setImage(image); texture->setImage(image);
texture->setDataVariance(osg::Object::STATIC);
if (wrapu) if (wrapu)
texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT); texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
else else
@@ -408,7 +412,7 @@ SGLoadTexture2D(const std::string& path, bool wrapu, bool wrapv, int)
// OSGFIXME: don't forget that mutex here // OSGFIXME: don't forget that mutex here
osgDB::Registry* registry = osgDB::Registry::instance(); osgDB::Registry* registry = osgDB::Registry::instance();
registry->getOrCreateSharedStateManager()->share(tmpNode.get(), 0); registry->getSharedStateManager()->share(tmpNode.get(), 0);
// should be the same, but be paranoid ... // should be the same, but be paranoid ...
stateSet = tmpNode->getStateSet(); stateSet = tmpNode->getStateSet();