remove some redundant data members

diff --git a/include/igl.h b/include/igl.h
index 8f7d7dc0f18443778b9308f9f3be3fc5446a0736..35174967608d8fed17ea6aaf193f25d709b7bd43 100644 (file)
--- a/include/igl.h
+++ b/include/igl.h
@@ -1999,9 +1999,6 @@ struct OpenGLBinding
   void (*assertNoErrors)(const char *file, int line);
 
   GLFont *m_font; // MUST be set!
-  int m_fontHeight;
-  int m_fontAscent;
-  int m_fontDescent;
 
   /// \brief Renders \p string at the current raster-position of the current context.
   void drawString(const char* string) const

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 8a0c89494887640218331a7ea687992ef8a0d7ec..f0744e48245be372b7d80dfb9e460fb3898c3559 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -1692,11 +1692,11 @@ void CamWnd::Cam_Draw()
 
   if(g_camwindow_globals_private.m_showStats)
   {
-    glRasterPos3f(1.0f, static_cast<float>(m_Camera.height) - GlobalOpenGL().m_fontDescent, 0.0f);
+    glRasterPos3f(1.0f, static_cast<float>(m_Camera.height) - GlobalOpenGL().m_font->getPixelDescent(), 0.0f);
     extern const char* Renderer_GetStats();
     GlobalOpenGL().drawString(Renderer_GetStats());
 
-    glRasterPos3f(1.0f, static_cast<float>(m_Camera.height) - GlobalOpenGL().m_fontDescent - GlobalOpenGL().m_fontHeight, 0.0f);
+    glRasterPos3f(1.0f, static_cast<float>(m_Camera.height) - GlobalOpenGL().m_font->getPixelDescent() - GlobalOpenGL().m_font->getPixelHeight(), 0.0f);
     extern const char* Cull_GetStats();
     GlobalOpenGL().drawString(Cull_GetStats());
   }

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 18c82f95945a2c9998bf71a0ac37cb94890b34ed..0aaf664799c370bc411dfc4bc0a4723ce90bcd21 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -3345,9 +3345,6 @@ void GlobalGL_sharedContextCreated()
 #endif
 
   GlobalOpenGL().m_font = g_font;
-  GlobalOpenGL().m_fontHeight = g_font->getPixelHeight();
-  GlobalOpenGL().m_fontAscent = g_font->getPixelAscent();
-  GlobalOpenGL().m_fontDescent = g_font->getPixelDescent();
 }
 
 void GlobalGL_sharedContextDestroyed()

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 774c0f85af8d37e3a34dbb4b756cb1bebfc95408..95d490ab0725770460aa4139431a177d6bc27359 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -370,7 +370,7 @@ const char* TextureBrowser_getComonShadersDir()
 
 inline int TextureBrowser_fontHeight(TextureBrowser& textureBrowser)
 {
-  return GlobalOpenGL().m_fontHeight;
+  return GlobalOpenGL().m_font->getPixelHeight();
 }
 
 const char* TextureBrowser_GetSelectedShader(TextureBrowser& textureBrowser)

diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp
index 857e7b998a43db68f4603de491161ef2d1d0f2bd..5ead90b4ad8be25a1cbe6d1004d59032a0350a10 100644 (file)
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -1849,10 +1849,8 @@ void XYWnd::XY_DrawGrid(void) {
        // draw coordinate text if needed
        if ( g_xywindow_globals_private.show_coordinates) {
                glColor4fv(vector4_to_array(Vector4(g_xywindow_globals.color_gridtext, 1.0f)));
-               // why does this not work on windows:
-               //   float offx = m_vOrigin[nDim2] + h - (1 + GlobalOpenGL().m_fontAscent) / m_fScale;
-               float offx = m_vOrigin[nDim2] + h - 13                                / m_fScale;
-               float offy = m_vOrigin[nDim1] - w +  1                                / m_fScale;
+               float offx = m_vOrigin[nDim2] + h - (1 + GlobalOpenGL().m_font->getPixelAscent()) / m_fScale;
+               float offy = m_vOrigin[nDim1] - w +  1                                            / m_fScale;
                for (x = xb - fmod(xb, stepx); x <= xe ; x += stepx) {
                        glRasterPos2f (x, offx);
                        sprintf (text, "%g", x);