Commit 09374f38 authored by Jan Möbius's avatar Jan Möbius

Dennis: Let stencil stuff work on BaseObjectData

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6639 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bc0f257a
......@@ -72,7 +72,7 @@ public:
@param _reference stencil reference for object painting
@return should the reference be used
*/
virtual bool stencilRefForObject (BaseObject *_obj, GLuint &_reference) = 0;
virtual bool stencilRefForObject (BaseObjectData *_obj, GLuint &_reference) = 0;
/** Per reference number blending values
@param _reference stencil reference for blending
......
......@@ -30,7 +30,7 @@
//=============================================================================
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/common/BaseObject.hh>
#include <OpenFlipper/common/BaseObjectData.hh>
#include "DefaultObjectMarker.hh"
//******************************************************************************
......@@ -41,7 +41,7 @@ const ACG::Vec4f source_target_color (0.6,1.0,1.0,1.0);
//******************************************************************************
bool DefaultObjectMarker::stencilRefForObject(BaseObject * _obj, GLuint & _reference)
bool DefaultObjectMarker::stencilRefForObject(BaseObjectData * _obj, GLuint & _reference)
{
if (!_obj->target() && !_obj->source())
{
......
......@@ -41,7 +41,7 @@ class DefaultObjectMarker : public ViewObjectMarker
{
public:
bool stencilRefForObject (BaseObject *_obj, GLuint &_reference);
bool stencilRefForObject (BaseObjectData *_obj, GLuint &_reference);
bool blendForStencilRefNumber (GLuint _reference, GLenum &_src, GLenum &_dst, ACG::Vec4f &_color);
};
......
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