split render function

[space.git] / src / app / Application.cpp

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index e3c6a2b878bc1bb39c4294bd632192d8ebca40df..6a217666015bb228f9588e1214dd6e92a4063a2f 100644 (file)
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -12,12 +12,28 @@ Application::Application(Canvas &c)
 , focus(Vector<float>(500, 500), 500)
 , cam(c.Size(), focus.Pos())
 , controlled(univ.AddShip(Ship()))
+, linGauge(
+       Vector<int>(15, 100),
+       Vector<int>(10, 10),
+       Color(0xFF, 0xFF, 0xFF),
+       Color(0x00, 0x00, 0x00),
+       Color(0x00, 0xFF, 0x00),
+       Color(0xFF, 0x00, 0x00))
+, rotGauge(
+       Vector<int>(15, 100),
+       Vector<int>(27, 10),
+       Color(0xFF, 0xFF, 0xFF),
+       Color(0x00, 0x00, 0x00),
+       Color(0x33, 0x33, 0xFF),
+       Color(0x00, 0x00, 0xFF))
 , autopilot(*controlled, focus.Pos())
 , apEnabled(false)
 , last(SDL_GetTicks())
 , running(false)
 , paused(false) {
-
+       univ.AddResource(Resource("Liquid Hydrogen", 70));
+       univ.AddResource(Resource("Liquid Qxygen", 1141));
+       univ.AddResource(Resource("Water", 999));
 }
 
 
@@ -34,6 +50,11 @@ void Application::Run() {
 
 void Application::Loop(int delta) {
        HandleEvents();
+       if (delta == 0) {
+               SDL_Delay(1);
+               return;
+       }
+
        if (!paused) {
                Update(delta);
        }
@@ -168,14 +189,22 @@ void Application::Update(int dt) {
 
 
 void Application::Render() {
+       RenderBackground();
+       RenderGrid();
+       RenderShips();
+       RenderUI();
+}
+
+void Application::RenderBackground() {
        constexpr Color background(0x00, 0x00, 0x00);
-       constexpr Color univGrid(0xEE, 0xEE, 0xEE);
-       constexpr Color secGrid(0x77, 0x77, 0x77);
-       constexpr Color entityColor(0x00, 0xAA, 0xAA);
-       constexpr Color focusColor(0xFA, 0xFA, 0x00);
 
        canvas.SetColor(background);
        canvas.Fill();
+}
+
+void Application::RenderGrid() {
+       constexpr Color univGrid(0xEE, 0xEE, 0xEE);
+       constexpr Color secGrid(0x77, 0x77, 0x77);
 
        canvas.Grid2(
                cam.ToScreen(Vector<float>(0, 0)),
@@ -184,11 +213,12 @@ void Application::Render() {
                univ.secSize,
                secGrid,
                univGrid);
+}
 
-       canvas.SetColor(focusColor);
-       canvas.Cross(cam.ToScreen(focus.Pos()), 15);
+void Application::RenderShips() {
+       constexpr Color shipColor(0x00, 0xAA, 0xAA);
 
-       canvas.SetColor(entityColor);
+       canvas.SetColor(shipColor);
        for (const Ship &s : univ.Ships()) {
                const Vector<float> direction = s.Dir();
                const Vector<int> position = cam.ToScreen(s.pos);
@@ -198,8 +228,18 @@ void Application::Render() {
                canvas.Line(position, nose);
                canvas.Quad(nose, left, position, right);
        }
+}
+
+void Application::RenderUI() {
+       constexpr Color focusColor(0xFA, 0xFA, 0x00);
 
        autopilot.Render(canvas, cam);
+
+       linGauge.Render(canvas, controlled->linThrottle);
+       rotGauge.Render(canvas, controlled->rotThrottle);
+
+       canvas.SetColor(focusColor);
+       canvas.Cross(cam.ToScreen(focus.Pos()), 15);
 }
 
 }