Commit 21c0f761 authored by Jan Möbius's avatar Jan Möbius

Tried to fix doxygen warning

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15780 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9c3298c1
......@@ -58,10 +58,6 @@
namespace ACG
{
using namespace SceneGraph;
void RenderObject::initFromState( GLState* _glState )
{
culling = true;
......@@ -115,7 +111,7 @@ void RenderObject::initFromState( GLState* _glState )
}
}
void RenderObject::setupShaderGenFromDrawmode( const DrawModes::DrawModeProperties* _props )
void RenderObject::setupShaderGenFromDrawmode( const SceneGraph::DrawModes::DrawModeProperties* _props )
{
if (_props)
{
......@@ -123,21 +119,27 @@ void RenderObject::setupShaderGenFromDrawmode( const DrawModes::DrawModeProperti
shaderDesc.textured = _props->textured();
shaderDesc.numLights = _props->lighting() ? 0 : -1;
switch (_props->lightStage())
{
case DrawModes::LIGHTSTAGE_SMOOTH: shaderDesc.shadeMode = SG_SHADE_GOURAUD; break;;
case DrawModes::LIGHTSTAGE_PHONG: shaderDesc.shadeMode = SG_SHADE_PHONG; break;;
case DrawModes::LIGHTSTAGE_UNLIT: shaderDesc.shadeMode = SG_SHADE_UNLIT; break;;
default: break;
switch (_props->lightStage()) {
case SceneGraph::DrawModes::LIGHTSTAGE_SMOOTH:
shaderDesc.shadeMode = SG_SHADE_GOURAUD;
break;
case SceneGraph::DrawModes::LIGHTSTAGE_PHONG:
shaderDesc.shadeMode = SG_SHADE_PHONG;
break;
case SceneGraph::DrawModes::LIGHTSTAGE_UNLIT:
shaderDesc.shadeMode = SG_SHADE_UNLIT;
break;
default:
break;
}
if (_props->flatShaded())
shaderDesc.shadeMode = SG_SHADE_FLAT;
if (_props->primitive() == DrawModes::PRIMITIVE_WIREFRAME ||
_props->primitive() == DrawModes::PRIMITIVE_HIDDENLINE ||
_props->primitive() == DrawModes::PRIMITIVE_EDGE ||
_props->primitive() == DrawModes::PRIMITIVE_HALFEDGE)
if (_props->primitive() == SceneGraph::DrawModes::PRIMITIVE_WIREFRAME ||
_props->primitive() == SceneGraph::DrawModes::PRIMITIVE_HIDDENLINE ||
_props->primitive() == SceneGraph::DrawModes::PRIMITIVE_EDGE ||
_props->primitive() == SceneGraph::DrawModes::PRIMITIVE_HALFEDGE)
shaderDesc.shadeMode = SG_SHADE_UNLIT;
}
}
......@@ -247,4 +249,5 @@ QString RenderObject::toString() const
} // namespace ACG end
\ No newline at end of file
} // namespace ACG end
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