glm fix, new load, mesh quad func, py namespace fix

Author: flipcoder

Qor/BasicState.cpp

@@ -29,12 +29,14 @@ BasicState :: BasicState(Qor* engine):
 
 void BasicState :: preload()
 {
-    m_pQor->session()->module<Module>("blah");
+    auto rc = m_pQor->resources();
 
-    m_pCamera = make_shared<Camera>(m_pQor->resources(), m_pQor->window());
+    //m_pQor->session()->module<Module>("blah");
+    
+    m_pCamera = make_shared<Camera>(rc, m_pQor->window());
     m_pRoot->add(m_pCamera->as_node());
-    m_pRTTCamera = make_shared<Camera>(m_pQor->resources(), m_pQor->window());
-    m_pRTTRoot->add(m_pRTTCamera->as_node());
+    //m_pRTTCamera = make_shared<Camera>(m_pQor->resources(), m_pQor->window());
+    //m_pRTTRoot->add(m_pRTTCamera->as_node());
 
     // test loading screen
     //std::this_thread::sleep_for(std::chrono::seconds(1));
@@ -47,33 +49,39 @@ BasicState :: ~BasicState()
 
 void BasicState :: enter()
 {
-    state("foo", "bar");
-    LOG(state("foo"));
+    //state("foo", "bar");
+    //LOG(state("foo"));
 
     float sw = m_pQor->window()->size().x;
     float sh = m_pQor->window()->size().y;
+    auto rc = m_pQor->resources();
 
     //m_pPipeline->bg_color(Color::green());
     m_pCamera->ortho();
-    m_pRTTCamera->ortho();
+    //m_pRTTCamera->ortho();
     m_pPipeline->winding(true);
-    m_pRenderBuffer = std::make_shared<RenderBuffer>(1920,1080);
+    //m_pRenderBuffer = std::make_shared<RenderBuffer>(1920,1080);
 
-    auto mat = make_shared<MeshMaterial>("splash.png", m_pQor->resources());
-    auto mesh = make_shared<Mesh>(
-        make_shared<MeshGeometry>(Prefab::quad(vec2(0.0f, 0.0f), vec2(sw, sh))),
-        vector<shared_ptr<IMeshModifier>>{
-            make_shared<Wrap>(Prefab::quad_wrap(vec2(0.0f,1.0f), vec2(1.0f,0.0f)))
-        }, mat
+    auto mesh = Mesh::quad(
+        "splash.png",rc,
+        vec2(sw,sh)
     );
-    m_pRTTRoot->add(mesh);
+
+    //auto mat = make_shared<MeshMaterial>("splash.png", rc);
+    //auto mesh = make_shared<Mesh>(
+    //    make_shared<MeshGeometry>(Prefab::quad(vec2(0.0f, 0.0f), vec2(sw, sh))),
+    //    vector<shared_ptr<IMeshModifier>>{
+    //        make_shared<Wrap>(Prefab::quad_wrap(vec2(0.0f,1.0f), vec2(1.0f,0.0f)))
+    //    }, mat
+    //);
+    //m_pRTTRoot->add(mesh);
 
-    mesh = make_shared<Mesh>(
-        make_shared<MeshGeometry>(Prefab::quad(vec2(0.0f, 0.0f), vec2(sw, sh))),
-        vector<shared_ptr<IMeshModifier>>{
-            make_shared<Wrap>(Prefab::quad_wrap())
-        }, std::make_shared<MeshMaterial>(m_pRenderBuffer->texture())
-    );
+    //mesh = make_shared<Mesh>(
+    //    make_shared<MeshGeometry>(Prefab::quad(vec2(0.0f, 0.0f), vec2(sw, sh))),
+    //    vector<shared_ptr<IMeshModifier>>{
+    //        make_shared<Wrap>(Prefab::quad_wrap())
+    //    }, std::make_shared<MeshMaterial>(m_pRenderBuffer->texture())
+    //);
     m_pRoot->add(mesh);
 }
 
@@ -92,11 +100,11 @@ void BasicState :: render() const
     float sw = m_pQor->window()->size().x;
     float sh = m_pQor->window()->size().y;
 
-    m_pRenderBuffer->push();
-    m_pPipeline->render(m_pRTTRoot.get(), m_pRTTCamera.get());
-    RenderBuffer::pop();
+    //m_pRenderBuffer->push();
+    //m_pPipeline->render(m_pRTTRoot.get(), m_pRTTCamera.get());
+    //RenderBuffer::pop();
 
-    glViewport(0,0,sw,sh);
+    //glViewport(0,0,sw,sh);
     m_pPipeline->render(m_pRoot.get(), m_pCamera.get());
 }
 

Qor/Interpreter.cpp

@@ -1,7 +1,9 @@
 #include <cmath>
 #include <math.h>
 #include "Interpreter.h"
-#include "PythonBindings.h"
+#ifndef QOR_NO_PYTHON
+    #include "PythonBindings.h"
+#endif
 using namespace std;
 
 std::vector<Interpreter :: Context*> Interpreter :: s_Current;

Qor/LoadingState.cpp

@@ -20,6 +20,7 @@ LoadingState :: LoadingState(Qor* qor):
 {
     //m_bFade = m_pQor->args().value_or("no_loading_fade", "").empty();
     string bg = m_pQor->args().value_or("loading_bg", "");
+    auto rc = m_pQor->resources();
     //string shader = m_pQor->args().value_or("loading_shader", "");
     //if(not shader.empty()){
     //    m_Shader = m_pPipeline->load_shaders({shader});
@@ -36,66 +37,48 @@ LoadingState :: LoadingState(Qor* qor):
             m_BG = Color::black();
     }
 
-    if(!m_bFade)
-    {
+    //if(!m_bFade)
+    //{
         m_pPipeline->shader(1)->use();
         int fade = m_pPipeline->shader(1)->uniform("Brightness");
         m_pPipeline->shader(1)->uniform(
             fade, Color::white().vec3()
         );
-    }
+    //}
     m_pRoot->add(m_pCamera);
 
     vec2 win = vec2(m_pWindow->size().x, m_pWindow->size().y);
     const float icon_size = win.x / 24.0f;
     const float half_icon_size = icon_size / 2.0f;
-    
-    float sw = m_pQor->window()->size().x;
-    float sh = m_pQor->window()->size().y;
 
     if(m_pQor->exists("splash.png"))
     {
-        m_pLogo = make_shared<Mesh>(
-            make_shared<MeshGeometry>(Prefab::quad(
-                vec2(0.0f, 0.0f),
-                vec2(sw, sh)
-            )),
-            vector<shared_ptr<IMeshModifier>>{
-                make_shared<Wrap>(Prefab::quad_wrap())
-            },
-            make_shared<MeshMaterial>(
-                m_pQor->resources()->cache_cast<ITexture>("splash.png")
-            )
+        m_pLogo = Mesh::quad(
+            "splash.png",rc,
+            vec2(win.x,win.y),
+            //vec3(0.0f,0.0f,0.0f)
+            m_pWindow->center3f(),
+            vec2(0.5f)
+            //vec3(0.0f,0.0f,-1.0f)
         );
-        m_pLogo->position(vec3(0.0f,0.0f,-1.0f));
         m_pRoot->add(m_pLogo);
+        //m_bZoom = true;
     }
-    else if(m_pQor->exists("logo.png"))
+    else if(m_pQor->exists("loading.png"))
     {
-        m_pLogo = make_shared<Mesh>(
-            make_shared<MeshGeometry>(Prefab::quad(
-                -vec2(m_pWindow->size().y, m_pWindow->size().y)/4.0f,
-                vec2(m_pWindow->size().y, m_pWindow->size().y)/4.0f
-            )),
-            vector<shared_ptr<IMeshModifier>>{
-                make_shared<Wrap>(Prefab::quad_wrap())
-            },
-            make_shared<MeshMaterial>(
-                m_pQor->resources()->cache_cast<ITexture>("logo.png")
-            )
+        m_pLogo = Mesh::quad(
+            "loading.png",rc,
+            vec2(win.y/2.0f),
+            m_pWindow->center3f(),
+            vec2(0.5f)
         );
-        m_pLogo->move(vec3(
-            m_pWindow->center().x,
-            m_pWindow->center().y,
-            0.0f
-        ));
         m_pRoot->add(m_pLogo);
         m_bZoom = true;
     }
     //bg->position(vec3(0.0f,0.0f,-2.0f));
     //m_pLogo->add_modifier(make_shared<Wrap>(Prefab::quad_wrap()));
     //m_pLogo->material(make_shared<MeshMaterial>(
-    //    m_pQor->resources()->cache_cast<ITexture>(
+    //    rc->cache_cast<ITexture>(
     //        "logo.png"
     //    )
     //));
@@ -117,17 +100,17 @@ LoadingState :: LoadingState(Qor* qor):
     ));
     m_pWaitIcon->add_modifier(make_shared<Wrap>(Prefab::quad_wrap()));
     m_pWaitIcon->material(make_shared<MeshMaterial>(
-        m_pQor->resources()->cache_cast<ITexture>(
+        rc->cache_cast<ITexture>(
             "load-c.png"
         )
     ));
     m_pRoot->add(m_pWaitIcon);
 
     // loading screen style
-    if(m_bFade)
-        m_pPipeline->bg_color(m_BG);
-    else
-        m_pPipeline->bg_color(m_BG);
+    //if(m_bFade)
+    //    m_pPipeline->bg_color(m_BG);
+    //else
+    //    m_pPipeline->bg_color(m_BG);
 
     //fade_to(Color::white(), m_FadeTime);
     m_Fade.frame(Frame<Color>(
@@ -143,7 +126,7 @@ LoadingState :: LoadingState(Qor* qor):
 #ifndef QOR_NO_AUDIO
     try{
         Log::Silencer ls;
-        m_pMusic = make_shared<Sound>("loading.ogg", m_pQor->resources());
+        m_pMusic = make_shared<Sound>("loading.ogg", rc);
         m_pRoot->add(m_pMusic);
         m_pMusic->play();
     }catch(...){}
@@ -165,7 +148,7 @@ void LoadingState :: logic(Freq::Time t)
     Actuation::logic(t);
     m_pCamera->ortho(true);
     m_pPipeline->winding(false);
-    m_pPipeline->blend(false);
+    m_pPipeline->blend(true);
 
     if(m_pInput->escape())
         m_pQor->quit();
@@ -191,12 +174,12 @@ void LoadingState :: logic(Freq::Time t)
     // Loading screen fade style?
     if(m_pLogo)
         if(m_bFade){
-            m_pPipeline->bg_color(m_Fade.get());
+            //m_pPipeline->bg_color(m_Fade.get());
 
-            if(m_bZoom){
-                m_pLogo->reset_orientation();
-                m_pLogo->scale(m_Fade.get().r());
-            }
+            //if(m_bZoom){
+            //    m_pLogo->reset_orientation();
+            //    m_pLogo->scale(m_Fade.get().r());
+            //}
             m_pLogo->pend();
         }
 

Qor/Mesh.cpp

@@ -1860,6 +1860,7 @@ void Mesh :: set_matrix(glm::mat4 m)
     teleport(m);
 }
 
+// Prefab meshes
 
 std::shared_ptr<Mesh> Mesh :: line(glm::vec3 start, glm::vec3 end, shared_ptr<Texture> tex, float width)
 {
@@ -1881,3 +1882,26 @@ std::shared_ptr<Mesh> Mesh :: line(glm::vec3 start, glm::vec3 end, shared_ptr<Te
     return mesh;
 }
 
+std::shared_ptr<Mesh> Mesh :: quad(
+    string fn,
+    Cache<Resource, std::string>* cache,
+    vec2 size,
+    vec3 pos,
+    vec2 origin
+){
+    auto mesh = make_shared<Mesh>(
+        make_shared<MeshGeometry>(Prefab::quad(
+            -size*origin,
+            size*origin
+        )),
+        vector<shared_ptr<IMeshModifier>>{
+            make_shared<Wrap>(Prefab::quad_wrap())
+        },
+        make_shared<MeshMaterial>(
+            cache->cache_cast<ITexture>(fn)
+        )
+    );
+    mesh->position(pos);
+    return mesh;
+}
+

Qor/Mesh.h

@@ -905,7 +905,17 @@ class Mesh:
         void pend_callback();
 
         void load_assimp(std::string fn);
+
+        // Prefab methods
 
+        static std::shared_ptr<Mesh> quad(
+            std::string fn,
+            Cache<Resource, std::string>* cache,
+            glm::vec2 s = glm::vec2(1.0f),
+            glm::vec3 pos = glm::vec3(0.0f),
+            glm::vec2 origin = glm::vec2(0.0f) // 0=left,0.5=center,1=right,etc.
+        );
+
     private:
 
         mutable std::shared_ptr<Data> m_pData;