Added default fonts for window

This font is replaced when an user explicitly requests to load a new font to be used by window for text rendering.
arrayfire · Feb 23, 2016 · 8b3b756 · 8b3b756
1 parent 4927ab7
commit 8b3b756
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 151 deletions.
diff --git a/examples/cpu/bubblechart.cpp b/examples/cpu/bubblechart.cpp
@@ -72,16 +72,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Bubble chart with Transparency Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     fg::Chart chart(fg::FG_2D);
     chart.setAxesLimits(FRANGE_START, FRANGE_END, -1.1f, 1.1f);

diff --git a/examples/cpu/fractal.cpp b/examples/cpu/fractal.cpp
@@ -37,9 +37,13 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Fractal Demo");
     wnd.makeCurrent();
+
     /* create an font object and load necessary font
      * and later pass it on to window object so that
-     * it can be used for rendering text */
+     * it can be used for rendering text
+     *
+     * NOTE: THIS IS OPTIONAL STEP, BY DEFAULT WINDOW WILL
+     * HAVE FONT ALREADY SETUP*/
     fg::Font fnt;
 #ifdef OS_WIN
     fnt.loadSystemFont("Calibri");

diff --git a/examples/cpu/histogram.cpp b/examples/cpu/histogram.cpp
@@ -54,16 +54,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Histogram Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     /*
      * Split the window into grid regions

diff --git a/examples/cpu/plot3.cpp b/examples/cpu/plot3.cpp
@@ -44,16 +44,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Plot3d Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     fg::Chart chart(fg::FG_3D);
     chart.setAxesLimits(-1.1f, 1.1f, -1.1f, 1.1f, 0.f, 10.f);

diff --git a/examples/cpu/plotting.cpp b/examples/cpu/plotting.cpp
@@ -50,16 +50,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Plotting Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     fg::Chart chart(fg::FG_2D);
     chart.setAxesLimits(FRANGE_START, FRANGE_END, -1.1f, 1.1f);

diff --git a/examples/cpu/surface.cpp b/examples/cpu/surface.cpp
@@ -48,16 +48,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "3d Surface Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     fg::Chart chart(fg::FG_3D);
     chart.setAxesLimits(-1.1f, 1.1f, -1.1f, 1.1f, -5.f, 10.f);

diff --git a/examples/cuda/fractal.cu b/examples/cuda/fractal.cu
@@ -21,16 +21,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Fractal Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     /* Create an image object which creates the necessary
      * textures and pixel buffer objects to hold the image

diff --git a/examples/cuda/histogram.cu b/examples/cuda/histogram.cu
@@ -73,16 +73,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Histogram Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     /*
      * Split the window into grid regions

diff --git a/examples/cuda/plot3.cu b/examples/cuda/plot3.cu
@@ -36,16 +36,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "Plot 3d Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     fg::Chart chart(fg::FG_3D);
     chart.setAxesLimits(-1.1f, 1.1f, -1.1f, 1.1f, 0.f, 10.f);

diff --git a/examples/cuda/plotting.cu b/examples/cuda/plotting.cu
@@ -30,16 +30,6 @@ int main(void)
     fg::Window wnd(DIMX, DIMY, "Plotting Demo");
     wnd.makeCurrent();
     wnd.grid(1,2);
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     fg::Chart chart(fg::FG_2D);
     chart.setAxesLimits(FRANGE_START, FRANGE_END, -1.1f, 1.1f);

diff --git a/examples/cuda/surface.cu b/examples/cuda/surface.cu
@@ -30,16 +30,6 @@ int main(void)
      */
     fg::Window wnd(DIMX, DIMY, "3d Surface Demo");
     wnd.makeCurrent();
-    /* create an font object and load necessary font
-     * and later pass it on to window object so that
-     * it can be used for rendering text */
-    fg::Font fnt;
-#ifdef OS_WIN
-    fnt.loadSystemFont("Calibri");
-#else
-    fnt.loadSystemFont("Vera");
-#endif
-    wnd.setFont(&fnt);
 
     fg::Chart chart(fg::FG_3D);
     chart.setAxesLimits(-1.1f, 1.1f, -1.1f, 1.1f, -5.f, 10.f);

diff --git a/examples/opencl/fractal.cpp b/examples/opencl/fractal.cpp
@@ -113,16 +113,6 @@ int main(void)
         */
         fg::Window wnd(DIMX, DIMY, "Fractal Demo");
         wnd.makeCurrent();
-        /* create an font object and load necessary font
-        * and later pass it on to window object so that
-        * it can be used for rendering text */
-        fg::Font fnt;
-#ifdef OS_WIN
-        fnt.loadSystemFont("Calibri");
-#else
-        fnt.loadSystemFont("Vera");
-#endif
-        wnd.setFont(&fnt);
 
         /* Create an image object which creates the necessary
         * textures and pixel buffer objects to hold the image

diff --git a/examples/opencl/histogram.cpp b/examples/opencl/histogram.cpp
@@ -208,16 +208,6 @@ int main(void)
         */
         fg::Window wnd(DIMX, DIMY, "Histogram Demo");
         wnd.makeCurrent();
-        /* create an font object and load necessary font
-        * and later pass it on to window object so that
-        * it can be used for rendering text */
-        fg::Font fnt;
-#ifdef OS_WIN
-        fnt.loadSystemFont("Calibri");
-#else
-        fnt.loadSystemFont("Vera");
-#endif
-        wnd.setFont(&fnt);
 
         /*
          * Split the window into grid regions

diff --git a/examples/opencl/plot3.cpp b/examples/opencl/plot3.cpp
@@ -82,16 +82,6 @@ int main(void)
          */
         fg::Window wnd(DIMX, DIMY, "Plot3d Demo");
         wnd.makeCurrent();
-        /* create an font object and load necessary font
-         * and later pass it on to window object so that
-         * it can be used for rendering text */
-        fg::Font fnt;
-#ifdef OS_WIN
-        fnt.loadSystemFont("Calibri");
-#else
-        fnt.loadSystemFont("Vera");
-#endif
-        wnd.setFont(&fnt);
 
         fg::Chart chart(fg::FG_3D);
         chart.setAxesLimits(-1.1f, 1.1f, -1.1f, 1.1f, 0.f, 10.f);

diff --git a/examples/opencl/plotting.cpp b/examples/opencl/plotting.cpp
@@ -85,16 +85,6 @@ int main(void)
         */
         fg::Window wnd(DIMX, DIMY, "Plotting Demo");
         wnd.makeCurrent();
-        /* create an font object and load necessary font
-        * and later pass it on to window object so that
-        * it can be used for rendering text */
-        fg::Font fnt;
-#ifdef OS_WIN
-        fnt.loadSystemFont("Calibri");
-#else
-        fnt.loadSystemFont("Vera");
-#endif
-        wnd.setFont(&fnt);
 
         fg::Chart chart(fg::FG_2D);
         chart.setAxesLimits(FRANGE_START, FRANGE_END, -1.1f, 1.1f);

diff --git a/examples/opencl/surface.cpp b/examples/opencl/surface.cpp
@@ -88,16 +88,6 @@ int main(void)
          */
         fg::Window wnd(DIMX, DIMY, "3d Surface Demo");
         wnd.makeCurrent();
-        /* create an font object and load necessary font
-         * and later pass it on to window object so that
-         * it can be used for rendering text */
-        fg::Font fnt;
-#ifdef OS_WIN
-        fnt.loadSystemFont("Calibri");
-#else
-        fnt.loadSystemFont("Vera");
-#endif
-        wnd.setFont(&fnt);
 
         fg::Chart chart(fg::FG_3D);
         chart.setAxesLimits(-1.1f, 1.1f, -1.1f, 1.1f, -5.f, 10.f);

diff --git a/src/window.cpp b/src/window.cpp
@@ -116,6 +116,14 @@ window_impl::window_impl(int pWidth, int pHeight, const char* pTitle,
     mats.resize(mWindow->mRows*mWindow->mCols);
     std::fill(mats.begin(), mats.end(), glm::mat4(1));
 
+    /* setup default window font */
+    mFont = std::make_shared<font_impl>();
+#ifdef OS_WIN
+    mFont->loadSystemFont("Calibri");
+#else
+    mFont->loadSystemFont("Vera");
+#endif
+
     CheckGL("End Window::Window");
 }