Remove sf::RenderWindow, replace with sf::Window

Hopson97 · Jul 19, 2019 · efcaafc · efcaafc
1 parent d2974a5
commit efcaafc
Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/Source/Application.h b/Source/Application.h
@@ -32,7 +32,7 @@ class Application
 
         Camera& getCamera() { return m_camera; }
 
-        const sf::RenderWindow& getWindow() const { return m_context.window; }
+        const sf::Window& getWindow() const { return m_context.window; }
 
         void turnOffMouse();
         void turnOnMouse ();

diff --git a/Source/Context.h b/Source/Context.h
@@ -9,7 +9,7 @@ struct Context
 {
     Context(const Config& config);
 
-    sf::RenderWindow window;
+    sf::Window window;
 };
 
 #endif // CONTEXT_H_INCLUDED
diff --git a/Source/Player/Player.cpp b/Source/Player/Player.cpp
@@ -74,7 +74,7 @@ ItemStack& Player::getHeldItems()
 }
 
 
-void Player::handleInput(const sf::RenderWindow& window)
+void Player::handleInput(const sf::Window& window)
 {
     keyboardInput();
     mouseInput(window);
@@ -240,7 +240,7 @@ void Player::keyboardInput()
     }
 }
 
-void Player::mouseInput(const sf::RenderWindow& window)
+void Player::mouseInput(const sf::Window& window)
 {
     static bool useMouse = true;
     static ToggleKey useMouseKey (sf::Keyboard::L);

diff --git a/Source/Player/Player.h b/Source/Player/Player.h
@@ -16,7 +16,7 @@ class Player : public Entity
     public:
         Player();
 
-        void handleInput(const sf::RenderWindow& window);
+        void handleInput(const sf::Window& window);
 
         void update(float dt, World& wolrd);
         void collide(World& world, const glm::vec3& vel, float dt);
@@ -31,7 +31,7 @@ class Player : public Entity
         void jump();
 
         void keyboardInput();
-        void mouseInput(const sf::RenderWindow& window);
+        void mouseInput(const sf::Window& window);
         bool m_isOnGround = false;
         bool m_isFlying   = false;
 

diff --git a/Source/Renderer/RenderMaster.cpp b/Source/Renderer/RenderMaster.cpp
@@ -10,7 +10,7 @@
 
 void RenderMaster::drawSFML(const sf::Drawable& drawable)
 {
-    m_sfmlRenderer.add(drawable);
+    //m_sfmlRenderer.add(drawable);
 }
 
 void RenderMaster::drawChunk(const ChunkSection& chunk)
@@ -34,7 +34,7 @@ void RenderMaster::drawSky()
     m_drawBox = true;
 }
 
-void RenderMaster::finishRender(sf::RenderWindow& window, const Camera& camera)
+void RenderMaster::finishRender(sf::Window& window, const Camera& camera)
 {
     glClearColor(0.0, 0.0, 0.0, 1.0);
     glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
@@ -53,7 +53,7 @@ void RenderMaster::finishRender(sf::RenderWindow& window, const Camera& camera)
         m_drawBox = false;
     }
 
-    m_sfmlRenderer  .render (window);
+    //m_sfmlRenderer  .render (window);
 
     window.display();
 }

diff --git a/Source/Renderer/RenderMaster.h b/Source/Renderer/RenderMaster.h
@@ -20,7 +20,7 @@ class RenderMaster
         void drawChunk(const ChunkSection& chunk);
         void drawSky();
 
-        void finishRender(sf::RenderWindow& window, const Camera& camera);
+        void finishRender(sf::Window& window, const Camera& camera);
 
     private:
         //Chunks
@@ -30,7 +30,7 @@ class RenderMaster
 
         //Detail
         SkyboxRenderer  m_skyboxRenderer;
-        SFMLRenderer    m_sfmlRenderer;
+        //SFMLRenderer    m_sfmlRenderer;
 
         bool m_drawBox = false;
 };

diff --git a/Source/Renderer/SFMLRenderer.cpp b/Source/Renderer/SFMLRenderer.cpp
@@ -8,8 +8,9 @@ void SFMLRenderer::add(const sf::Drawable& drawable)
     m_draws.push_back(&drawable);
 }
 
-void SFMLRenderer::render(sf::RenderWindow& window)
+void SFMLRenderer::render(sf::Window& window)
 {
+    /*
     if (m_draws.empty())
         return;
 
@@ -29,5 +30,5 @@ void SFMLRenderer::render(sf::RenderWindow& window)
     }
 
     window.popGLStates();
-    m_draws.clear();
+    m_draws.clear();*/
 }
diff --git a/Source/Renderer/SFMLRenderer.h b/Source/Renderer/SFMLRenderer.h
@@ -9,7 +9,7 @@ class SFMLRenderer
     public:
         void add(const sf::Drawable& drawable);
 
-        void render(sf::RenderWindow& window);
+        void render(sf::Window& window);
 
     private:
         std::vector<const sf::Drawable*> m_draws;