gain init, lazy text size

Author: flipcoder

Qor/Sound.cpp

@@ -4,6 +4,10 @@
 #include "Headless.h"
 using namespace std;
 
+float Sound :: GAIN = 1.0f;
+float Sound :: SOUND_GAIN = 1.0f;
+float Sound :: MUSIC_GAIN = 1.0f;
+
 shared_ptr<Sound> Sound :: raw(std::function<int(char*,int)> func, Cache<Resource, std::string>* cache)
 {
     auto snd = make_shared<Sound>(cache);
@@ -49,7 +53,8 @@ Sound :: Sound(const std::string& fn, Cache<Resource, std::string>* cache):
             m_bAmbient = m_pConfig->at<bool>("ambient", false);
             m_bMusic = m_pConfig->at<bool>("music", m_bStream);
             m_bLoop = m_pConfig->at<bool>("loop", m_bLoop);
-            m_Gain = m_pConfig->at<double>("gain", 1.0f) * m_pConfig->at<double>("volume", 1.0f);
+            m_Gain = (m_bMusic?MUSIC_GAIN:SOUND_GAIN) * GAIN *
+                m_pConfig->at<double>("gain", 1.0f) * m_pConfig->at<double>("volume", 1.0f);
             //m_bAutoplay = m_pConfig->at<bool>("autoplay", false);
         }
 
@@ -86,7 +91,7 @@ void Sound :: update_signals()
         int g = m_pResources->config()->meta("audio")->at<int>("volume", 100);
         int v = m_pResources->config()->meta("audio")->at<int>(vol, 100);
         float val = (g / 100.0f) * (v / 100.0f);
-        m_pSource->gain = val * m_Gain;
+        m_pSource->gain = (m_bMusic?MUSIC_GAIN:SOUND_GAIN) * GAIN * val * m_Gain;
     };
     vol_cb();
     m_VolCon = m_pResources->config()->meta("audio")->on_change(vol, vol_cb);

Qor/Sound.h

@@ -11,6 +11,10 @@ class Sound:
     public Node
 {
     public:
+
+        static float GAIN;
+        static float SOUND_GAIN;
+        static float MUSIC_GAIN;
 
         Sound(Cache<Resource, std::string>* cache);
         Sound(const std::string& fn, Cache<Resource, std::string>* cache);
@@ -69,6 +73,7 @@ class Sound:
         void loop(bool b);
 
         void gain(float g);
+        bool music() const { return m_bMusic; }
 
     private:
 

Qor/Text.cpp

@@ -67,6 +67,28 @@ Text :: Text(const std::shared_ptr<Font>& font):
     m_pFont(font)
 {
     init();
+    
+    auto _this = this;
+    m_ImgSize = kit::lazy<ivec2>([_this]{
+        vector<string> lines;
+        boost::split(lines, _this->m_Text, boost::is_any_of("\n"));
+        
+        SDL_Surface* tmp = nullptr;
+        SDL_Rect rect;
+        
+        int width=0;
+        int lineheight;
+        int height=0;
+        for(int i=0;i<lines.size();++i){
+            int sz;
+            TTF_SizeText(_this->m_pFont->font(), lines[i].c_str(), &sz, &lineheight);
+            if(sz > width)
+                sz = width;
+            height += _this->m_pFont->m_Size;
+        }
+        return ivec2(width,height);
+    });
+
 }
 
 Text :: ~Text()
@@ -98,9 +120,9 @@ void Text :: redraw()
     SDL_Surface* tmp = nullptr;
     SDL_Rect rect;
 
-    int width=0;
-    int lineheight=0;
-    int height=0;
+    int width = 0;
+    int height = 0;
+    int lineheight = 0;
     for(int i=0;i<lines.size();++i){
         int sz;
         TTF_SizeText(m_pFont->font(), lines[i].c_str(), &sz, &lineheight);
@@ -177,6 +199,7 @@ void Text :: logic_self(Freq::Time t)
     if(m_bDirty) {
         redraw();
         m_bDirty = false;
+        m_ImgSize.pend();
     }
 }
 
@@ -185,13 +208,15 @@ void Text :: set(std::string tx)
     if(m_Text != tx){
         m_Text = tx;
         m_bDirty = true;
+        m_ImgSize.pend();
     }
 }
 
 void Text :: align(Align a)
 {
     m_Align = a;
     m_bDirty = true;
+    m_ImgSize.pend();
 }
 
 void Text :: color(Color c)
@@ -200,4 +225,3 @@ void Text :: color(Color c)
     m_bDirty = true;
 }
 
-

Qor/Text.h

@@ -4,6 +4,7 @@
 #include <string>
 #include <SDL2/SDL_ttf.h>
 #include "kit/cache/icache.h"
+#include "kit/reactive/reactive.h"
 #include "Node.h"
 #include "Resource.h"
 #include "Texture.h"
@@ -14,6 +15,8 @@ class Font:
 {
     public:
 
+        friend class Text;
+
         Font();
         Font(const std::string& fn, ICache* c);
         Font(const std::tuple<std::string, ICache*>& args);
@@ -67,6 +70,7 @@ class Text:
         void color(Color c);
 
         glm::uvec2 size() const { return m_pTexture->size(); }
+        glm::uvec2 img_size() const { return m_ImgSize.get(); }
 
     private:
 
@@ -80,6 +84,9 @@ class Text:
         //SDL_Surface* m_pSurface = nullptr;
         float m_LineSpacing = 0.0f;
 
+        friend class kit::lazy<glm::ivec2>;
+        kit::lazy<glm::ivec2> m_ImgSize;
+
         std::shared_ptr<Texture> m_pTexture;
         std::shared_ptr<Mesh> m_pMesh;
 };