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

Introduced new shader composition approach that utilizes #pragma requires(), #pragma import_defines() and #ifdef in GLSL to enable multiple different versions of shaders based

Browse Source 
on defines passed in from osg::StateSet::setDefine(..).



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14681 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-02-10 17:04:02 +00:00
parent bb637e73f3
commit b90503fdf5
14 changed files with 910 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/osg/StateSet.cpp
View File

@@ -178,6 +178,8 @@ StateSet::StateSet(const StateSet& rhs,const CopyOp& copyop):Object(rhs,copyop),
}
}
_defineList = rhs._defineList;
_renderingHint = rhs._renderingHint;
_binMode = rhs._binMode;
@@ -1129,6 +1131,27 @@ const StateSet::RefUniformPair* StateSet::getUniformPair(const std::string& name
else return 0;
}
void StateSet::setDefine(const std::string& defineName, StateAttribute::OverrideValue value)
{
DefinePair& dp = _defineList[defineName];
dp.first = "";
dp.second = value;
}
void StateSet::setDefine(const std::string& defineName, const std::string& defineValue, StateAttribute::OverrideValue value)
{
DefinePair& dp = _defineList[defineName];
dp.first = defineValue;
dp.second = value;
}
void StateSet::removeDefine(const std::string& defineName)
{
DefineList::iterator itr = _defineList.find(defineName);
if (itr != _defineList.end()) _defineList.erase(itr);
}
void StateSet::setTextureMode(unsigned int unit,StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
{
if (getTextureGLModeSet().isTextureMode(mode))