new text system

Author: flipcoder

Qor/BasicState.cpp

@@ -25,6 +25,15 @@ void BasicState :: preload()
 {
     m_pCamera = make_shared<Camera>(m_pQor->resources(), m_pQor->window());
     m_pRoot->add(m_pCamera->as_node());
+
+    //m_pFont = m_pQor->resources()->cache_as<Font>("PressStart2P-Regular.ttf:30");
+    //m_pText = make_shared<Text>(m_pFont);
+    //m_pText->set("Hello World!");
+    //auto text2 = make_shared<Text>(m_pFont);
+    //text2->set("Testing");
+    //m_pRoot->add(text2);
+    //m_pText->position(glm::vec3(10.0f, 0.0f, 0.0f));
+    //m_pRoot->add(m_pText);
 }
 
 BasicState :: ~BasicState()
@@ -34,6 +43,9 @@ BasicState :: ~BasicState()
 
 void BasicState :: enter()
 {
+    m_pCamera->ortho(false);
+    m_pPipeline->winding(true);
+    
     //LOG("enter");
     //m_pRoot->add(Mesh::line(
     //    vec3(100.0f, 100.0f, 0.0f), vec3(200.0f, 200.0f, 0.0f),

Qor/BasicState.h

@@ -10,6 +10,7 @@
 #include "Sprite.h"
 #include "PlayerInterface2D.h"
 #include "Light.h"
+#include "Text.h"
 
 class Qor;
 
@@ -44,6 +45,9 @@ class BasicState:
         //unsigned m_DetailShader = ~0u;
 
         //unsigned m_Shader = ~0u;
+
+        std::shared_ptr<Font> m_pFont;
+        std::shared_ptr<Text> m_pText;
 };
 
 #endif

Qor/Font.h

@@ -12,6 +12,7 @@
 #include "Particle.h"
 #include "Material.h"
 #include "LoadingState.h"
+#include "Text.h"
 //#include "GUI.h"
 #include "kit/freq/freq.h"
 #include "kit/log/log.h"
@@ -74,7 +75,7 @@ Qor :: Qor(const Args& args):
     //m_Resources.register_class<Particle::Data>("particledata");
     //m_Resources.register_class<ParticleSystem::Data>("particlesystemdata");
     //m_Resources.register_class<Scene>("scene");
-    //m_Resources.register_class<GUI::Font>("font");
+    m_Resources.register_class<Font>("font");
     //m_Resources.register_class<GUI::Form>("form");
     m_Resources.register_class<PipelineShader>("shader");
 
@@ -384,14 +385,14 @@ unsigned Qor :: resolve_resource(
         return class_id;
     }
 #endif
-    if(ends_with(fn_cut, ".otf")) {
+    if(ends_with(fn_cut, ".ttf")) {
         static unsigned class_id = m_Resources.class_id("font");
         return class_id;
     }
-    if(ends_with(fn_cut, ".rml")) {
-        static unsigned class_id = m_Resources.class_id("form");
-        return class_id;
-    }
+    //if(ends_with(fn_cut, ".rml")) {
+    //    static unsigned class_id = m_Resources.class_id("form");
+    //    return class_id;
+    //}
 
     WARNINGf("wtf @ %s", fn);
     return std::numeric_limits<unsigned>::max();

Qor/Qor.cpp

@@ -6,6 +6,7 @@
 #include <vector>
 #include <future>
 #include "Texture.h"
+#include "Text.h"
 
 using namespace std;
 
@@ -31,6 +32,8 @@ Window :: Window(
         if(SDL_Init(SDL_INIT_EVERYTHING) < 0)
             K_ERROR(LIBRARY, "SDL");
 
+        Text::init();
+
         try{
 
             glm::ivec2 resolution;
@@ -174,6 +177,8 @@ void Window :: destroy()
     }
     m_condDelay.notify_all();
     m_DelayThread.join();
+
+    Text::deinit();
 
     if(m_GLContext)
         SDL_GL_DeleteContext(*m_GLContext);

Qor/Window.cpp

@@ -30,6 +30,7 @@ solution("qor")
             -- buildoptions { "-std=c++11", "-pedantic", "-Wall", "-Wextra", '-v', '-fsyntax-only'}
             links {
                 "pthread",
+                "SDL2_ttf",
                 "SDL2",
                 "GLEW",
                 "assimp",
@@ -98,6 +99,7 @@ solution("qor")
                 "OpenGL32",
                 "GLU32",
                 "SDL2",
+                "SDL2_ttf",
                 "GLEW32",
                 "assimp",
                 "freeimage",