remove some song and gui test

Hopson97 · May 14, 2017 · b9be0f2 · b9be0f2
1 parent ecc3892
commit b9be0f2
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 4 deletions.
diff --git a/Data/Music/Chop_Suey_8_Bit_Cover_Tribute_to_System_of_a_Down_.ogg b/Data/Music/Chop_Suey_8_Bit_Cover_Tribute_to_System_of_a_Down_.ogg
diff --git a/Data/Music/Hypnotize_8_Bit_Tribute_to_System_of_a_Down_-_8_Bi.ogg b/Data/Music/Hypnotize_8_Bit_Tribute_to_System_of_a_Down_-_8_Bi.ogg
diff --git a/Source/GUI/Button.cpp b/Source/GUI/Button.cpp
@@ -9,7 +9,7 @@ namespace GUI
                    std::function<void(void)> function)
     :   m_function  (function)
     {
-        m_quad.setSize({500, 100});
+        m_quad.setSize({BASE_WIDTH, BASE_HEIGHT});
         m_quad.setTexture(&Component::guiTexture);
         m_quad.setOutlineColor(sf::Color::Black);
         m_quad.setOutlineThickness(4);

diff --git a/Source/GUI/Component.h b/Source/GUI/Component.h
@@ -10,6 +10,9 @@ namespace GUI
     class Component
     {
         public:
+            static constexpr int BASE_WIDTH     = 500;
+            static constexpr int BASE_HEIGHT    = 100;
+
             Component();
             virtual ~Component(){}
 

diff --git a/Source/GUI/Imaged_Button.cpp b/Source/GUI/Imaged_Button.cpp
@@ -10,7 +10,7 @@ namespace GUI
                                  std::function<void(void)>function)
     : m_function  (function)
     {
-        m_quad.setSize({800, 150});
+        m_quad.setSize({BASE_WIDTH, BASE_HEIGHT});
         m_quad.setTexture(&Component::guiTexture);
         m_quad.setOutlineColor(sf::Color::Black);
         m_quad.setOutlineThickness(2);

diff --git a/Source/GUI/Panel.cpp b/Source/GUI/Panel.cpp
@@ -67,7 +67,26 @@ namespace GUI
 
     void Panel::addComponentGrid2x(std::unique_ptr<Component>& component)
     {
+        if(m_2xCount == 2)
+        {
+            m_currentY += Component::BASE_HEIGHT;
+            m_2xRow++;
+            m_2xCount = 0;
+        }
+        m_2xCount++;
 
+        static auto w = Component::BASE_WIDTH;
+        if (m_isGrid2xleft)
+        {
+            component->setPosition({Display::get().getSize().x / 2 - component->getSize().x / 2 - w / 2,
+                                    float(m_currentY) });
+        }
+        else
+        {
+            component->setPosition({Display::get().getSize().x / 2 + component->getSize().x / 2 + w / 2,
+                                    float(m_currentY) });
+        }
+        m_isGrid2xleft = !m_isGrid2xleft;
     }
 
 

diff --git a/Source/GUI/Panel.h b/Source/GUI/Panel.h
@@ -46,6 +46,10 @@ namespace GUI
             int m_currentX = 0;
             int m_currentY = 15;
 
+            bool m_isGrid2xleft = true;
+            int  m_2xRow = 0;
+            int  m_2xCount = 0;
+
     };
 }
 

diff --git a/Source/GUI/Toggle_Option_Button.h b/Source/GUI/Toggle_Option_Button.h
@@ -21,7 +21,7 @@ namespace GUI
             ,   m_pOption       (&option)
             ,   m_label         (std::move(title))
             {
-                m_quad.setSize({500, 100});
+                m_quad.setSize({BASE_WIDTH, BASE_HEIGHT});
                 m_quad.setTexture(&Component::guiTexture);
                 m_quad.setOutlineColor(sf::Color::Black);
                 m_quad.setOutlineThickness(4);

diff --git a/Source/States/SPlaying.cpp b/Source/States/SPlaying.cpp
@@ -181,7 +181,7 @@ namespace State
         return
         {
             centre,
-            m_world.getHeightAt({centre, 0, centre}) + 3,
+            200, //m_world.getHeightAt({centre, 0, centre}) + 3,
             centre
         };
     }