mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-29 14:00:49 +03:00
0026862: Configuration - avoid usage of 3rd-party headers within OpenGl_View and D3DHost_View
Move Font_FTFont::Rect structure into dedicated header Font_FTFont. D3DHost_View, OpenGl_Font, Font_TextFormatter - use forward declarations. Fix regressions after #0024776 OpenGl_View::IsInvalidated() - fix misprint. D3DHost_View::Redraw() - assign myFBO before rendering. D3DHost_FrameBuffer::Init() - fix always zero viewport.
This commit is contained in:
@@ -262,9 +262,9 @@ float Font_FTFont::AdvanceY (const Standard_Utf32Char theUCharNext)
|
||||
// function : BoundingBox
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
Font_FTFont::Rect Font_FTFont::BoundingBox (const NCollection_String& theString,
|
||||
const Graphic3d_HorizontalTextAlignment theAlignX,
|
||||
const Graphic3d_VerticalTextAlignment theAlignY)
|
||||
Font_Rect Font_FTFont::BoundingBox (const NCollection_String& theString,
|
||||
const Graphic3d_HorizontalTextAlignment theAlignX,
|
||||
const Graphic3d_VerticalTextAlignment theAlignY)
|
||||
{
|
||||
Font_TextFormatter aFormatter;
|
||||
aFormatter.SetupAlignment (theAlignX, theAlignY);
|
||||
@@ -273,9 +273,7 @@ Font_FTFont::Rect Font_FTFont::BoundingBox (const NCollection_String&
|
||||
aFormatter.Append (theString, *this);
|
||||
aFormatter.Format();
|
||||
|
||||
Rect aBndBox;
|
||||
|
||||
Font_Rect aBndBox;
|
||||
aFormatter.BndBox (aBndBox);
|
||||
|
||||
return aBndBox;
|
||||
}
|
||||
|
Reference in New Issue
Block a user