also source drawing game from messages

diff --git a/src/app/Application.h b/src/app/Application.h
index 79f0e552a08ab2de2830afc23f6125705e935be3..f41c62ef87bf833592e95c37a0f5ff70e019ab5c 100644 (file)
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -192,6 +192,9 @@ private:
                msg.SetChannel(channel);
                msg.SetBirth(stream.GetVideoClock().Snapshot());
                msg.Update(renderer.GetContext());
+               if (state.HasGame()) {
+                       state.GetGame().Handle(msg);
+               }
        }
 
        void HandleTwitch(const twitch::IRCMessage &msg) {

diff --git a/src/app/DrawingGame.h b/src/app/DrawingGame.h
index 080ee613669c909fc1a83bd89e22fb078810ca12..1256a4ed8ea088258c37867698576e3db5b21fc4 100644 (file)
--- a/src/app/DrawingGame.h
+++ b/src/app/DrawingGame.h
@@ -39,6 +39,13 @@ public:
                }
        }
 
+       virtual void Handle(const Message &msg) {
+               std::string text = msg.GetText();
+               if (!text.empty()) {
+                       QueueCommands(text);
+               }
+       }
+
        virtual void Update(cairo::Context &ctx, const Clock &now) {
                int amount = draw_timer.ActivationsBetween(last_update, now);
                while (amount > 0 && !command_queue.empty()) {

diff --git a/src/app/Game.h b/src/app/Game.h
index c8512e1a6729c5ed11921e233beef3375dc690f1..51ddb6c0f123cc04cf63f37c39507be8b9ed01e1 100644 (file)
--- a/src/app/Game.h
+++ b/src/app/Game.h
@@ -2,6 +2,7 @@
 #define TEST_APP_GAME_H_
 
 #include "Clock.h"
+#include "Message.h"
 #include "../cairo/Context.h"
 #include "../twitch/IRCMessage.h"
 
@@ -16,6 +17,8 @@ public:
 public:
        virtual void Handle(const twitch::IRCMessage &) = 0;
 
+       virtual void Handle(const Message &) = 0;
+
        virtual void Update(cairo::Context &, const Clock &) = 0;
 
        virtual void Render(cairo::Context &) const = 0;

diff --git a/src/app/Message.h b/src/app/Message.h
index 96e52762669b5560514f16a44c7009c2ce93515d..fea852a6f4d0da074232efa29f95a9c76dcec4a0 100644 (file)
--- a/src/app/Message.h
+++ b/src/app/Message.h
@@ -55,7 +55,12 @@ public:
        }
 
        void SetText(const std::string &t) {
-               text_layout.SetText(t);
+               text = t;
+               text_layout.SetText(text);
+       }
+
+       const std::string &GetText() const {
+               return text;
        }
 
        void SetChannel(const std::string &c) {
@@ -105,6 +110,7 @@ private:
        gfx::ColorRGB channel_color;
 
        Clock birth;
+       std::string text;
        gfx::Position pos;
        gfx::Size size;
        gfx::Spacing padding;