Refactor & Fix inverted text & More

main.cpp

@@ -5,17 +5,19 @@
 #include <J3ML/LinearAlgebra/Vector2.h>
 
 using J3ML::LinearAlgebra::Vector2;
+using namespace JGL;
 
-struct Character
-{
-    unsigned int TextureID; // ID handle of the glyph texture
-    Vector2 Size;           // Size of glyph
-    Vector2 Bearing;        // Offset from baseline to left/top of glyph
-    unsigned int Advance;   // Offset to advance to next glyph
-};
-
-std::map<char, Character> Characters;
-GLuint VAO, VBO;
+//The Re3D style base projection.
+std::vector<GLfloat> perspective(float fov, float aspect, float nearPlane, float farPlane) {
+    std::vector<float> result(16);
+    float f = 1.0f / tan(fov * 0.5f * M_PI / 180.0f);
+    result[0] = f / aspect;
+    result[5] = f;
+    result[10] = (farPlane + nearPlane) / (nearPlane - farPlane);
+    result[11] = -1.0f;
+    result[14] = (2.0f * farPlane * nearPlane) / (nearPlane - farPlane);
+    return result;
+}
 
 using J3ML::LinearAlgebra::Matrix4x4;
 
@@ -32,81 +34,69 @@ int Jupiteroid;
 class JGLDemoWindow : public ReWindow::RWindow
 {
 public:
-
-    JGLDemoWindow() : ReWindow::RWindow() {}
-    JGLDemoWindow(const std::string& title, int width, int height) : ReWindow::RWindow(title, width, height){}
-
     void initGL() {
-        gladLoadGL();
+        auto window_size = getSize();
+        auto aspect = (float) window_size[0] / (float) window_size[1];
 
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        glOrtho(0, getSize().x, getSize().y, 0, -1, 1);
-        glMatrixMode(GL_MODELVIEW);
+        gladLoadGL();
+        JGL::Update(getSize());
+        FreeSans = JGL::LoadFont("assets/fonts/FreeSans.ttf");
+        Jupiteroid = JGL::LoadFont("assets/fonts/Jupiteroid.ttf");
 
         glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-        glEnable(GL_CULL_FACE);
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glEnable(GL_TEXTURE_2D);
-
-         JGL::InitTextEngine();
-         FreeSans = JGL::LoadFont("assets/fonts/FreeSans.ttf");
-         Jupiteroid = JGL::LoadFont("assets/fonts/Jupiteroid.ttf");
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        glMultMatrixf(perspective(75, aspect, 0.001, 100).data());
+        glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
+        glClearColor(0.f, 0.f, 0.f, 0.f);
+        glViewport(0,0,window_size.x,window_size.y);
+        glEnable(GL_DEPTH_TEST);
+        glDepthFunc(GL_LESS);
+        glDepthMask(GL_TRUE);
     }
 
 
     void display() {
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        glOrtho(0, getSize().x, getSize().y, 0, -1, 1);
         glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
 
-        JGL::J2D::FillRect2D(JGL::Colors::Blue, {32, 32}, {100.5, 100.5});
-        JGL::J2D::FillRect2D(JGL::Colors::Blue, {32, 32}, {100.5, 100.5});
+        ///All 3D elements of the scene and JGL elements *must* be rendered before the 2d stuff.
+        J3D::Begin();
+            J3D::DrawLine(JGL::Colors::Red, {0,0,-1}, {1,0,-1.5});
+            J3D::DrawLine(JGL::Colors::Red, {0,0.0,-1}, {0,0.5,-1});
+            J3D::DrawString(JGL::Colors::Red, "JGL Sample Text", {-13, 1, -10.0f}, 0.0225, 32, FreeSans);
+        J3D::End();
 
-        JGL::Triangle2D tri
-                {
-                        {140, 200},
-                        {135, 100},
-                        {105, 100}
-                };
-        JGL::J2D::FillTriangle2D(JGL::Colors::Yellow, tri);
-        JGL::J2D::DrawLine2D(JGL::Colors::Greens::DarkGreen, {10, 10}, {200, 300});
-        JGL::J3D::DrawLine3D(JGL::Colors::Red, {0,0,0}, {1,0,0});
-        JGL::J3D::DrawLine3D(JGL::Colors::Red, {0,0,0}, {1,0,0});
-
-        JGL::J3D::DrawString3D(JGL::Colors::Red, "JGL Sample Text", {1, -32, 0.5f}, 1.f, 32, FreeSans);
-        JGL::J2D::DrawString2D(JGL::Colors::Green, "Jupiteroid Font", 0.f, -48.f, 1.f, 16, Jupiteroid);
-
-        //glFlush();
+        J2D::Begin();
+            J2D::FillRect(JGL::Colors::Blue, {32, 32}, {100.5, 100.5});
+            J2D::FillTriangle(JGL::Colors::Yellow, {{140, 200},{135, 100},{105, 100}});
+            J2D::DrawLine(JGL::Colors::Greens::DarkGreen, {10, 10}, {200, 300});
+            J2D::DrawString(JGL::Colors::Green, "Jupteroid Font", 0.f, -48.f, 1.f, 16, Jupiteroid);
+        J2D::End();
     }
 
-    void OnRefresh(float elapsed) override
-    {
+    void OnRefresh(float elapsed) override {
         display();
-        this->glSwapBuffers();
-    }
-    bool OnResizeRequest(const ReWindow::WindowResizeRequestEvent& e) override
-    {
-        return true;
+        glSwapBuffers();
     }
+
+    bool OnResizeRequest(const ReWindow::WindowResizeRequestEvent& e) override {return true;}
+    JGLDemoWindow() : ReWindow::RWindow() {}
+    JGLDemoWindow(const std::string& title, int width, int height) : ReWindow::RWindow(title, width, height){}
 };
 
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
     auto* window = new JGLDemoWindow("JGL Demo Window", 1280, 720);
     window->setRenderer(RenderingAPI::OPENGL);
     window->Open();
     window->initGL();
     window->setResizable(false);
-    while (window->isAlive())
-    {
+
+    while (window->isAlive()) {
         window->pollEvents();
         window->refresh();
     }
-
     return 0;
 }