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

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

diff --git a/src/OpenGl/OpenGl_Font.hxx b/src/OpenGl/OpenGl_Font.hxx
index fd95912..3373ac8 100755 (executable)
--- a/src/OpenGl/OpenGl_Font.hxx
+++ b/src/OpenGl/OpenGl_Font.hxx
@@ -19,12 +19,14 @@
 #include <OpenGl_Texture.hxx>
 #include <OpenGl_Vec.hxx>
 
-#include <Font_FTFont.hxx>
+#include <Font_Rect.hxx>
 
 #include <NCollection_DataMap.hxx>
 #include <NCollection_Vector.hxx>
 #include <TCollection_AsciiString.hxx>
 
+class Font_FTFont;
+
 //! Texture font.
 class OpenGl_Font : public OpenGl_Resource
 {
@@ -34,9 +36,9 @@ public:
   //! Simple structure stores tile rectangle.
   struct Tile
   {
-    Font_FTFont::Rect uv;      //!< UV coordinates in texture
-    Font_FTFont::Rect px;      //!< pixel displacement coordinates
-    GLuint            texture; //!< GL texture ID
+    Font_Rect uv;      //!< UV coordinates in texture
+    Font_Rect px;      //!< pixel displacement coordinates
+    GLuint    texture; //!< GL texture ID
   };
 
   struct RectI
@@ -57,7 +59,10 @@ public:
   Standard_EXPORT virtual ~OpenGl_Font();
 
   //! Destroy object - will release GPU memory if any
-  Standard_EXPORT virtual void Release (OpenGl_Context* theCtx);
+  Standard_EXPORT virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE;
+
+  //! Returns estimated GPU memory usage.
+  Standard_EXPORT virtual Standard_Size EstimatedDataSize() const Standard_OVERRIDE;
 
   //! @return key of shared resource
   inline const TCollection_AsciiString& ResourceKey() const
@@ -89,14 +94,6 @@ public:
   //! FreeType font instance should be already initialized!
   Standard_EXPORT bool Init (const Handle(OpenGl_Context)& theCtx);
 
-  //! Compute advance to the next character with kerning applied when applicable.
-  //! Assuming text rendered horizontally.
-  inline float AdvanceX (const Standard_Utf32Char theUChar,
-                         const Standard_Utf32Char theUCharNext)
-  {
-    return myFont->AdvanceX (theUChar, theUCharNext);
-  }
-
   //! @return vertical distance from the horizontal baseline to the highest character coordinate
   inline float Ascender() const
   {
@@ -109,24 +106,13 @@ public:
     return myDescender;
   }
 
-  //! @return default line spacing (the baseline-to-baseline distance)
-  inline float LineSpacing() const
-  {
-    return myLineSpacing;
-  }
-
-  //! Compute glyph rectangle at specified pen position (on baseline)
-  //! and render it to texture if not already.
+  //! Render glyph to texture if not already.
   //! @param theCtx       active context
   //! @param theUChar     unicode symbol to render
-  //! @param theUCharNext next symbol to compute advance with kerning when available
   //! @param theGlyph     computed glyph position rectangle, texture ID and UV coordinates
-  //! @param thePen       pen position on baseline to place new glyph
-  Standard_EXPORT void RenderGlyph (const Handle(OpenGl_Context)& theCtx,
+  Standard_EXPORT bool RenderGlyph (const Handle(OpenGl_Context)& theCtx,
                                     const Standard_Utf32Char      theUChar,
-                                    const Standard_Utf32Char      theUCharNext,
-                                    Tile&                         theGlyph,
-                                    OpenGl_Vec2&                  thePen);
+                                    Tile&                         theGlyph);
 
 protected:
 
@@ -143,8 +129,6 @@ protected:
   Handle(Font_FTFont)     myFont;          //!< FreeType font instance
   Standard_ShortReal      myAscender;      //!< ascender     provided my FT font
   Standard_ShortReal      myDescender;     //!< descender    provided my FT font
-  Standard_ShortReal      myLineSpacing;   //!< line spacing provided my FT font
-  Standard_Integer        myTileSizeX;     //!< tile width
   Standard_Integer        myTileSizeY;     //!< tile height
   Standard_Integer        myLastTileId;    //!< id of last tile
   RectI                   myLastTilePx;
@@ -157,7 +141,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Font) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Font,OpenGl_Resource) // Type definition
 
 };