Revert "Battery icon in editor"

This reverts commit a45a55f.

Author: jmorton06

Lumos/src/Core/OS/OS.h

@@ -34,11 +34,7 @@ namespace Lumos
 		//Mobile only
 		virtual void ShowKeyboard() {};
 		virtual void HideKeyboard() {};
-        
-        virtual PowerState GetPowerState() { return POWERSTATE_UNKNOWN; }
-        virtual int BatteryPercentage() { return 100; }
-        virtual int BatterySecondsLeft() { return 100; }
-        
+
     protected:
 
         static OS* s_Instance;

Lumos/src/Editor/Editor.cpp

@@ -11,13 +11,11 @@
 
 #include "App/Application.h"
 #include "Core/OS/Input.h"
-#include "Core/OS/OS.h"
 #include "Core/Profiler.h"
 #include "App/Engine.h"
 #include "App/Scene.h"
 #include "App/SceneManager.h"
 #include "Events/ApplicationEvent.h"
-//#include "Utilities/CommonUtils.h"
 
 #include "ECS/Component/Components.h"
 #include "Physics/LumosPhysicsEngine/LumosPhysicsEngine.h"
@@ -352,41 +350,6 @@ namespace Lumos
                 if (selected)
                     ImGui::PopStyleColor();
             }
-            
-            ImGui::SameLine(ImGui::GetWindowContentRegionMax().x - 25.0f);
-
-            {
-                auto* os = OS::Instance();
-                auto powerState = os->GetPowerState();
-                
-                switch(powerState)
-                {
-                    case POWERSTATE_CHARGING :
-                        ImGui::Text(ICON_FA_BATTERY_FULL);
-                        break;
-                    case POWERSTATE_ON_BATTERY :
-                        ImGui::Text(ICON_FA_BATTERY_FULL);
-                        break;
-                    case POWERSTATE_NO_BATTERY :
-                        ImGui::Text(ICON_FA_BATTERY_EMPTY);
-                        ImGuiHelpers::Tooltip("Battery");
-                        break;
-                    case POWERSTATE_CHARGED :
-                        ImGui::Text(ICON_FA_BATTERY_FULL);
-                        break;
-                        
-                    default : break;
-                }
-                
-                int seconds = os->BatterySecondsLeft();
-                
-                int minutes,hours;
-                
-               // CommonUtils::SecondsToHoursAndMinutes(seconds, hours, minutes, seconds);
-                
-                ImGuiHelpers::Tooltip("Battery");
-            }
-            
 
 			ImGui::PopStyleColor();
 			ImGui::EndMainMenuBar();

Lumos/src/ImGui/ImGuiLayer.h

@@ -23,7 +23,7 @@ namespace Lumos
 		void OnAttach() override;
 		void OnDetach() override;
 		void OnUpdate(TimeStep* dt, Scene* scene) override;
-		void OnEvent(Event& event);
+		void OnEvent(Event& event) override;
 		void OnRender(Scene* scene) override;
 		void OnNewScene(Scene* scene) override;
 

Lumos/src/Physics/B2PhysicsEngine/B2PhysicsEngine.h

@@ -21,7 +21,7 @@ namespace Lumos
 		~B2PhysicsEngine();
 		void SetDefaults();
 
-		void OnUpdate(TimeStep* timeStep, Scene* scene);
+		void OnUpdate(TimeStep* timeStep, Scene* scene) override;
 		void OnInit() override {};
 		void OnImGui() override;
 

Lumos/src/Platform/macOS/macOSOS.h

@@ -12,10 +12,6 @@ namespace Lumos
         void Init();
         void Run() override;
         String GetExecutablePath() override;
-        
-        PowerState GetPowerState() override;
-        int BatteryPercentage() override;
-        int BatterySecondsLeft() override;
 
 	};
 }

Lumos/src/Platform/macOS/macOSOS.mm

@@ -55,28 +55,4 @@
         }
         return buffer.data();
     }
-
-    PowerState macOSOS::GetPowerState()
-    {
-        auto power = macOSPower();
-        auto state = power.GetPowerState();
-
-        return state;
-    }
-
-    int macOSOS::BatteryPercentage()
-    {
-        auto power = macOSPower();
-        auto percentage = power.GetPowerPercentageLeft();
-
-        return percentage;
-    }
-
-    int macOSOS::BatterySecondsLeft()
-    {
-        auto power = macOSPower();
-        auto seconds = power.GetPowerSecondsLeft();
-
-        return seconds;
-    }
 }

Lumos/src/Utilities/CommonUtils.h

@@ -50,12 +50,5 @@ namespace Lumos
 		void AddLightCube(Scene* scene);
 		void AddSphere(Scene* scene);
 		void AddPyramid(Scene* scene);
-    
-    void SecondsToHoursAndMinutes(int seconds, int& hours, int& minutes, int& leftoverSeconds)
-    {
-        hours = floor(seconds / 3600);
-        minutes = seconds % 3600 / 60;
-        
-        leftoverSeconds = seconds - seconds % 60 * 60;
-    }
-}
+	};
+}