Adição de escala na construção da janela.

fgagamedev · Jun 1, 2016 · 2a6d777 · 2a6d777
1 parent e620dd3
commit 2a6d777
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/include/engine.h b/include/engine.h
@@ -32,7 +32,7 @@ namespace ijengine {
     };
 
     namespace video {
-        Window * create_window(const string& title, int w, int h);
+        Window * create_window(const string& title, int w, int h, double scale);
     }
 
     namespace audio {

diff --git a/include/game.h b/include/game.h
@@ -12,7 +12,7 @@ namespace ijengine {
 
     class Game : public GameEventsListener {
     public:
-        Game(const string& title, int w = 800, int h = 600);
+        Game(const string& title, int w = 800, int h = 600, double scale = 1.0);
         ~Game();
 
         int run(const string& level_id);
@@ -24,6 +24,7 @@ namespace ijengine {
 
         string m_title;
         int m_w, m_h;
+        double m_scale;
         State m_state;
     };
 

diff --git a/include/kernel.h b/include/kernel.h
@@ -25,7 +25,8 @@ namespace ijengine {
     public:
         virtual ~Kernel() {}
 
-        virtual Window * create_window(const string& title, int w, int h) = 0;
+        virtual Window * create_window(const string& title, int w, int h,
+            double scale) = 0;
 
         virtual void set_audio_dir(const string& dir_path) = 0;
         virtual void play_audio_from_path(const string& title) = 0;

diff --git a/kernel/sdl2/sdl2kernel.cpp b/kernel/sdl2/sdl2kernel.cpp
@@ -49,7 +49,7 @@ SDL2Kernel::~SDL2Kernel()
 }
 
 Window *
-SDL2Kernel::create_window(const string& title, int w, int h)
+SDL2Kernel::create_window(const string& title, int w, int h, double scale)
 {
     SDL_Window *window;
     SDL_Renderer *renderer;
@@ -58,6 +58,7 @@ SDL2Kernel::create_window(const string& title, int w, int h)
         return nullptr;
 
     SDL_SetWindowTitle(window, title.c_str());
+    SDL_RenderSetScale(renderer, scale, scale);
 
     return new SDL2Window(window, renderer);
 }

diff --git a/kernel/sdl2/sdl2kernel.h b/kernel/sdl2/sdl2kernel.h
@@ -15,7 +15,7 @@ class SDL2Kernel : public Kernel {
     SDL2Kernel();
     ~SDL2Kernel();
 
-    Window * create_window(const string& title, int w, int h);
+    Window * create_window(const string& title, int w, int h, double scale);
 
     void set_audio_dir(const string& dir_path);
     void play_audio_from_path(const string& title);

diff --git a/src/engine.cpp b/src/engine.cpp
@@ -77,9 +77,9 @@ namespace ijengine
     namespace video 
     {
         Window *
-        create_window(const string& title, int w, int h)
+        create_window(const string& title, int w, int h, double scale)
         {
-            return kernel->create_window(title, w, h);
+            return kernel->create_window(title, w, h, scale);
         }
     }
 

diff --git a/src/game.cpp b/src/game.cpp
@@ -11,8 +11,8 @@ using std::unique_ptr;
 
 namespace ijengine {
 
-    Game::Game(const string& title, int w, int h)
-        : m_title(title), m_w(w), m_h(h), m_state(PAUSED)
+    Game::Game(const string& title, int w, int h, double scale)
+        : m_title(title), m_w(w), m_h(h), m_scale(scale), m_state(PAUSED)
     {
         event::register_listener(this);
     }
@@ -25,7 +25,7 @@ namespace ijengine {
     int
     Game::run(const string& level_id)
     {
-        auto test = video::create_window(m_title, m_w, m_h);
+        auto test = video::create_window(m_title, m_w, m_h, m_scale);
         auto window = unique_ptr<Window>(test);
 
         if (not window)