font glyph packing finished

* Removed font size parameter from loadFont functions * Font class loads a range of font sizes a prior * Characters have an outline to enable easy reading * Updated examples to reflect the change related to loadFont functions * Added a new FontAtlas class that creates the single texture that has all the glphs for all font sizes and characters Commented out outline strokes currently, will enable them after further testing.
arrayfire · Feb 8, 2016 · 302a5e0 · 302a5e0
1 parent 12e367b
commit 302a5e0
Show file tree

Hide file tree

Showing 26 changed files with 699 additions and 251 deletions.
diff --git a/examples/cpu/bubblechart.cpp b/examples/cpu/bubblechart.cpp
@@ -77,9 +77,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cpu/fractal.cpp b/examples/cpu/fractal.cpp
@@ -42,9 +42,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cpu/histogram.cpp b/examples/cpu/histogram.cpp
@@ -59,9 +59,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cpu/plot3.cpp b/examples/cpu/plot3.cpp
@@ -49,9 +49,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cpu/plotting.cpp b/examples/cpu/plotting.cpp
@@ -55,9 +55,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cpu/surface.cpp b/examples/cpu/surface.cpp
@@ -53,9 +53,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cuda/fractal.cu b/examples/cuda/fractal.cu
@@ -26,9 +26,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cuda/histogram.cu b/examples/cuda/histogram.cu
@@ -78,9 +78,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cuda/plot3.cu b/examples/cuda/plot3.cu
@@ -41,9 +41,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cuda/plotting.cu b/examples/cuda/plotting.cu
@@ -35,9 +35,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/cuda/surface.cu b/examples/cuda/surface.cu
@@ -35,9 +35,9 @@ int main(void)
      * it can be used for rendering text */
     fg::Font fnt;
 #ifdef OS_WIN
-    fnt.loadSystemFont("Calibri", 32);
+    fnt.loadSystemFont("Calibri");
 #else
-    fnt.loadSystemFont("Vera", 32);
+    fnt.loadSystemFont("Vera");
 #endif
     wnd.setFont(&fnt);
 

diff --git a/examples/opencl/fractal.cpp b/examples/opencl/fractal.cpp
@@ -118,9 +118,9 @@ int main(void)
         * it can be used for rendering text */
         fg::Font fnt;
 #ifdef OS_WIN
-        fnt.loadSystemFont("Calibri", 32);
+        fnt.loadSystemFont("Calibri");
 #else
-        fnt.loadSystemFont("Vera", 32);
+        fnt.loadSystemFont("Vera");
 #endif
         wnd.setFont(&fnt);
 

diff --git a/examples/opencl/histogram.cpp b/examples/opencl/histogram.cpp
@@ -213,9 +213,9 @@ int main(void)
         * it can be used for rendering text */
         fg::Font fnt;
 #ifdef OS_WIN
-        fnt.loadSystemFont("Calibri", 32);
+        fnt.loadSystemFont("Calibri");
 #else
-        fnt.loadSystemFont("Vera", 32);
+        fnt.loadSystemFont("Vera");
 #endif
         wnd.setFont(&fnt);
 

diff --git a/examples/opencl/plot3.cpp b/examples/opencl/plot3.cpp
@@ -87,9 +87,9 @@ int main(void)
          * it can be used for rendering text */
         fg::Font fnt;
 #ifdef OS_WIN
-        fnt.loadSystemFont("Calibri", 32);
+        fnt.loadSystemFont("Calibri");
 #else
-        fnt.loadSystemFont("Vera", 32);
+        fnt.loadSystemFont("Vera");
 #endif
         wnd.setFont(&fnt);
 

diff --git a/examples/opencl/plotting.cpp b/examples/opencl/plotting.cpp
@@ -90,9 +90,9 @@ int main(void)
         * it can be used for rendering text */
         fg::Font fnt;
 #ifdef OS_WIN
-        fnt.loadSystemFont("Calibri", 32);
+        fnt.loadSystemFont("Calibri");
 #else
-        fnt.loadSystemFont("Vera", 32);
+        fnt.loadSystemFont("Vera");
 #endif
         wnd.setFont(&fnt);
 

diff --git a/examples/opencl/surface.cpp b/examples/opencl/surface.cpp
@@ -93,9 +93,9 @@ int main(void)
          * it can be used for rendering text */
         fg::Font fnt;
 #ifdef OS_WIN
-        fnt.loadSystemFont("Calibri", 32);
+        fnt.loadSystemFont("Calibri");
 #else
-        fnt.loadSystemFont("Vera", 32);
+        fnt.loadSystemFont("Vera");
 #endif
         wnd.setFont(&fnt);
 

diff --git a/include/fg/defines.h b/include/fg/defines.h
@@ -92,6 +92,11 @@ enum ErrorCode {
      * */
     FG_ERR_NOT_SUPPORTED  = 5001,           ///< Feature not supported
     FG_ERR_NOT_CONFIGURED = 5002,           ///< Library configuration mismatch
+    /*
+     * Font config related error codes
+     * '6**'
+     * */
+    FG_ERR_FONTCONFIG_ERROR = 6001,         ///< Fontconfig related error
     /*
      * other error codes
      * match the following pattern

diff --git a/include/fg/font.h b/include/fg/font.h
@@ -49,17 +49,15 @@ class Font {
            Load a given font file
 
            \param[in] pFile True Type Font file path
-           \param[in] pFontSize the size of the font glyphs that will be created
          */
-        FGAPI void loadFont(const char* const pFile, int pFontSize);
+        FGAPI void loadFontFile(const char* const pFile);
 
         /**
            Load a system font based on the name
 
            \param[in] pName True Type Font name
-           \param[in] pFontSize the size of the font glyphs that will be created
          */
-        FGAPI void loadSystemFont(const char* const pName, int pFontSize);
+        FGAPI void loadSystemFont(const char* const pName);
 
         /**
            Get handle for internal implementation of Font object

diff --git a/src/chart.cpp b/src/chart.cpp
@@ -33,7 +33,7 @@
 using namespace std;
 typedef std::vector<std::string>::const_iterator StringIter;
 
-static const int CHART2D_FONT_SIZE = 15;
+static const int CHART2D_FONT_SIZE = 16;
 
 const std::shared_ptr<internal::font_impl>& getChartFont()
 {
@@ -42,9 +42,9 @@ const std::shared_ptr<internal::font_impl>& getChartFont()
 
     std::call_once(flag, []() {
 #if defined(OS_WIN)
-        mChartFont.loadSystemFont("Calibri", 32);
+        mChartFont.loadSystemFont("Calibri");
 #else
-        mChartFont.loadSystemFont("Vera", 32);
+        mChartFont.loadSystemFont("Vera");
 #endif
     });
 
@@ -98,7 +98,7 @@ void AbstractChart::renderTickLabels(
          * text center with tick mark position */
         if(pCoordsOffset < mTickCount) {
             // offset for y axis labels
-            pos[0] -= (CHART2D_FONT_SIZE*it->length()/2.0f+mTickSize/2);
+            pos[0] -= (CHART2D_FONT_SIZE*it->length()/2.0f+mTickSize);
         }else if(pCoordsOffset >= mTickCount && pCoordsOffset < 2*mTickCount) {
             // offset for x axis labels
             pos[0] -= (CHART2D_FONT_SIZE*it->length()/4.0f);
@@ -430,7 +430,7 @@ void chart2d_impl::render(const int pWindowId,
     /* render chart axes titles */
     if (!mYTitle.empty()) {
         glm::vec4 res = trans * glm::vec4(-1.0f, 0.0f, 0.0f, 1.0f);
-        pos[0] = 2;
+        pos[0] = 4;
         pos[1] = h*(res.y+1.0f)/2.0f;
         fonter->render(pWindowId, pos, WHITE, mYTitle.c_str(), CHART2D_FONT_SIZE, true);
     }

diff --git a/src/common.cpp b/src/common.cpp
@@ -158,11 +158,6 @@ GLuint initShaders(const char* pVertShaderSrc, const char* pFragShaderSrc)
     return shaderProgram;
 }
 
-int nextP2(const int pValue)
-{
-    return int(std::pow(2, (std::ceil(std::log2(pValue)))));
-}
-
 float clampTo01(const float pValue)
 {
     return (pValue < 0.0f ? 0.0f : (pValue>1.0f ? 1.0f : pValue));

diff --git a/src/common.hpp b/src/common.hpp
@@ -86,12 +86,6 @@ GLuint createBuffer(GLenum pTarget, size_t pSize, const T* pPtr, GLenum pUsage)
     return retVal;
 }
 
-/* compute the next power of two after given integer
- *
- * @pValue is the value whose next power of two is to be computed
- */
-int nextP2(const int pValue);
-
 #ifdef OS_WIN
 /* Get the paths to font files in Windows system directory
  *
@@ -134,7 +128,6 @@ std::ostream& operator<<(std::ostream&, const glm::mat4&);
 glm::vec3 trackballPoint(const float pX, const float pY,
                          const float pWidth, const float pHeight);
 
-
 namespace internal
 {