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

Merge pull request #444 from mp3butcher/osgSampler2

Browse Source 
Osg sampler2  add static helper func in order to generate Samplers of a Samplerless StateSet
This commit is contained in:
OpenSceneGraph git repository
2018-01-14 13:25:23 +00:00
committed by GitHub
parent a6a72755b8 4c0a861f91
commit 1946ff652d
2 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/osg/Sampler.cpp
View File

@@ -225,13 +225,14 @@ void Sampler::compileGLObjects(State& state) const
extensions->glSamplerParameterf(samplerobject, GL_TEXTURE_MAX_ANISOTROPY_EXT, _maxAnisotropy);
}
if(_maxlod - _minlod > 0)
if(_maxlod - _minlod >= 0)
{ // if range is valid
extensions->glSamplerParameterf(samplerobject, GL_TEXTURE_MIN_LOD, _minlod);
extensions->glSamplerParameterf(samplerobject, GL_TEXTURE_MAX_LOD, _maxlod);
}
extensions->glSamplerParameterf(samplerobject, GL_TEXTURE_LOD_BIAS, _lodbias);
_PCdirtyflags[contextID]=false;
}
}
@@ -244,7 +245,7 @@ void Sampler::apply(State&state) const
unsigned int contextID = state.getContextID();
if( _PCdirtyflags[contextID] )
compileGLObjects(state);
state.get<GLExtensions>()->glBindSampler( state.getActiveTextureUnit(), _PCsampler[contextID] );
}
@@ -274,3 +275,48 @@ int Sampler::compare(const StateAttribute& sa) const
COMPARE_StateAttribute_Parameter(_lodbias)
return 0; // passed all the above comparison macros, must be equal.
}
void Sampler::generateSamplerObjects(StateSet& ss)
{
const osg::StateSet::TextureAttributeList& texAttributes = ss.getTextureAttributeList();
for(unsigned int unit=0; unit<texAttributes.size(); ++unit)
{
StateSet::RefAttributePair attmode;
Sampler * sampler = 0;
const StateSet::AttributeList& tex_attributes = texAttributes[unit];
for(StateSet::AttributeList::const_iterator aitr = tex_attributes.begin();
aitr!=tex_attributes.end();
++aitr)
{
if( aitr->second.first.get()->getType() != StateAttribute::TEXTURE )
{
if( aitr->second.first.get()->getType() == StateAttribute::SAMPLER)
sampler = static_cast< Sampler* > (aitr->second.first.get());
}
else attmode= aitr->second;
}
if( attmode.first.valid() )
{
if( !sampler )
{
///create new Sampler and add it to this
sampler = new Sampler();
Texture * tex = attmode.first->asTexture();
sampler->setFilter( Texture::MIN_FILTER, tex->getFilter(Texture::MIN_FILTER) );
sampler->setFilter( Texture::MAG_FILTER, tex->getFilter(Texture::MAG_FILTER) );
sampler->setWrap( Texture::WRAP_S, tex->getWrap(Texture::WRAP_S) );
sampler->setWrap( Texture::WRAP_T, tex->getWrap(Texture::WRAP_T) );
sampler->setWrap( Texture::WRAP_R, tex->getWrap(Texture::WRAP_R) );
sampler->setMaxAnisotropy( tex->getMaxAnisotropy() );
sampler->setShadowCompareFunc( tex->getShadowCompareFunc() );
//sampler->setShadowTextureMode( tex->getShadowTextureMode() ); default LUMINANCE tex param incompatible with default NONE Sampler param
sampler->setBorderColor( tex->getBorderColor() );
sampler->setLODBias( tex->getLODBias() );
sampler->setMinLOD( tex->getMinLOD() );
sampler->setMaxLOD( tex->getMaxLOD() );
ss.setTextureAttributeAndModes(unit,sampler,attmode.second);
}
}
}
}