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

Added suppor for StateSet::DefineList

Browse Source
This commit is contained in:
Robert Osfield 2017-12-01 13:00:42 +00:00
parent 8bf575df2f
commit c84ad74fa9
1 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/osgPlugins/lua/LuaScriptEngine.cpp
View File

@ -755,19 +755,44 @@ static int callStateSetSet(lua_State* _lua)
}
else if (lua_type(_lua,2)==LUA_TSTRING)
{
std::string modeString = lua_tostring(_lua, 2);
GLenum mode = lse->lookUpGLenumValue(modeString);
std::string key = lua_tostring(_lua, 2);
GLenum mode = lse->lookUpGLenumValue(key);
if (n>=3)
{
osg::StateAttribute::OverrideValue value=osg::StateAttribute::ON;
bool setOnOff = false;
if (lua_type(_lua,3)==LUA_TSTRING)
if (mode)
{
value = convertStringToStateAttributeValue(lua_tostring(_lua, 3), value, setOnOff);
}
osg::StateAttribute::OverrideValue value=osg::StateAttribute::ON;
bool setOnOff = false;
if (lua_type(_lua,3)==LUA_TSTRING)
{
value = convertStringToStateAttributeValue(lua_tostring(_lua, 3), value, setOnOff);
}
stateset->setMode(mode, value);
return 0;
stateset->setMode(mode, value);
return 0;
}
else
{
std::string value;
if (lua_type(_lua,3)==LUA_TSTRING)
{
value = lua_tostring(_lua, 3);
}
stateset->setDefine(key, value);
}
}
else
{
if (mode)
{
osg::StateAttribute::OverrideValue value=osg::StateAttribute::ON;
stateset->setMode(mode, value);
return 0;
}
else
{
stateset->setDefine(key);
}
}
}
@ -982,6 +1007,19 @@ static int callStateSetGet(lua_State* _lua)
}
}
const osg::StateSet::DefineList& dl = stateset->getDefineList();
for(osg::StateSet::DefineList::const_iterator itr = dl.begin();
itr != dl.end();
++itr)
{
if (value == itr->first)
{
lua_pushstring(_lua, itr->second.first.c_str());
return 1;
}
}
OSG_NOTICE<<"Warning: StateSet:get("<<value<<") Could not find matching mode or attribute"<<std::endl;
lua_pushnil(_lua);
return 1;
@ -1116,6 +1154,18 @@ static int callStateSetRemove(lua_State* _lua)
}
}
const osg::StateSet::DefineList& dl = stateset->getDefineList();
for(osg::StateSet::DefineList::const_iterator itr = dl.begin();
itr != dl.end();
++itr)
{
if (value == itr->first)
{
stateset->removeDefine(value);
return 0;
}
}
osg::StateAttribute::GLMode mode = lse->lookUpGLenumValue(value);
const osg::StateSet::ModeList& ml = stateset->getModeList();
for(osg::StateSet::ModeList::const_iterator itr = ml.begin();