0030239: Visualization, Graphic3d_ArrayOfPrimitives - pass Graphic3d_ArrayFlags bitma...

[occt.git] / src / Graphic3d / Graphic3d_ArrayOfTriangleStrips.hxx

diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
index e1a05e4..5b39967 100644 (file)
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
@@ -23,7 +23,7 @@ class Graphic3d_ArrayOfTriangleStrips : public Graphic3d_ArrayOfPrimitives
   DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleStrips, Graphic3d_ArrayOfPrimitives)
 public:
 
-  //! Creates an array of triangle strips, a polygon can be filled as:
+  //! Creates an array of triangle strips (Graphic3d_TOPA_TRIANGLESTRIPS), a polygon can be filled as:
   //! 1) Creating a single strip defined with his vertexes, i.e:
   //! @code
   //!   myArray = Graphic3d_ArrayOfTriangleStrips (7);
@@ -46,18 +46,32 @@ public:
   //! @param theMaxVertexs defines the maximum allowed vertex number in the array
   //! @param theMaxStrips  defines the maximum allowed strip  number in the array;
   //!                      the number of triangle really drawn is: VertexNumber() - 2 * Min(1, BoundNumber())
+  //! @param theArrayFlags array flags
+  Graphic3d_ArrayOfTriangleStrips (Standard_Integer theMaxVertexs,
+                                   Standard_Integer theMaxStrips,
+                                   Graphic3d_ArrayFlags theArrayFlags)
+  : Graphic3d_ArrayOfPrimitives (Graphic3d_TOPA_TRIANGLESTRIPS, theMaxVertexs, theMaxStrips, 0, theArrayFlags) {}
+
+  //! Creates an array of triangle strips (Graphic3d_TOPA_TRIANGLESTRIPS).
+  //! @param theMaxVertexs defines the maximum allowed vertex number in the array
+  //! @param theMaxStrips  defines the maximum allowed strip  number in the array;
+  //!                      the number of triangle really drawn is: VertexNumber() - 2 * Min(1, BoundNumber())
   //! @param theHasVNormals when TRUE, AddVertex(Point,Normal), AddVertex(Point,Normal,Color) or AddVertex(Point,Normal,Texel) should be used to specify vertex normal;
   //!                       vertex normals should be specified coherent to triangle orientation (defined by order of vertexes within triangle) for proper rendering
   //! @param theHasVColors  when TRUE, AddVertex(Point,Color) or AddVertex(Point,Normal,Color) should be used to specify vertex color
   //! @param theHasBColors  when TRUE, AddBound(number,Color) should be used to specify sub-group color
   //! @param theHasVTexels  when TRUE, AddVertex(Point,Texel) or AddVertex(Point,Normal,Texel) should be used to specify vertex UV coordinates
-  Graphic3d_ArrayOfTriangleStrips (const Standard_Integer theMaxVertexs,
-                                   const Standard_Integer theMaxStrips   = 0,
-                                   const Standard_Boolean theHasVNormals = Standard_False,
-                                   const Standard_Boolean theHasVColors  = Standard_False,
-                                   const Standard_Boolean theHasBColors  = Standard_False,
-                                   const Standard_Boolean theHasVTexels  = Standard_False)
-  : Graphic3d_ArrayOfPrimitives (Graphic3d_TOPA_TRIANGLESTRIPS, theMaxVertexs, theMaxStrips, 0, theHasVNormals, theHasVColors, theHasBColors, theHasVTexels) {}
+  Graphic3d_ArrayOfTriangleStrips (Standard_Integer theMaxVertexs,
+                                   Standard_Integer theMaxStrips   = 0,
+                                   Standard_Boolean theHasVNormals = Standard_False,
+                                   Standard_Boolean theHasVColors  = Standard_False,
+                                   Standard_Boolean theHasBColors  = Standard_False,
+                                   Standard_Boolean theHasVTexels  = Standard_False)
+  : Graphic3d_ArrayOfPrimitives (Graphic3d_TOPA_TRIANGLESTRIPS, theMaxVertexs, theMaxStrips, 0,
+                                 (theHasVNormals ? Graphic3d_ArrayFlags_VertexNormal : Graphic3d_ArrayFlags_None)
+                               | (theHasVColors  ? Graphic3d_ArrayFlags_VertexColor  : Graphic3d_ArrayFlags_None)
+                               | (theHasVTexels  ? Graphic3d_ArrayFlags_VertexTexel  : Graphic3d_ArrayFlags_None)
+                               | (theHasBColors  ? Graphic3d_ArrayFlags_BoundColor   : Graphic3d_ArrayFlags_None)) {}
 
 };