quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* new rendering system for volatile text

Browse Source 
(symbols rendered to atlas texture)
deliver position via glRasterPos + glGet GL_CURRENT_RASTER_POSITION to avoid adding calculations of screen coords in many spots
solves problem: pango 1.44 switch freetype->harfbuzz = bitmap fonts aren't available, in particular no gdk_gl_font_use_pango_font()
text is rendered from font bottom (was from baseline)(latter is wanted less often)
wgl bitmap<->pango sizes do not match, thus realign all text positions, increase default font size
make 2D axes labels, view type text, sizing info adaptive to font size
#24
fixes #42
This commit is contained in:
Garux
2020-05-14 07:51:34 +03:00
parent 33f7e66b87
commit a0a47640b0
6 changed files with 178 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
radiant/modelwindow.cpp
View File

@@ -467,6 +467,7 @@ class CellPos
{
const int m_cellSize; //half size of model square (radius)
const int m_fontHeight;
const int m_fontDescent;
const int m_plusWidth; //pre offset on the left
const int m_plusHeight; //above text
const int m_cellsInRow;
@@ -475,8 +476,9 @@ class CellPos
public:
CellPos( int width, int cellSize, int fontHeight )
: m_cellSize( cellSize ), m_fontHeight( fontHeight ),
m_fontDescent( GlobalOpenGL().m_font->getPixelDescent() ),
m_plusWidth( 8 ),
m_plusHeight( 4 ),
m_plusHeight( 0 ),
m_cellsInRow( std::max( 1, ( width - m_plusWidth ) / ( m_cellSize * 2 + m_plusWidth ) ) ){
}
void operator++(){
@@ -492,7 +494,7 @@ public:
}
Vector3 getTextPos( int index ) const {
const int x = ( index % m_cellsInRow ) * m_cellSize * 2 + ( index % m_cellsInRow + 1 ) * m_plusWidth;
const int z = ( index / m_cellsInRow ) * m_cellSize * 2 + ( index / m_cellsInRow + 1 ) * ( m_fontHeight + m_plusHeight ) - 1;
const int z = ( index / m_cellsInRow ) * m_cellSize * 2 + ( index / m_cellsInRow + 1 ) * ( m_fontHeight + m_plusHeight ) - 1 + m_fontDescent;
return Vector3( x, 0, -z );
}
Vector3 getTextPos() const {