new loading screen, updated deps

Author: flipcoder

Qor/BasicState.cpp

@@ -35,6 +35,7 @@ void BasicState :: preload()
     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());
+    std::this_thread::sleep_for(std::chrono::seconds(1));
 }
 
 BasicState :: ~BasicState()
@@ -54,9 +55,9 @@ void BasicState :: enter()
     m_pCamera->ortho();
     m_pRTTCamera->ortho();
     m_pPipeline->winding(true);
-    m_pRenderBuffer = std::make_shared<RenderBuffer>(100,100);
+    m_pRenderBuffer = std::make_shared<RenderBuffer>(1920,1080);
 
-    auto mat = make_shared<MeshMaterial>("logo.png", m_pQor->resources());
+    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>>{
@@ -68,7 +69,7 @@ void BasicState :: enter()
     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)))
+            make_shared<Wrap>(Prefab::quad_wrap())
         }, std::make_shared<MeshMaterial>(m_pRenderBuffer->texture())
     );
     m_pRoot->add(mesh);

Qor/LoadingState.cpp

@@ -18,13 +18,13 @@ LoadingState :: LoadingState(Qor* qor):
     m_pCamera(make_shared<Camera>(qor->resources(), qor->window())),
     m_pPipeline(qor->pipeline())
 {
-    m_bFade = m_pQor->args().value_or("no_loading_fade", "").empty();
+    //m_bFade = m_pQor->args().value_or("no_loading_fade", "").empty();
     string bg = m_pQor->args().value_or("loading_bg", "");
-    string shader = m_pQor->args().value_or("loading_shader", "");
-    if(not shader.empty()){
-        m_Shader = m_pPipeline->load_shaders({shader});
-        m_pPipeline->override_shader(PassType::NORMAL, m_Shader);
-    }
+    //string shader = m_pQor->args().value_or("loading_shader", "");
+    //if(not shader.empty()){
+    //    m_Shader = m_pPipeline->load_shaders({shader});
+    //    m_pPipeline->override_shader(PassType::NORMAL, m_Shader);
+    //}
 
     if(not bg.empty()){
         m_BG = Color(bg);
@@ -53,9 +53,9 @@ LoadingState :: LoadingState(Qor* qor):
     float sw = m_pQor->window()->size().x;
     float sh = m_pQor->window()->size().y;
 
-    if(m_pQor->exists("loading.png"))
+    if(m_pQor->exists("splash.png"))
     {
-        auto bg = make_shared<Mesh>(
+        m_pLogo = make_shared<Mesh>(
             make_shared<MeshGeometry>(Prefab::quad(
                 vec2(0.0f, 0.0f),
                 vec2(sw, sh)
@@ -64,14 +64,13 @@ LoadingState :: LoadingState(Qor* qor):
                 make_shared<Wrap>(Prefab::quad_wrap())
             },
             make_shared<MeshMaterial>(
-                m_pQor->resources()->cache_cast<ITexture>("loading.png")
+                m_pQor->resources()->cache_cast<ITexture>("splash.png")
             )
         );
-        bg->position(vec3(0.0f,0.0f,-1.0f));
-        m_pRoot->add(bg);
+        m_pLogo->position(vec3(0.0f,0.0f,-1.0f));
+        m_pRoot->add(m_pLogo);
     }
-    
-    if(m_pQor->exists("logo.png"))
+    else if(m_pQor->exists("logo.png"))
     {
         m_pLogo = make_shared<Mesh>(
             make_shared<MeshGeometry>(Prefab::quad(
@@ -91,6 +90,7 @@ LoadingState :: LoadingState(Qor* qor):
             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()));
@@ -193,8 +193,10 @@ void LoadingState :: logic(Freq::Time t)
         if(m_bFade){
             m_pPipeline->bg_color(m_Fade.get());
 
-            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/LoadingState.h

@@ -50,6 +50,7 @@ class LoadingState:
         std::shared_ptr<Sound> m_pMusic;
 #endif
         bool m_bFade = true;
+        bool m_bZoom = false;
         //Freq::Timed<Color> m_Fade;
 
         //std::shared_ptr<Node> m_pTemp;

Qor/Mesh.cpp

@@ -1362,22 +1362,22 @@ void Mesh :: load_assimp(std::string fn)
         aiTextureType type = aiTextureType_DIFFUSE;
         unsigned int ntex = aiscene->mMaterials[i]->GetTextureCount(type);
         aiString texpath;
-            aiTextureMapping mapping;
-            unsigned int uvindex;
-            float blend;
-            aiTextureOp op;
-            aiTextureMapMode mapmode[3];
-            aiscene->mMaterials[i]->GetTexture(
-                type,
-                0,
-                &texpath,
-                &mapping,
-                &uvindex,
-                &blend,
-                &op,
-                mapmode
-            );
-            auto aimat = aiscene->mMaterials[i];
+        aiTextureMapping mapping;
+        unsigned int uvindex;
+        float blend;
+        aiTextureOp op;
+        aiTextureMapMode mapmode[3];
+        aiscene->mMaterials[i]->GetTexture(
+            type,
+            0,
+            &texpath,
+            &mapping,
+            &uvindex,
+            &blend,
+            &op,
+            mapmode
+        );
+        auto aimat = aiscene->mMaterials[i];
         //assert(texpath.length);
 
         if(texpath.length){