Commit ef285960 authored by Mike Kremer's avatar Mike Kremer
Browse files

Fixed source / target marking issue for multipass rendering.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@7800 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 81e4a43d
......@@ -48,6 +48,7 @@
const ACG::Vec4f base_color (0.6,0.6,0.6,1.0);
const ACG::Vec4f source_color (0.6,0.6,1.0,1.0);
const ACG::Vec4f target_color (1.0,1.0,1.0,1.0);
const ACG::Vec4f source_target_color (0.6,1.0,1.0,1.0);
//******************************************************************************
......@@ -64,11 +65,16 @@ bool DefaultObjectMarker::stencilRefForObject(BaseObjectData * _obj, GLuint & _r
_reference = 2;
return true;
}
else if (_obj->target() && _obj->source())
else if (_obj->target() && !_obj->source())
{
_reference = 3;
return true;
}
else if (_obj->target() && _obj->source())
{
_reference = 4;
return true;
}
return false;
}
......@@ -87,6 +93,9 @@ bool DefaultObjectMarker::blendForStencilRefNumber(GLuint _reference, GLenum & _
_color = source_color;
return true;
case 3:
_color = target_color;
return true;
case 4:
_color = source_target_color;
return true;
default:
......
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