0030748: Visualization - Marker displayed in immediate layer ruins QT Quick view...

[occt.git] / src / OpenGl / OpenGl_Text.hxx

diff --git a/src/OpenGl/OpenGl_Text.hxx b/src/OpenGl/OpenGl_Text.hxx
index 6615698..2de368c 100755 (executable)
--- a/src/OpenGl/OpenGl_Text.hxx
+++ b/src/OpenGl/OpenGl_Text.hxx
@@ -18,7 +18,7 @@
 
 #include <OpenGl_Element.hxx>
 
-#include <OpenGl_AspectText.hxx>
+#include <OpenGl_Aspects.hxx>
 #include <OpenGl_TextParam.hxx>
 #include <OpenGl_TextBuilder.hxx>
 
@@ -30,8 +30,6 @@
 
 #include <gp_Ax2.hxx>
 
-class OpenGl_PrinterContext;
-
 //! Text rendering
 class OpenGl_Text : public OpenGl_Element
 {
@@ -46,7 +44,11 @@ public:
   //! Creates new text in 3D space.
   Standard_EXPORT OpenGl_Text (const Standard_Utf8Char* theText,
                                const gp_Ax2&            theOrientation,
-                               const OpenGl_TextParam&  theParams);
+                               const OpenGl_TextParam&  theParams,
+                               const bool               theHasOwnAnchor = true);
+
+  //! Destructor
+  Standard_EXPORT virtual ~OpenGl_Text();
 
   //! Setup new string and position
   Standard_EXPORT void Init (const Handle(OpenGl_Context)& theCtx,
@@ -69,27 +71,33 @@ public:
   Standard_EXPORT virtual void Render  (const Handle(OpenGl_Workspace)& theWorkspace) const;
   Standard_EXPORT virtual void Release (OpenGl_Context* theContext);
 
+  //! Return defined text.
+  const NCollection_String& Text() const { return myString; }
+
+  //! Return text formatting parameters.
+  const OpenGl_TextParam& FormatParams() const { return myParams; }
+
 public: //! @name methods for compatibility with layers
 
   //! Empty constructor
   Standard_EXPORT OpenGl_Text();
 
   //! Create key for shared resource
-  Standard_EXPORT static TCollection_AsciiString FontKey (const OpenGl_AspectText& theAspect,
-                                                          const Standard_Integer   theHeight,
-                                                          const unsigned int       theResolution);
+  Standard_EXPORT static TCollection_AsciiString FontKey (const OpenGl_Aspects& theAspect,
+                                                          Standard_Integer theHeight,
+                                                          unsigned int theResolution);
 
   //! Find shared resource for specified font or initialize new one
   Standard_EXPORT static Handle(OpenGl_Font) FindFont (const Handle(OpenGl_Context)& theCtx,
-                                                       const OpenGl_AspectText&      theAspect,
-                                                       const Standard_Integer        theHeight,
-                                                       const unsigned int            theResolution,
-                                                       const TCollection_AsciiString theKey);
+                                                       const OpenGl_Aspects& theAspect,
+                                                       Standard_Integer theHeight,
+                                                       unsigned int theResolution,
+                                                       const TCollection_AsciiString& theKey);
 
   //! Compute text width
   Standard_EXPORT static void StringSize (const Handle(OpenGl_Context)& theCtx,
                                           const NCollection_String&     theText,
-                                          const OpenGl_AspectText&      theTextAspect,
+                                          const OpenGl_Aspects&         theTextAspect,
                                           const OpenGl_TextParam&       theParams,
                                           const unsigned int            theResolution,
                                           Standard_ShortReal&           theWidth,
@@ -103,42 +111,40 @@ public: //! @name methods for compatibility with layers
                              const OpenGl_TextParam&           theParams);
 
   //! Perform rendering
-  Standard_EXPORT void Render (const Handle(OpenGl_PrinterContext)& thePrintCtx,
-                               const Handle(OpenGl_Context)&        theCtx,
-                               const OpenGl_AspectText&             theTextAspect,
-                               const unsigned int                   theResolution = Graphic3d_RenderingParams::THE_DEFAULT_RESOLUTION) const;
+  Standard_EXPORT void Render (const Handle(OpenGl_Context)& theCtx,
+                               const OpenGl_Aspects& theTextAspect,
+                               unsigned int theResolution = Graphic3d_RenderingParams::THE_DEFAULT_RESOLUTION) const;
 
 protected:
 
-  //! Destructor
-  Standard_EXPORT virtual ~OpenGl_Text();
-
   friend class OpenGl_Trihedron;
   friend class OpenGl_GraduatedTrihedron;
 
-private:
-
   //! Release cached VBO resources
-  void releaseVbos (OpenGl_Context* theCtx);
+  Standard_EXPORT void releaseVbos (OpenGl_Context* theCtx);
+
+private:
 
   //! Setup matrix.
-  void setupMatrix (const Handle(OpenGl_PrinterContext)& thePrintCtx,
-                    const Handle(OpenGl_Context)&        theCtx,
-                    const OpenGl_AspectText&             theTextAspect,
-                    const OpenGl_Vec3                    theDVec) const;
+  void setupMatrix (const Handle(OpenGl_Context)& theCtx,
+                    const OpenGl_Aspects& theTextAspect,
+                    const OpenGl_Vec3& theDVec) const;
 
   //! Draw arrays of vertices.
-  void drawText (const Handle(OpenGl_PrinterContext)& thePrintCtx,
-                 const Handle(OpenGl_Context)&        theCtx,
-                 const OpenGl_AspectText&             theTextAspect) const;
+  void drawText (const Handle(OpenGl_Context)& theCtx,
+                 const OpenGl_Aspects& theTextAspect) const;
+
+  //! Draw rectangle from bounding text box.
+  void drawRect (const Handle(OpenGl_Context)& theCtx,
+                 const OpenGl_Aspects& theTextAspect,
+                 const OpenGl_Vec4& theColorSubs) const;
 
   //! Main rendering code
-  void render (const Handle(OpenGl_PrinterContext)& thePrintCtx,
-               const Handle(OpenGl_Context)&        theCtx,
-               const OpenGl_AspectText&             theTextAspect,
-               const TEL_COLOUR&                    theColorText,
-               const TEL_COLOUR&                    theColorSubs,
-               const unsigned int                   theResolution) const;
+  void render (const Handle(OpenGl_Context)& theCtx,
+               const OpenGl_Aspects& theTextAspect,
+               const OpenGl_Vec4& theColorText,
+               const OpenGl_Vec4& theColorSubs,
+               unsigned int theResolution) const;
 
 protected:
 
@@ -146,6 +152,7 @@ protected:
   mutable NCollection_Vector<GLuint>                      myTextures;   //!< textures' IDs
   mutable NCollection_Vector<Handle(OpenGl_VertexBuffer)> myVertsVbo;   //!< VBOs of vertices
   mutable NCollection_Vector<Handle(OpenGl_VertexBuffer)> myTCrdsVbo;   //!< VBOs of texture coordinates
+  mutable Handle(OpenGl_VertexBuffer)                     myBndVertsVbo;//!< VBOs of vertices for bounding box
   mutable Font_Rect                                       myBndBox;
 
 protected:
@@ -153,7 +160,6 @@ protected:
   mutable OpenGl_Mat4d myProjMatrix;
   mutable OpenGl_Mat4d myModelMatrix;
   mutable OpenGl_Mat4d myOrientationMatrix;
-  mutable GLint    myViewport[4];
   mutable GLdouble myWinX;
   mutable GLdouble myWinY;
   mutable GLdouble myWinZ;
@@ -168,6 +174,7 @@ protected:
   bool               myIs2d;
   gp_Ax2             myOrientation; //!< Text orientation in 3D space.
   bool               myHasPlane;    //!< Check if text have orientation in 3D space.
+  bool               myHasAnchorPoint; //!< Shows if it has own attach point
 
 public: