Commit 751b2024 authored by Jan Möbius's avatar Jan Möbius
Browse files

Added additional overlay color to material stuff and glstate

The overlay color should be used for overlays such as wireframe over flat shaded meshes.

closes #1369

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16052 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 138a046d
......@@ -100,6 +100,9 @@ void INIPlugin::parseIniFile(INIFile& _ini, BaseObjectData* _object) {
if ( _ini.get_entryVecf( col, _object->name() , "SpecularColor" ) )
_object->materialNode()->set_specular_color(col);
if ( _ini.get_entryVecf( col, _object->name() , "OverlayColor" ) )
_object->materialNode()->set_overlay_color(col);
double shininess;
if ( _ini.get_entry( shininess, _object->name() , "Shininess" ) )
_object->materialNode()->set_shininess(shininess);
......@@ -141,6 +144,9 @@ void INIPlugin::saveIniFile(INIFile& _ini, BaseObjectData* _object) {
_ini.add_entryVec( _object->name() ,
"SpecularColor" ,
_object->materialNode()->specular_color());
_ini.add_entryVec( _object->name() ,
"OverlayColor" ,
_object->materialNode()->overlay_color());
_ini.add_entry( _object->name() ,
"Shininess" ,
_object->materialNode()->shininess());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment