aded persistence module for keeping track of stars for score screen

flipcoder · flipcoder · commit 7114370b54bf · 2016-12-04T17:50:58.000-08:00
diff --git a/bin/settings.json b/bin/settings.json
@@ -1,8 +1,8 @@
 {
    "audio" : {
-      "music-volume" : 100,
-      "sound-volume" : 100,
-      "volume" : 100
+      "music-volume" : 50,
+      "sound-volume" : 50,
+      "volume" : 50
    },
    "video" : {
       "resolution" : "1920x1080",
diff --git a/lib/Qor b/lib/Qor
@@ -1 +1 @@
-Subproject commit 7da2b27d7acb714dfeb4ad798d7e7869369020ea
+Subproject commit a7a96d59df52b3b869aa9cd7c915a876d99ade93
diff --git a/src/Game.cpp b/src/Game.cpp
@@ -6,6 +6,7 @@
 #include "Qor/Input.h"
 #include "Qor/Qor.h"
 #include "Qor/Shader.h"
+#include "Persistence.h"
 #include <glm/glm.hpp>
 #include <cstdlib>
 #include <chrono>
@@ -316,6 +317,11 @@ void Game :: preload() {
                 auto mapname = _this->m_pQor->args().value_or("map","1");
                 auto nextmap = to_string(boost::lexical_cast<int>(mapname) + 1);
 
+                // TODO: store star data in persistence module
+                auto ps = _this->m_pQor->session()->module<Persistence>("persistence");
+                ps->stars = _this->m_Stars;
+                ps->max_stars = _this->m_MaxStars;
+
                 _this->m_pQor->args().set("map", nextmap);
                 _this->m_pQor->change_state("pregame");
             }
diff --git a/src/Persistence.h b/src/Persistence.h
@@ -0,0 +1,13 @@
+#include "Qor/Session.h"
+
+class Persistence:
+    public Session::IModule
+{
+    public:
+
+        virtual ~Persistence() {}
+
+        std::vector<int> stars;
+        std::vector<int> max_stars;
+};
+
diff --git a/src/Pregame.cpp b/src/Pregame.cpp
@@ -3,6 +3,7 @@
 #include "Qor/Input.h"
 #include "Qor/Material.h"
 #include "Qor/Qor.h"
+#include "Persistence.h"
 #include <glm/glm.hpp>
 #include <cstdlib>
 #include <chrono>
@@ -12,6 +13,8 @@ using namespace std;
 using namespace glm;
 using namespace Filesystem;
 
+//const std::vector<int> HUD :: STAR_LEVELS = { 7, 6, 2 };
+
 Pregame :: Pregame(Qor* engine):
     m_pQor(engine),
     m_pInput(engine->input()),
@@ -89,6 +92,22 @@ void Pregame :: preload() {
 		return;
 	}
 	m_pText->set(string("Now entering: ") + map_name);
+
+    //auto mat = make_shared<MeshMaterial>("items.png", m_pCache);
+
+    //auto mesh = make_shared<Mesh>(
+    //    make_shared<MeshGeometry>(Prefab::quad(vec2(sw / 24, sw / 24))),
+    //    vector<shared_ptr<IMeshModifier>>{
+    //        make_shared<Wrap>(Prefab::tile_wrap(
+    //            // Y Y (height is tile size for both dims)
+    //            uvec2(16,16),
+    //            // X Y
+    //            uvec2(mat->texture()->size().x, mat->texture()->size().y),
+    //            STAR_LEVELS[0]
+    //        ))
+    //    }, mat
+    //);
+    //add(mesh);
     
     //// TEMP: just for jam
     /*
@@ -133,6 +152,10 @@ void Pregame :: preload() {
     }
     //m_pRoot->add(m_pCanvas);
     */
+
+    auto ps = m_pQor->session()->module<Persistence>("persistence");
+    m_Stars = ps->stars;
+    m_MaxStars = ps->max_stars;
 }
 
 
@@ -148,6 +171,8 @@ void Pregame :: enter() {
     m_pPipeline->winding(true);
     m_pPipeline->bg_color(Color::black());
     m_pInput->relative_mouse(false);
+
+    Sound::play(m_pCamera.get(), "starpop.wav", m_pResources);
 }
 
 
diff --git a/src/Pregame.h b/src/Pregame.h
@@ -31,13 +31,14 @@ class Pregame: public State {
         virtual void render() const override;
         virtual bool needs_load() const override { return true; }
 
-
     private:
+
+        //static const std::vector<int> STAR_LEVELS;
+        
         // Variables
         bool m_Win = false;
         Freq::Alarm m_Transition;
 
-
         // Pointers
         Qor* m_pQor = nullptr;
         Input* m_pInput = nullptr;
@@ -52,6 +53,10 @@ class Pregame: public State {
 
         std::shared_ptr<Font> m_pFont;
         std::shared_ptr<Text> m_pText;
+
+        std::vector<int> m_Stars;
+        std::vector<int> m_MaxStars;
 };
 
 #endif
+
