Commit 021317f2 authored by Christopher Tenter's avatar Christopher Tenter
Browse files

removed virtual functions from RenderObject as this is unsupported

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19666 383ad7c9-94d9-4d36-a494-682f7c89f535
parent f81c0c87
...@@ -110,6 +110,9 @@ void IRenderer::addRenderObject(ACG::RenderObject* _renderObject) ...@@ -110,6 +110,9 @@ void IRenderer::addRenderObject(ACG::RenderObject* _renderObject)
{ {
// commonly encountered rendering errors // commonly encountered rendering errors
if (!_renderObject->numIndices)
std::cout << "warning: numIndices is 0 in renderobject: " << _renderObject->debugName << std::endl;
// Why is my object invisible/black? // Why is my object invisible/black?
if (!_renderObject->depthWrite && if (!_renderObject->depthWrite &&
!_renderObject->colorWriteMask[0] && !_renderObject->colorWriteMask[1] && !_renderObject->colorWriteMask[0] && !_renderObject->colorWriteMask[1] &&
...@@ -799,11 +802,6 @@ void IRenderer::drawObject(ACG::RenderObject* _obj) ...@@ -799,11 +802,6 @@ void IRenderer::drawObject(ACG::RenderObject* _obj)
((const char*)_obj->sysmemIndexBuffer) + _obj->indexOffset * indexSize); ((const char*)_obj->sysmemIndexBuffer) + _obj->indexOffset * indexSize);
} }
} }
else
{
// user defined draw-call
_obj->executeImmediateMode();
}
} }
void IRenderer::renderObject(ACG::RenderObject* _obj, void IRenderer::renderObject(ACG::RenderObject* _obj,
......
...@@ -201,11 +201,6 @@ RenderObject::~RenderObject() { ...@@ -201,11 +201,6 @@ RenderObject::~RenderObject() {
uniformPool_.clear(); uniformPool_.clear();
} }
void RenderObject::executeImmediateMode()
{
// implemented by deriving class
}
QString RenderObject::toString() const QString RenderObject::toString() const
{ {
// several mappings: (int)GLEnum -> string // several mappings: (int)GLEnum -> string
......
...@@ -105,7 +105,7 @@ struct ACGDLLEXPORT RenderObject ...@@ -105,7 +105,7 @@ struct ACGDLLEXPORT RenderObject
*/ */
RenderObject(); RenderObject();
virtual ~RenderObject(); ~RenderObject();
/** \brief Priority to allow sorting of objects /** \brief Priority to allow sorting of objects
...@@ -403,15 +403,6 @@ public: ...@@ -403,15 +403,6 @@ public:
/** \brief Whenever the need for glBegin() glEnd() immediate mode arises,
this can be implemented by a deriving class of RenderObject.
Also it gets called only if numIndices is set to 0.
glBegin and glEnd have to be called in here.
*/
virtual void executeImmediateMode();
/** Returns a text representation of the RenderObject for debugging purposes. /** Returns a text representation of the RenderObject for debugging purposes.
*/ */
QString toString() const; QString toString() const;
......
Supports Markdown
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