Merge remote-tracking branch 'origin/master' into coal

Author: flipcoder

Qor/BasicState.cpp

@@ -16,58 +16,17 @@ BasicState :: BasicState(Qor* engine):
     m_pQor(engine),
     m_pInput(engine->input()),
     m_pRoot(make_shared<Node>()),
+    m_pRTTRoot(make_shared<Node>()),
     m_pPipeline(engine->pipeline()),
-    m_pResources(engine->resources()),
-    //m_pCanvas(make_shared<Canvas>(
-    //    engine->window()->size().x, engine->window()->size().y
-    //)),
-    m_pMenuGUI(make_shared<MenuGUI>(
-        engine->session()->profile(0)->controller().get(),
-        &m_MenuContext,
-        &m_MainMenu,
-        m_pPipeline->partitioner(),
-        engine->window(),
-        //m_pCanvas.get(),
-        m_pResources,
-        "PressStart2P-Regular.ttf",
-        engine->window()->size().y / 24.0f,
-        nullptr,
-        5
-    ))
-    //m_pMenuGUI(make_shared<MenuGUI>(
-    //    engine->session()->active_profile(0)->controller().get(),
-    //    &m_MenuContext,
-    //    &m_MainMenu,
-    //    m_pPipeline->partitioner(),
-    //    m_pCanvas.get(),
-    //    m_pResources,
-    //    "PRESS START 2P",
-    //    engine->window()->size().y / 30.0f,
-    //    nullptr,
-    //    7,
-    //    1.5f,
-    //    Canvas::LEFT,
-    //    32.0f,
-    //    MenuGUI::F_BOX,
-    //    engine->window()
-    //))
+    m_pResources(engine->resources())
 {}
 
 void BasicState :: preload()
 {
     m_pCamera = make_shared<Camera>(m_pQor->resources(), m_pQor->window());
     m_pRoot->add(m_pCamera->as_node());
-    m_pRoot->add(m_pMenuGUI);
-    //m_pRoot->add(m_pCanvas);
-
-    //m_pFont = m_pQor->resources()->cache_as<Font>("PressStart2P-Regular.ttf:30");
-    //m_pText = make_shared<Text>(m_pFont);
-    //m_pText->set("Hello World!\nAgain down here!\nHELLO?\nOK\nOK2\nReally long text here ok?");
-    //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);
+    m_pRTTCamera = make_shared<Camera>(m_pQor->resources(), m_pQor->window());
+    m_pRTTRoot->add(m_pRTTCamera->as_node());
 }
 
 BasicState :: ~BasicState()
@@ -77,49 +36,51 @@ BasicState :: ~BasicState()
 
 void BasicState :: enter()
 {
-    m_pPipeline->bg_color(Color::green());
+    float sw = m_pQor->window()->size().x;
+    float sh = m_pQor->window()->size().y;
+
+    //m_pPipeline->bg_color(Color::green());
     m_pCamera->ortho();
+    m_pRTTCamera->ortho();
     m_pPipeline->winding(true);
+    m_pRenderBuffer = std::make_shared<RenderBuffer>(100,100);
+
+    auto mat = make_shared<MeshMaterial>("logo.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
+    );
+    m_pRTTRoot->add(mesh);
 
-    m_MainMenu.options().emplace_back("OPTION 1", []{
-    });
-    m_MainMenu.options().emplace_back("OPTION 2", []{
-    });
-    m_MainMenu.options().emplace_back("OPTION 3", []{
-    });
-    m_MenuContext.clear(&m_MainMenu);
-    m_pRoot->add(m_pMenuGUI);
-    
-    //LOG("enter");
-    //m_pRoot->add(Mesh::line(
-    //    vec3(100.0f, 100.0f, 0.0f), vec3(200.0f, 200.0f, 0.0f),
-    //    m_pResources->cache_as<Texture>("particle.png")
-    //));
+    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)))
+        }, std::make_shared<MeshMaterial>(m_pRenderBuffer->texture())
+    );
+    m_pRoot->add(mesh);
 }
 
 void BasicState :: logic(Freq::Time t)
 {
     if(m_pInput->key(SDLK_ESCAPE))
         m_pQor->quit();
 
-    //float speed = 1000.0f * t.s();
-    
-    //if(m_pInput->key(SDLK_UP))
-    //    m_pCamera->move(glm::vec3(0.0f, -speed, 0.0f));
-    //if(m_pInput->key(SDLK_DOWN))
-    //    m_pCamera->move(glm::vec3(0.0f, speed, 0.0f));
-    
-    //if(m_pInput->key(SDLK_LEFT))
-    //    m_pCamera->move(glm::vec3(-speed, 0.0f, 0.0f));
-    //if(m_pInput->key(SDLK_RIGHT))
-    //    m_pCamera->move(glm::vec3(speed, 0.0f, 0.0f));
-
     m_pRoot->logic(t);
 }
 
 void BasicState :: render() const
 {
-    //m_pPipeline->override_shader(PassType::NORMAL, m_Shader);
+    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();
+
+    glViewport(0,0,sw,sh);
     m_pPipeline->render(m_pRoot.get(), m_pCamera.get());
 }
 

Qor/BasicState.h

@@ -12,6 +12,7 @@
 #include "Light.h"
 #include "Text.h"
 #include "Menu.h"
+#include "RenderBuffer.h"
 
 class Qor;
 
@@ -37,23 +38,18 @@ class BasicState:
         Cache<Resource, std::string>* m_pResources = nullptr;
 
         std::shared_ptr<Node> m_pRoot;
+        std::shared_ptr<Node> m_pRTTRoot;
         //std::shared_ptr<Node> m_pTemp;
         std::shared_ptr<Sprite> m_pSprite;
         std::shared_ptr<PlayerInterface2D> m_pPlayer;
         std::shared_ptr<TileMap> m_pMap;
         std::shared_ptr<Camera> m_pCamera;
+        std::shared_ptr<Camera> m_pRTTCamera;
         std::shared_ptr<Light> m_pLight;
+        std::shared_ptr<RenderBuffer> m_pRenderBuffer;
         //unsigned m_DetailShader = ~0u;
 
         //unsigned m_Shader = ~0u;
-
-        //std::shared_ptr<Font> m_pFont;
-        //std::shared_ptr<Text> m_pText;
-
-        //std::shared_ptr<Canvas> m_pCanvas;
-        MenuContext m_MenuContext;
-        Menu m_MainMenu;
-        std::shared_ptr<MenuGUI> m_pMenuGUI;
 };
 
 #endif

Qor/Filesystem.cpp

@@ -162,5 +162,17 @@ std::vector<char> file_to_buffer(const std::string& fn)
     return data;
 }
 
+//need a file to string method
+std::string file_to_string(const std::string & fn)
+{
+    ifstream file(fn);
+    if (!file)
+        return std::string();
+    string data(
+        (istreambuf_iterator<char>(file)),
+        istreambuf_iterator<char>()
+    );
+    return data;
+}
 
 } // END OF NAMESPACE

Qor/Filesystem.h

@@ -39,6 +39,7 @@ namespace Filesystem
         std::vector<std::string> extensions = std::vector<std::string>()
     );
     std::vector<char> file_to_buffer(const std::string& fn);
+    std::string file_to_string(const std::string& fn);
 }
 
 #endif

Qor/Qor.cpp

@@ -33,13 +33,13 @@ namespace fs = boost::filesystem;
 
 Qor* Qor :: s_pQor = nullptr;
 
-Qor :: Qor(const Args& args):
-    m_Args(args)
+Qor :: Qor(const Args& args, std::string appname="qor"):
+    m_Args(args),
+    m_App(appname)
 {
     m_Filename = args.filename();
     s_pQor = this;
 
-
     if(m_Args.has('d', "dedicated")||
        m_Args.has('s', "server"))
     {
@@ -151,7 +151,7 @@ Qor :: Qor(const Args& args):
     //    std::placeholders::_1
     //));
 
-    m_pSession = make_shared<Session>(m_pInput.get());
+    m_pSession = make_shared<Session>(appname, m_pInput.get());
     m_pInterpreter = make_shared<Interpreter>(
         "qor",
         (void*)this,

Qor/Qor.h

@@ -31,9 +31,9 @@ class Qor:
 {
     public:
 
-        Qor(const Args& args);
-        Qor(int argc, const char** argv):
-            Qor(Args(argc,argv))
+        Qor(const Args& args, std::string appname);
+        Qor(int argc, const char** argv, std::string appname="qor"):
+            Qor(Args(argc,argv), appname)
         {}
         virtual ~Qor();
 
@@ -274,6 +274,7 @@ class Qor:
         Freq::Alarm m_FPSAlarm;
         unsigned m_FramesLastSecond = 0;
         float m_FPS = 0.0f;
+        std::string m_App;
 
         static Qor* s_pQor;
 };