Ticket #3403: 3403_charts.2.patch

binaries/data/mods/public/gui/summary/summary.js

@@ -35 +35 @@
 var g_GameData;
 var g_ResourceData = new Resources();
 
+var g_Charts = ["population", "explored"];
+
 function selectPanel(panel)
 {
     // TODO: move panel buttons to a custom parent object
@@ -47 +49 @@
 
     adjustTabDividers(panel.size);
 
-    updatePanelData(g_ScorePanelsData[panel.name.substr(0, panel.name.length - "PanelButton".length)]);
+    let generalPanel = Engine.GetGUIObjectByName("generalPanel");
+    let chartsPanel = Engine.GetGUIObjectByName("chartsPanel");
+    if (panel.name != "chartsPanelButton")
+    {
+        generalPanel.hidden = false;
+        chartsPanel.hidden = true;
+        updatePanelData(g_ScorePanelsData[panel.name.substr(0, panel.name.length - "PanelButton".length)]);
+    }
+    else
+    {
+        generalPanel.hidden = true;
+        chartsPanel.hidden = false;
+        updateCharts();
+    }
 }
 
+function initCharts()
+{
+    let player_colors = [];
+    for (let i = 0; i < g_PlayerCount; ++i)
+    {
+        let playerState = g_GameData.sim.playerStates[i+1];
+        player_colors.push(
+            Math.floor(playerState.color.r * 255) + " " +
+            Math.floor(playerState.color.g * 255) + " " +
+            Math.floor(playerState.color.b * 255)
+        );
+    }
+    for (let i = 0; i < g_Charts.length; ++i)
+    {
+        let chart = Engine.GetGUIObjectByName(g_Charts[i] + "Chart");
+        chart.list_color = player_colors;
+    }
+}
+
+function updateCharts()
+{
+    for (let i = 0; i < g_Charts.length; ++i)
+    {
+        let chart = Engine.GetGUIObjectByName(g_Charts[i] + "Chart");
+        let table_x = [];
+        let table_y = [];
+        for (let j = 0; j < g_PlayerCount; ++j)
+        {
+            let playerState = g_GameData.sim.playerStates[j+1];
+            let list_x = [];
+            let list_y = [];
+            for (let k = 0; k < playerState.statistics.sequences[g_Charts[i]].length; ++k)
+            {
+                list_x.push(playerState.statistics.sequences[g_Charts[i]][k][0]);
+                list_y.push(playerState.statistics.sequences[g_Charts[i]][k][1]);
+            }
+            table_x.push(list_x);
+            table_y.push(list_y);
+        }
+        chart.table_x = table_x;
+        chart.table_y = table_y;
+    }
+}
+
 function adjustTabDividers(tabSize)
 {
     let leftSpacer = Engine.GetGUIObjectByName("tabDividerLeft");
@@ -266 +325 @@
             g_WithoutTeam -= g_Teams[i] ? g_Teams[i] : 0;
     }
 
+    initCharts();
+
     selectPanel(Engine.GetGUIObjectByName("scorePanelButton"));
 }

binaries/data/mods/public/gui/summary/summary.xml

@@ -98 +98 @@
             </object>
         </object>
 
+        <object name="chartsPanelButton" type="button" sprite="BackgroundTab" style="TabButton" size="762 92 880 120">
+            <action on="Press">selectPanel(this);</action>
+            <object type="text" style="ModernLabelText" ghost="true">
+                <translatableAttribute id="caption">Charts</translatableAttribute>
+            </object>
+        </object>
+
         <object name="generalPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-54">
             <object size="0 0 100% 100%-50">
                 <object name="playerNameHeading" type="text" style="ModernLeftTabLabelText">
@@ -151 +158 @@
                 </repeat>
             </object>
         </object>
+        
+        <object name="chartsPanel" type="image" sprite="ForegroundBody" size="20 120 100%-20 100%-54">
+            <object
+                name="populationChartCaption"
+                type="text"
+                style="ModernTabLabelText"
+                size="20 20 50%-20 40"
+            >
+                <translatableAttribute id="caption">Population</translatableAttribute>
+            </object>
+            <object
+                name="populationChart"
+                type="chart"
+                ghost="true"
+                size="20 60 50%-20 50%-20"
+            />
+            <object
+                name="exploredChartCaption"
+                type="text"
+                style="ModernTabLabelText"
+                size="50%+20 20 100%-20 40"
+            >
+                <translatableAttribute id="caption">Explored</translatableAttribute>
+            </object>
+            <object
+                name="exploredChart"
+                type="chart"
+                ghost="true"
+                size="50%+20 60 100%-20 50%-20"
+            />
+        </object>
 
         <object type="button" name="replayButton" style="ModernButtonRed" size="100%-310 100%-48 100%-170 100%-20">
             <translatableAttribute id="caption">Replay</translatableAttribute>

binaries/data/mods/public/simulation/components/StatisticsTracker.js

@@ -1 +1 @@
 function StatisticsTracker() {}
 
+const UPDATE_SEQUENCE_INTERVAL = 30000; // 30 seconds
+
 StatisticsTracker.prototype.Schema =
     "<a:component type='system'/><empty/>";
 
@@ -142 +144 @@
     this.lootCollected = 0;
     this.peakPercentMapControlled = 0;
     this.teamPeakPercentMapControlled = 0;
+
+    this.sequences = {
+        "population": [],
+        "explored": []
+    };
+
+    let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer); 
+    if (!cmpTimer)
+        return;
+    this.updateTimer = cmpTimer.SetInterval(
+        this.entity, IID_StatisticsTracker, "updateSequneces", 0, UPDATE_SEQUENCE_INTERVAL, {
+            "startTime": cmpTimer.GetTime()
+        }
+    ); 
 };
 
 /**
@@ -191 +207 @@
         "percentMapControlled": this.GetPercentMapControlled(),
         "teamPercentMapControlled": this.GetTeamPercentMapControlled(),
         "peakPercentMapControlled": this.peakPercentMapControlled,
-        "teamPeakPercentMapControlled": this.teamPeakPercentMapControlled
+        "teamPeakPercentMapControlled": this.teamPeakPercentMapControlled,
+        "sequences": this.sequences
     };
 };
 
@@ -492 +509 @@
         this.teamPeakPercentMapControlled = newPercent;
 };
 
+StatisticsTracker.prototype.updateSequneces = function(data)
+{
+    let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer); 
+    if (!cmpTimer)
+        return;
+    let deltaTime = (cmpTimer.GetTime() - data["startTime"]) / 1000;
+
+    let cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
+    if (!cmpPlayer)
+        return;
+    this.sequences.population.push([deltaTime, cmpPlayer.GetPopulationCount()]);
+
+    let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    if (!cmpRangeManager)
+        return;
+    this.sequences.explored.push([
+        deltaTime,
+        cmpRangeManager.GetPercentMapExplored(cmpPlayer.GetPlayerID())
+    ]);
+}
+
 Engine.RegisterComponentType(IID_StatisticsTracker, "StatisticsTracker", StatisticsTracker);

source/gui/CChart.cpp

@@ +1 @@
+/* Copyright (C) 2016 Wildfire Games.
+* This file is part of 0 A.D.
+*
+* 0 A.D. is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 2 of the License, or
+* (at your option) any later version.
+*
+* 0 A.D. is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "precompiled.h"
+#include "CChart.h"
+
+#include "graphics/ShaderManager.h"
+#include "lib/ogl.h"
+#include "ps/CLogger.h"
+#include "renderer/Renderer.h"
+
+#include <cmath>
+
+CChart::CChart()
+{
+    AddSetting(GUIST_CGUIList, "list_color");
+    AddSetting(GUIST_CGUITable, "table_x");
+    AddSetting(GUIST_CGUITable, "table_y");
+}
+
+CChart::~CChart()
+{
+}
+
+void CChart::HandleMessage(SGUIMessage& Message)
+{
+    // TODO: implement zoom
+}
+
+void CChart::Draw()
+{
+    PROFILE3("render chart");
+
+    if (!GetGUI())
+        return;
+
+    UpdateItems();
+
+    const float bz = GetBufferedZ();
+    CRect rect = GetChartRect();
+    const float width = rect.GetWidth();
+    const float height = rect.GetHeight();
+
+    if (m_Items.empty())
+        return;
+
+    // Disable depth updates to prevent apparent z-fighting-related issues
+    //  with some drivers causing units to get drawn behind the texture.
+    glDepthMask(0);
+
+    // Setup the render state
+    CMatrix3D transform = GetDefaultGuiMatrix();
+    CShaderDefines lineDefines;
+    CShaderTechniquePtr tech = g_Renderer.GetShaderManager().LoadEffect(str_gui_solid, g_Renderer.GetSystemShaderDefines(), lineDefines);
+    tech->BeginPass();
+    CShaderProgramPtr shader = tech->GetShader();
+    shader->Uniform(str_transform, transform);
+
+    CVector2D leftBottom, rightTop;
+    leftBottom = rightTop = m_Items[0].m_Points[0];
+    for (const CChartItem& item : m_Items)
+        for (const CVector2D& point : item.m_Points)
+        {
+            if (point.X < leftBottom.X)
+                leftBottom.X = point.X;
+            if (point.Y < leftBottom.Y)
+                leftBottom.Y = point.Y;
+
+            if (point.X > rightTop.X)
+                rightTop.X = point.X;
+            if (point.Y > rightTop.Y)
+                rightTop.Y = point.Y;
+        }
+
+    CVector2D scale(width / (rightTop.X - leftBottom.X), height / (rightTop.Y - leftBottom.Y));
+
+    for (const CChartItem& item : m_Items)
+    {
+        if (item.m_Points.empty())
+            continue;
+
+        std::vector<float> vertices;
+        for (const CVector2D& point : item.m_Points)
+        {
+            vertices.push_back(rect.left + (point.X - leftBottom.X) * scale.X);
+            vertices.push_back(rect.bottom - (point.Y - leftBottom.Y) * scale.Y);
+            vertices.push_back(bz + 0.5f);
+        }
+        shader->Uniform(str_color, item.m_Color);
+        shader->VertexPointer(3, GL_FLOAT, 0, &vertices[0]);
+        shader->AssertPointersBound();
+
+        glEnable(GL_LINE_SMOOTH);
+        glLineWidth(1.1f);
+        if (!g_Renderer.m_SkipSubmit)
+            glDrawArrays(GL_LINE_STRIP, 0, vertices.size() / 3);
+        glLineWidth(1.0f);
+        glDisable(GL_LINE_SMOOTH);
+    }
+
+    tech->EndPass();
+
+    // Reset depth mask
+    glDepthMask(1);
+}
+
+CRect CChart::GetChartRect() const
+{
+    return m_CachedActualSize;
+}
+
+void CChart::UpdateItems()
+{
+    CGUITable* pTableX;
+    CGUITable* pTableY;
+    GUI<CGUITable>::GetSettingPointer(this, "table_x", pTableX);
+    GUI<CGUITable>::GetSettingPointer(this, "table_y", pTableY);
+
+    CGUIList* pListColor;
+    GUI<CGUIList>::GetSettingPointer(this, "list_color", pListColor);
+
+    m_Items.clear();
+    for (size_t i = 0; i < std::min(pTableX->m_Items.size(), pTableY->m_Items.size()); ++i)
+    {
+        m_Items.resize(m_Items.size() + 1);
+        CChartItem& item = m_Items.back();
+
+        if (i < pListColor->m_Items.size() && !GUI<int>::ParseColor(pListColor->m_Items[i].GetOriginalString(), item.m_Color, 0))
+            LOGWARNING("GUI: Error parsing 'list_color' (\"%s\")", utf8_from_wstring(pListColor->m_Items[i].GetOriginalString()));
+
+        for (size_t j = 0; j < std::min(pTableX->m_Items[i].size(), pTableY->m_Items[i].size()); ++j)
+        {
+            item.m_Points.push_back(CVector2D(
+                pTableX->m_Items[i][j].GetOriginalString().ToFloat(),
+                pTableY->m_Items[i][j].GetOriginalString().ToFloat()
+            ));
+        }
+    }
+}

source/gui/CChart.h

@@ +1 @@
+/* Copyright (C) 2016 Wildfire Games.
+* This file is part of 0 A.D.
+*
+* 0 A.D. is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 2 of the License, or
+* (at your option) any later version.
+*
+* 0 A.D. is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef INCLUDED_CCHART
+#define INCLUDED_CCHART
+
+#include "GUI.h"
+#include "graphics/Color.h"
+#include "maths/Vector2D.h"
+#include <vector>
+
+/**
+* Represents an item of chart.
+*/
+struct CChartItem
+{
+    CStr m_Id;
+    CColor m_Color;
+    std::vector<CVector2D> m_Points;
+};
+
+/**
+* Chart for a data visualization
+*
+* @see IGUIObject
+*/
+class CChart : public IGUIObject
+{
+    GUI_OBJECT(CChart)
+
+public:
+    CChart();
+    virtual ~CChart();
+
+protected:
+    /**
+    * @see IGUIObject#HandleMessage()
+    */
+    virtual void HandleMessage(SGUIMessage& Message);
+
+    /**
+    * Draws the Chart
+    */
+    virtual void Draw();
+
+    virtual CRect GetChartRect() const;
+
+    void UpdateItems();
+
+    std::vector<CChartItem> m_Items;
+};
+
+#endif // INCLUDED_CCHART

source/gui/CGUI.cpp

@@ -24 +24 @@
 
 // Types - when including them into the engine.
 #include "CButton.h"
+#include "CChart.h"
 #include "CCheckBox.h"
 #include "CDropDown.h"
 #include "CImage.h"
@@ -312 +313 @@
     AddObjectType("olist",          &COList::ConstructObject);
     AddObjectType("dropdown",       &CDropDown::ConstructObject);
     AddObjectType("tooltip",        &CTooltip::ConstructObject);
+    AddObjectType("chart",          &CChart::ConstructObject);
 }
 
 void CGUI::Draw()

source/gui/CGUITable.h

@@ +1 @@
+/* Copyright (C) 2016 Wildfire Games.
+* This file is part of 0 A.D.
+*
+* 0 A.D. is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 2 of the License, or
+* (at your option) any later version.
+*
+* 0 A.D. is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef INCLUDED_CGUITABLE
+#define INCLUDED_CGUITABLE
+
+#include "GUItext.h"
+
+class CGUITable
+{
+public:
+    /**
+    * List of items (as text), the post-processed result is stored in
+    *  the IGUITextOwner structure of this class.
+    */
+    std::vector<std::vector<CGUIString>> m_Items;
+};
+
+#endif

source/gui/GUI.h

@@ -40 +40 @@
 #include "ps/CStr.h"
 
 #include "CGUIList.h"
+#include "CGUITable.h"
 #include "GUIbase.h"
 #include "GUItext.h"
 #include "GUIutil.h"

source/gui/GUItypes.h

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -40 +40 @@
 TYPE(EVAlign)
 TYPE(CPos)
 TYPE(CGUIList)
+TYPE(CGUITable)

source/gui/GUIutil.cpp

@@ -253 +253 @@
     return false;
 }
 
+template <>
+bool __ParseString<CGUITable>(const CStrW& UNUSED(Value), CGUITable& UNUSED(Output))
+{
+    return false;
+}
 
 //--------------------------------------------------------
 

source/gui/scripting/JSInterface_IGUIObject.cpp

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -298 +298 @@
             break;
         }
 
+        case GUIST_CGUITable:
+        {
+            CGUITable value;
+            GUI<CGUITable>::GetSetting(e, propName, value);
+
+            JS::RootedObject obj(cx, JS_NewArrayObject(cx, JS::HandleValueArray::empty()));
+            vp.setObject(*obj);
+
+            for (u32 i = 0; i < value.m_Items.size(); ++i)
+            {
+                JS::RootedObject inner_obj(cx, JS_NewArrayObject(cx, JS::HandleValueArray::empty()));
+                for (u32 j = 0; j < value.m_Items[i].size(); ++j)
+                {
+                    JS::RootedValue val(cx);
+                    ScriptInterface::ToJSVal(cx, &val, value.m_Items[i][j].GetOriginalString());
+                    JS_SetElement(cx, inner_obj, j, val);
+                }
+                JS_SetElement(cx, obj, i, inner_obj);
+            }
+
+            break;
+        }
+
         default:
             JS_ReportError(cx, "Setting '%s' uses an unimplemented type", propName.c_str());
             DEBUG_WARN_ERR(ERR::LOGIC);
@@ -588 +611 @@
         break;
     }
 
+    case GUIST_CGUITable:
+    {
+        u32 row_length;
+        if (!vp.isObject() || !JS_GetArrayLength(cx, vpObj, &row_length))
+        {
+            JS_ReportError(cx, "Table only accepts a GUITable object");
+            return false;
+        }
+
+        CGUITable table;
+        table.m_Items.resize(row_length);
+        for (u32 i = 0; i < row_length; ++i)
+        {
+            JS::RootedValue column_value(cx);
+            if (!JS_GetElement(cx, vpObj, i, &column_value))
+            {
+                JS_ReportError(cx, "Failed to get table column");
+                return false;
+            }
+            JS::RootedObject column(cx, column_value.toObjectOrNull());
+            u32 column_length;
+            if (!JS_GetArrayLength(cx, column, &column_length))
+            {
+                JS_ReportError(cx, "Table row only accepts a table column");
+                return false;
+            }
+
+            table.m_Items[i].resize(column_length);
+            for (u32 j = 0; j < column_length; ++j)
+            {
+                JS::RootedValue element(cx);
+                if (!JS_GetElement(cx, column, j, &element))
+                {
+                    JS_ReportError(cx, "Failed to get list element");
+                    return false;
+                }
+
+                std::wstring value;
+                if (!ScriptInterface::FromJSVal(cx, element, value))
+                    return false;
+
+                table.m_Items[i][j].SetValue(value);
+            }
+        }
+
+        GUI<CGUITable>::SetSetting(e, propName, table);
+        break;
+    }
+
     default:
         JS_ReportError(cx, "Setting '%s' uses an unimplemented type", propName.c_str());
         break;