OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00
Code

0023186: Unable to display Graphic3d_ArrayOfPoints after migrating from OCCT 6.5.2

Browse Source 
GL_NONE replaced with PARRAY_DRAW_MODE_NONE to disambiguate with GL_POINTS
DRAW_MODE_NONE constant moved into OpenGl_PrimitiveArray class to avoid potential name collisions
This commit is contained in:
san 2012-06-22 11:33:53 +04:00
parent 85e096c3df
commit 1d03e66d2a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenGl/OpenGl_PrimitiveArray.cxx
View File

@ -1644,7 +1644,7 @@ void OpenGl_PrimitiveArray::DrawDegeneratesAsBBoxs (const TEL_COLOUR* theEdgeCol
// ======================================================================= // =======================================================================
OpenGl_PrimitiveArray::OpenGl_PrimitiveArray (CALL_DEF_PARRAY* thePArray) OpenGl_PrimitiveArray::OpenGl_PrimitiveArray (CALL_DEF_PARRAY* thePArray)
: myPArray (thePArray), : myPArray (thePArray),
myDrawMode (GL_NONE) myDrawMode (DRAW_MODE_NONE)
{ {
switch (myPArray->type) switch (myPArray->type)
{ {
@ -1714,7 +1714,7 @@ OpenGl_PrimitiveArray::~OpenGl_PrimitiveArray ()
// ======================================================================= // =======================================================================
void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace) const void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace) const
{ {
if (myPArray == NULL || myDrawMode == GL_NONE) if (myPArray == NULL || myDrawMode == DRAW_MODE_NONE)
return; return;
// create VBOs on first render call // create VBOs on first render call

9
src/OpenGl/OpenGl_PrimitiveArray.hxx
View File

@ -34,6 +34,13 @@ class Handle(OpenGl_Context);
class OpenGl_PrimitiveArray : public OpenGl_Element class OpenGl_PrimitiveArray : public OpenGl_Element
{ {
public: public:
// OpenGL does not provie a constant for "none" draw mode.
// So we define our own one that does not conflict with GL constants
// and untilizes common GL invalid value
enum
{
DRAW_MODE_NONE = -1
};
//! Default constructor //! Default constructor
OpenGl_PrimitiveArray (CALL_DEF_PARRAY* thePArray); OpenGl_PrimitiveArray (CALL_DEF_PARRAY* thePArray);
@ -91,7 +98,7 @@ private:
protected: protected:
mutable CALL_DEF_PARRAY* myPArray; mutable CALL_DEF_PARRAY* myPArray;
GLenum myDrawMode; GLint myDrawMode;
public: public: