Merge remote-tracking branch 'origin/master' into HUD-Timers

# Conflicts: # resources/Schema/Entities/Player.xml
Merge branch 'master' into HUD-Timers
2016-03-02 22:49:26 +01:00 · 2016-03-02 22:42:12 +01:00 · 2016-03-02 22:28:57 +01:00 · 2016-03-02 22:19:20 +01:00 · 2016-03-02 22:08:23 +01:00 · 2016-03-02 21:51:52 +01:00
23 changed files with 304 additions and 224 deletions
@@ -1,3 +1,6 @@
+#ifndef EditorRenderSystem_h__
+#define EditorRenderSystem_h__
+
 #include "../Core/System.h"
 #include "../Rendering/IRenderer.h"
 #include "../Rendering/ModelJob.h"
@@ -14,11 +17,11 @@ public:
 private:
    IRenderer* m_Renderer;
    RenderFrame* m_RenderFrame;
-    Camera* m_Camera;
+    Camera* m_EditorCamera;
    EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;

    EventRelay<EditorRenderSystem, Events::SetCamera> m_ESetCamera;
    bool OnSetCamera(Events::SetCamera& e);
+};

-    void enqueueModel(RenderScene& scene, EntityWrapper entity, const glm::mat4& modelMatrix, const std::string& modelResource, ComponentWrapper cModel, bool wireframe);
-};
+#endif
@@ -1,27 +0,0 @@
-#ifndef EditorWidgetRenderSystem_h__
-#define EditorWidgetRenderSystem_h__
-
-#include "../Core/System.h"
-#include "../Rendering/IRenderer.h"
-#include "../Rendering/ModelJob.h"
-#include "../Rendering/Camera.h"
-#include "../Rendering/ESetCamera.h"
-
-class EditorWidgetRenderSystem : public ImpureSystem
-{
-public:
-    EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
-
-    virtual void Update(double dt) override;
-
-private:
-    IRenderer* m_Renderer;
-    RenderFrame* m_RenderFrame;
-    Camera* m_EditorCamera;
-    EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
-
-    EventRelay<EditorWidgetRenderSystem, Events::SetCamera> m_ESetCamera;
-    bool OnSetCamera(Events::SetCamera& e);
-};
-
-#endif
@@ -164,7 +164,7 @@ struct ModelJob : RenderJob
 	std::vector<const ::RawModel::TextureProperties*> SpecularTexture;
 	std::vector<const ::RawModel::TextureProperties*> IncandescenceTexture;
    float Shininess = 0.f;
-    glm::vec4 Color = glm::vec4(1.f, 1.f, 1.f, 1.f);
+    glm::vec4 Color;
    const ::Model* Model = nullptr;
    ::Skeleton* Skeleton = nullptr;
    std::vector<::Skeleton::AnimationData> Animations;
@@ -182,7 +182,6 @@ struct ModelJob : RenderJob
    glm::vec4 FillColor = glm::vec4(0);
    float FillPercentage = 0.0;
 	bool IsShielded;
-    bool Wireframe = false;
    void CalculateHash() override
    {
        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
@@ -25,7 +25,6 @@ public:
    bool StencilMask(GLuint mask);
    bool DepthMask(GLboolean flag);
 	bool DepthFunc(GLenum func);
-    bool PolygonMode(GLenum face, GLenum mode);
 	bool AlphaFunc(GLenum func, GLclampf thresholder);

 private:
@@ -0,0 +1,17 @@
+#ifndef AbilityCooldownHUDSystem_h__
+#define AbilityCooldownHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class AbilityCooldownHUDSystem : public ImpureSystem
+{
+public:
+    AbilityCooldownHUDSystem(SystemParams params)
+        : System(params)
+    { }
+
+    virtual void Update(double dt) override;
+};
+
+#endif
@@ -0,0 +1,19 @@
+#ifndef BoostIconsHUDSystem_h__
+#define BoostIconsHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class BoostIconsHUDSystem : public PureSystem
+{
+public:
+    BoostIconsHUDSystem(SystemParams params)
+        : System(params)
+        , PureSystem("BoostIconsHUD")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
+
+};
+
+#endif
@@ -51,10 +51,12 @@
 	<xs:include schemaLocation="Components/Page.xsd"/>
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
+	<xs:include schemaLocation="Components/AbilityCooldownHUD.xsd"/>
 	<xs:include schemaLocation="Components/DoubleJump.xsd"/>
 	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
 	<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointArrowHUD.xsd"/>
 	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
+	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
 </xs:schema>
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<AbilityCooldownHUD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="AbilityCooldownHUD.xsd">
+</AbilityCooldownHUD>
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="AbilityCooldownHUD">
+		<xs:annotation>
+			<xs:documentation>HUD element for tracking ability cooldown. If it has a sprite and fill component it will fill the sprite with chosen color depending on the cooldown.\n A child with text component named "Cooldown"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<BoostIconsHUD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoostIconsHUD.xsd"/>
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="BoostIconsHUD">
+		<xs:annotation>
+			<xs:documentation>Origin for the 3 boost states. Create 3 children with Sprite and Fill components, name them "Sprint", "Defender", "Assault"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Text xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Text.xsd">
 	<Content></Content>
-	<Resource></Resource>
+	<Resource>Fonts/DroidSans.ttf,64</Resource>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
 	<Alignment><Center/></Alignment>
@@ -100,12 +100,12 @@
                      <Percentage>1</Percentage>
                      <Color A="1" B="1" G="0" R="0"/>
                    </c:Fill>
-                    <c:HealthHUD/>
                    <c:Text>
                      <Content>100/100</Content>
                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
                    </c:Text>
+                    <c:HealthHUD/>
                    <c:Transform>
                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
@@ -132,7 +132,70 @@
                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
                    </c:Transform>
                  </Components>
-                  <Children/>
+                  <Children>
+                    <Entity name="BoostIcons">
+                      <Components>
+                        <c:BoostIconsHUD/>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Assault">
+                          <Components>
+                            <c:Fill>
+                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <GlowMap></GlowMap>
+                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
+                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Defender">
+                          <Components>
+                            <c:Fill>
+                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <GlowMap></GlowMap>
+                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
+                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Sniper">
+                          <Components>
+                            <c:Fill>
+                              <Color A="1" B="0.345098048" G="0" R="1"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <GlowMap></GlowMap>
+                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
+                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
                </Entity>
              </Children>
            </Entity>
@@ -196,7 +259,6 @@
                          <CapturePointNumber>3</CapturePointNumber>
                        </c:CapturePointHUD>
                        <c:Fill>
-                          <Percentage>0.80222018197612788</Percentage>
                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                        </c:Fill>
                        <c:Sprite>
@@ -231,6 +293,7 @@
                          <CapturePointNumber>4</CapturePointNumber>
                        </c:CapturePointHUD>
                        <c:Fill>
+                          <Percentage>1</Percentage>
                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                        </c:Fill>
                        <c:Sprite>
@@ -286,7 +349,7 @@
                    <c:Sprite>
                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
+                      <Color A="0.699999988" B="0" G="0" R="1"/>
                    </c:Sprite>
                    <c:Transform>
                      <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -297,7 +360,8 @@
                      <Components>
                        <c:CapturePointHUD/>
                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                          <Percentage>1</Percentage>
+                          <Color A="0.699999988" B="0" G="0" R="1"/>
                        </c:Fill>
                        <c:Sprite>
                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
@@ -306,7 +370,7 @@
                        <c:Transform>
                          <Position X="0" Y="0" Z="0.00999999978"/>
                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Orientation X="0" Y="0" Z="4.71238899"/>
                        </c:Transform>
                      </Components>
                      <Children/>
@@ -369,6 +433,25 @@
                </Entity>
              </Children>
            </Entity>
+            <Entity name="CapturePointArrow">
+              <Components>
+                <c:CapturePointArrowHUD/>
+                <c:Model>
+                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
+                </c:Model>
+                <c:Team>
+                  <Team>
+                    <Blue/>
+                  </Team>
+                </c:Team>
+                <c:Transform>
+                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
+                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
          </Children>
        </Entity>
        <Entity name="Hands">
@@ -51,8 +51,10 @@
 							<xs:element ref="c:Page" minOccurs="0"/>
 							<xs:element ref="c:Button" minOccurs="0"/>
 							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
+							<xs:element ref="c:AbilityCooldownHUD" minOccurs="0"/>
 							<xs:element ref="c:DefenderWeapon" minOccurs="0"/>
 							<xs:element ref="c:CapturePointArrowHUD" minOccurs="0"/>
+							<xs:element ref="c:BoostIconsHUD" minOccurs="0"/>
 							<xs:element ref="c:FloatingEffect" minOccurs="0"/>
 							<xs:element ref="c:AmmoPickup" minOccurs="0"/>
 							<xs:element ref="c:HealthPickup" minOccurs="0"/>
@@ -157,7 +157,7 @@ void EditorGUI::drawEntitiesRecursive(World* world, EntityID parent)
    auto entityChildren = world->GetEntityChildren();
    auto range = entityChildren.equal_range(parent);
    for (auto it = range.first; it != range.second; it++) {
-        if (drawEntityNode(EntityWrapper(world, it->second))) {
+        if (EditorGUI::drawEntityNode(EntityWrapper(world, it->second))) {
            drawEntitiesRecursive(world, it->second);
            ImGui::TreePop();
        }
@@ -217,7 +217,6 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
        ImGui::EndPopup();
    }

-    ImGui::PushID(("EntityNode" + std::to_string(entity.ID)).c_str());
    ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once);
    if (ImGui::TreeNode(formatEntityName(entity).c_str())) {
        // Handle drop events for reparenting
@@ -225,10 +224,8 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
            entityChangeParent(m_CurrentlyDragging, entity);
            m_CurrentlyDragging = EntityWrapper::Invalid;
        }
-        ImGui::PopID();
        return true;
    } else {
-        ImGui::PopID();
        return false;
    }
 }
@@ -1,44 +1,81 @@
 #include "Editor/EditorRenderSystem.h"

-EditorRenderSystem::EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame)
+EditorRenderSystem::EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
    : System(params)
    , m_Renderer(renderer)
    , m_RenderFrame(renderFrame)
 {
    EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorRenderSystem::OnSetCamera);
-    auto resolution = renderer->Resolution();
-    m_Camera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
+    auto resolution = Rectangle::Rectangle(1280, 720);
+    m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
 }

 void EditorRenderSystem::Update(double dt)
 {
    if (m_CurrentCamera.Valid()) {
-        m_Camera->SetPosition(Transform::AbsolutePosition(m_CurrentCamera));
-        m_Camera->SetOrientation(Transform::AbsoluteOrientation(m_CurrentCamera));
+        ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
+        m_EditorCamera->SetPosition(cameraTransform["Position"]);
+        m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cameraTransform["Orientation"]));
    }

    RenderScene scene;
-    scene.Camera = m_Camera;
+    scene.ClearDepth = true;
+    scene.Camera = m_EditorCamera;
+    scene.Viewport = Rectangle(1920, 1080);

-    auto cameras = m_World->GetComponents("Camera");
-    if (cameras != nullptr) {
-        for (auto& cCamera : *cameras) {
-            EntityWrapper entity(m_World, cCamera.EntityID);
-            entity["Model"]["Resource"] = "Models/Widgets/Camera.mesh";
-            glm::mat4 modelMatrix = Transform::ModelMatrix(entity);
-            enqueueModel(scene, entity, modelMatrix, "Models/Widgets/Camera.mesh", entity["Model"], false);
+    auto cSceneLight = m_World->GetComponents("SceneLight");
+    if (cSceneLight != nullptr) {
+        //these are hardcoded since they want special light treatment and a component just for widgets is stupid.
+        scene.AmbientColor = glm::vec4(0.8, 0.8, 0.8, 1.0);
+    }
+
+    auto models = m_World->GetComponents("Model");
+    if (models != nullptr) {
+        for (auto& cModel : *models) {
+            if (!(bool)cModel["Visible"]) {
+                continue;
+            }
+
+            const std::string& resource = cModel["Resource"];
+
+            Model* model;
+            try {
+                model = ResourceManager::Load<::Model, true>(resource);
+            } catch (const Resource::StillLoadingException&) {
+                continue;
+            } catch (const std::exception&) {
+                try {
+                    model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
+                } catch (const std::exception&) {
+                    continue;
+                }
+            }
+
+            EntityWrapper entity(m_World, cModel.EntityID);
+            glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, entity.World);
+            for (auto matGroup : model->MaterialGroups()) {
+                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f, false);
+                if (cModel["Transparent"]) {
+                    scene.Jobs.TransparentObjects.push_back(modelJob);
+                } else {
+                    scene.Jobs.OpaqueObjects.push_back(modelJob);
+                }
+            }
        }
    }

-    auto aabbs = m_World->GetComponents("AABB");
-    if (aabbs != nullptr) {
-        for (auto& cAABB : *aabbs) {
-            EntityWrapper entity(m_World, cAABB.EntityID);
-            glm::vec3 absPosition = Transform::AbsolutePosition(entity) + (glm::vec3)cAABB["Origin"];
-            glm::vec3 absScale = Transform::AbsoluteScale(entity) * (glm::vec3)cAABB["Size"];
-            glm::mat4 modelMatrix = glm::translate(absPosition) * glm::scale(absScale);
-            entity["Model"]["Resource"] = "Models/Core/UnitCube.mesh";
-            enqueueModel(scene, entity, modelMatrix, "Models/Core/UnitCube.mesh", entity["Model"], true);
+    auto pointLights = m_World->GetComponents("PointLight");
+    if (pointLights != nullptr) {
+        for (auto& cPointLight : *pointLights) {
+            bool visible = cPointLight["Visible"];
+            if (!visible) {
+                continue;
+            }
+
+            EntityWrapper entity(m_World, cPointLight.EntityID);
+            ComponentWrapper& cTransform = entity["Transform"];
+            std::shared_ptr<PointLightJob> pointLightJob = std::make_shared<PointLightJob>(cTransform, cPointLight, entity.World);
+            scene.Jobs.PointLight.push_back(pointLightJob);
        }
    }

@@ -49,44 +86,12 @@ bool EditorRenderSystem::OnSetCamera(Events::SetCamera& e)
 {
    ComponentWrapper cTransform = e.CameraEntity["Transform"];
    ComponentWrapper cCamera = e.CameraEntity["Camera"];
-    m_Camera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
-    m_Camera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
-    m_Camera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
-    m_Camera->SetPosition(cTransform["Position"]);
-    m_Camera->SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
+    m_EditorCamera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
+    m_EditorCamera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
+    m_EditorCamera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
+    m_EditorCamera->SetPosition(cTransform["Position"]);
+    m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
    m_CurrentCamera = e.CameraEntity;
    return true;
 }

-void EditorRenderSystem::enqueueModel(RenderScene& scene, EntityWrapper entity, const glm::mat4& modelMatrix, const std::string& modelResource, ComponentWrapper cModel, bool wireframe)
-{
-    Model* model;
-    try {
-        model = ResourceManager::Load<::Model, true>(modelResource);
-    } catch (const Resource::StillLoadingException&) {
-        return;
-    } catch (const std::exception&) {
-        try {
-            model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
-        } catch (const std::exception&) {
-            return;
-        }
-    }
-
-    for (auto matGroup : model->MaterialGroups()) {
-        std::shared_ptr<ModelJob> modelJob = std::shared_ptr<ModelJob>(new ModelJob(
-                    model, 
-                    m_Camera, 
-                    modelMatrix, 
-                    matGroup, 
-                    cModel, 
-                    m_World, 
-                    glm::vec4(1.f, 1.f, 1.f, 1.f), 
-                    0.f,
-					false
-                ));
-        modelJob->Wireframe = wireframe;
-        scene.Jobs.OpaqueObjects.push_back(modelJob);
-    }
-}
-
@@ -1,6 +1,6 @@
 #include "Editor/EditorSystem.h"
 #include "Core/UniformScaleSystem.h"
-#include "Editor/EditorWidgetRenderSystem.h"
+#include "Editor/EditorRenderSystem.h"
 #include "Editor/EditorWidgetSystem.h"
 #include "Core/EntityFile.h"

@@ -13,7 +13,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
    m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, m_EventBroker, IsClient, IsServer);
    m_EditorWorldSystemPipeline->AddSystem<UniformScaleSystem>(0);
    m_EditorWorldSystemPipeline->AddSystem<EditorWidgetSystem>(0, m_Renderer);
-    m_EditorWorldSystemPipeline->AddSystem<EditorWidgetRenderSystem>(2, m_Renderer, m_RenderFrame);
+    m_EditorWorldSystemPipeline->AddSystem<EditorRenderSystem>(1, m_Renderer, m_RenderFrame);
    
    m_EditorCamera = importEntity(EntityWrapper(m_EditorWorld, EntityID_Invalid), "Schema/Entities/Empty.xml");
    m_ActualCamera = m_EditorCamera;
@@ -1,97 +0,0 @@
-#include "Editor/EditorWidgetRenderSystem.h"
-
-EditorWidgetRenderSystem::EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
-    : System(params)
-    , m_Renderer(renderer)
-    , m_RenderFrame(renderFrame)
-{
-    EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorWidgetRenderSystem::OnSetCamera);
-    auto resolution = Rectangle::Rectangle(1280, 720);
-    m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
-}
-
-void EditorWidgetRenderSystem::Update(double dt)
-{
-    if (m_CurrentCamera.Valid()) {
-        ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
-        m_EditorCamera->SetPosition(cameraTransform["Position"]);
-        m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cameraTransform["Orientation"]));
-    }
-
-    RenderScene scene;
-    scene.ClearDepth = true;
-    scene.Camera = m_EditorCamera;
-    scene.Viewport = Rectangle(1920, 1080);
-
-    auto cSceneLight = m_World->GetComponents("SceneLight");
-    if (cSceneLight != nullptr) {
-        //these are hardcoded since they want special light treatment and a component just for widgets is stupid.
-        scene.AmbientColor = glm::vec4(0.8, 0.8, 0.8, 1.0);
-    }
-
-    auto models = m_World->GetComponents("Model");
-    if (models != nullptr) {
-        for (auto& cModel : *models) {
-            if (!(bool)cModel["Visible"]) {
-                continue;
-            }
-
-            const std::string& resource = cModel["Resource"];
-
-            Model* model;
-            try {
-                model = ResourceManager::Load<::Model, true>(resource);
-            } catch (const Resource::StillLoadingException&) {
-                continue;
-            } catch (const std::exception&) {
-                try {
-                    model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
-                } catch (const std::exception&) {
-                    continue;
-                }
-            }
-
-            EntityWrapper entity(m_World, cModel.EntityID);
-            glm::mat4 modelMatrix = Transform::ModelMatrix(entity.ID, entity.World);
-            for (auto matGroup : model->MaterialGroups()) {
-                std::shared_ptr<ModelJob> modelJob = std::make_shared<ModelJob>(model, scene.Camera, modelMatrix, matGroup, cModel, entity.World, glm::vec4(0), 0.f, false);
-                if (cModel["Transparent"]) {
-                    scene.Jobs.TransparentObjects.push_back(modelJob);
-                } else {
-                    scene.Jobs.OpaqueObjects.push_back(modelJob);
-                }
-            }
-        }
-    }
-
-    auto pointLights = m_World->GetComponents("PointLight");
-    if (pointLights != nullptr) {
-        for (auto& cPointLight : *pointLights) {
-            bool visible = cPointLight["Visible"];
-            if (!visible) {
-                continue;
-            }
-
-            EntityWrapper entity(m_World, cPointLight.EntityID);
-            ComponentWrapper& cTransform = entity["Transform"];
-            std::shared_ptr<PointLightJob> pointLightJob = std::make_shared<PointLightJob>(cTransform, cPointLight, entity.World);
-            scene.Jobs.PointLight.push_back(pointLightJob);
-        }
-    }
-
-    m_RenderFrame->Add(scene);
-}
-
-bool EditorWidgetRenderSystem::OnSetCamera(Events::SetCamera& e)
-{
-    ComponentWrapper cTransform = e.CameraEntity["Transform"];
-    ComponentWrapper cCamera = e.CameraEntity["Camera"];
-    m_EditorCamera->SetFOV(static_cast<float>((double)cCamera["FOV"]));
-    m_EditorCamera->SetNearClip(static_cast<float>((double)cCamera["NearClip"]));
-    m_EditorCamera->SetFarClip(static_cast<float>((double)cCamera["FarClip"]));
-    m_EditorCamera->SetPosition(cTransform["Position"]);
-    m_EditorCamera->SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
-    m_CurrentCamera = e.CameraEntity;
-    return true;
-}
-
@@ -429,12 +429,6 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 			if (modelJob) {
 				//bind forward program
 				//TODO: JOHAN/TOBIAS: Bind shader based on ModelJob->ShaderID;
-                RenderState jobState;
-                if (modelJob->Wireframe) {
-                    jobState.Disable(GL_CULL_FACE);
-                    jobState.PolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-                }
-
 				switch (modelJob->Type) {
 				case RawModel::MaterialType::Basic:
 				case RawModel::MaterialType::SingleTextures:
@@ -155,20 +155,6 @@ bool RenderState::AlphaFunc(GLenum func, GLclampf thresholder)
 	return !GLERROR("AlphaFunc");
 }

-bool RenderState::PolygonMode(GLenum face, GLenum mode)
-{
-    GLint originalMode[2];
-    glGetIntegerv(GL_POLYGON_MODE, &originalMode[0]);
-    if (face == GL_FRONT || face == GL_FRONT_AND_BACK) {
-        m_ResetFunctions.push_back(std::bind(glPolygonMode, GL_FRONT, originalMode[0]));
-    }
-    if (face == GL_BACK || face == GL_FRONT_AND_BACK) {
-        m_ResetFunctions.push_back(std::bind(glPolygonMode, GL_BACK, originalMode[1]));
-    }
-    glPolygonMode(face, mode);
-    return !GLERROR("RenderState::PolygonMode");
-}
-
 RenderState::~RenderState()
 {
    for (auto& f : boost::adaptors::reverse(m_ResetFunctions)) {
@@ -4,7 +4,6 @@
 #include "Collision/EntityAABB.h"
 #include "Collision/TriggerSystem.h"
 #include "Collision/CollisionSystem.h"
-#include "Editor/EditorRenderSystem.h"
 #include "Systems/RaptorCopterSystem.h"
 #include "Systems/HealthSystem.h"
 #include "Systems/PlayerMovementSystem.h"
@@ -28,9 +27,11 @@
 #include "Rendering/AnimationSystem.h"
 #include "Network/MultiplayerSnapshotFilter.h"
 #include "Game/Systems/AmmunitionHUDSystem.h"
+#include "Game/Systems/AbilityCooldownHUDSystem.h"
 #include "Game/Systems/CapturePointArrowHUDSystem.h"
 #include "Game/Systems/KillFeedSystem.h"
 #include "Game/Systems/BoostSystem.h"
+#include "Game/Systems/BoostIconsHUDSystem.h"
 #include "GUI/ButtonSystem.h"
 #include "GUI/MainMenuSystem.h"

@@ -135,6 +136,7 @@ Game::Game(int argc, char* argv[])
    m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<AbilityCooldownHUDSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<CapturePointArrowHUDSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
@@ -148,6 +150,7 @@ Game::Game(int argc, char* argv[])
    m_SystemPipeline->AddSystem<BoostSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
    m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
+    m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
    // Populate Octree with collidables
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
@@ -165,7 +168,6 @@ Game::Game(int argc, char* argv[])
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<FillFrustumOctreeSystem>(updateOrderLevel, m_OctreeFrustrumCulling);
    ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<EditorRenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
    m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame, m_OctreeFrustrumCulling);
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<EditorSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
@@ -0,0 +1,30 @@
+#include "Game/Systems/AbilityCooldownHUDSystem.h"
+
+void AbilityCooldownHUDSystem::Update(double dt)
+{
+    //HUD element for tracking cooldown on the parent entity with Dashability TODO: Make sure it support other abilities when they are made.
+
+    auto abilityHUDs = m_World->GetComponents("AbilityCooldownHUD");
+    if (abilityHUDs == nullptr)
+        return;
+
+    for (auto& abilityHUDC : *abilityHUDs) {
+        EntityWrapper entity = EntityWrapper(m_World, abilityHUDC.EntityID);
+        EntityWrapper abilityEntity = entity.FirstParentWithComponent("DashAbility");
+        if (!abilityEntity.Valid())
+            return;
+        EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
+        if(cooldownTextEntity.Valid()) {
+            if(cooldownTextEntity.HasComponent("Text"))
+            {
+                double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
+                double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
+                currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+                std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
+                if(entity.HasComponent("Fill")) {
+                    entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD; //TODO: current time needs to be in the component.
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,42 @@
+#include "Game/Systems/BoostIconsHUDSystem.h"
+
+void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt)
+{
+    EntityWrapper assaultEntity = entity.FirstChildByName("Assault");
+    EntityWrapper defenderEntity = entity.FirstChildByName("Defender");
+    EntityWrapper sniperEntity = entity.FirstChildByName("Sniper");
+
+    if(assaultEntity.Valid()) {
+        if (assaultEntity.HasComponent("Fill")) {
+            EntityWrapper parentWithAssaultBoost = assaultEntity.FirstParentWithComponent("BoostAssault");
+            if (parentWithAssaultBoost.Valid()) {
+                (double&)assaultEntity["Fill"]["Percentage"] = 1.0;
+            } else {
+                (double&)assaultEntity["Fill"]["Percentage"] = 0.0;
+            }
+        }
+    }
+
+    if (defenderEntity.Valid()) {
+        if (defenderEntity.HasComponent("Fill")) {
+            EntityWrapper parentWithAssaultBoost = defenderEntity.FirstParentWithComponent("BoostDefender");
+            if (parentWithAssaultBoost.Valid()) {
+                (double&)defenderEntity["Fill"]["Percentage"] = 1.0;
+            } else {
+                (double&)defenderEntity["Fill"]["Percentage"] = 0.0;
+            }
+        }
+    }
+
+    if (sniperEntity.Valid()) {
+        if (sniperEntity.HasComponent("Fill")) {
+            EntityWrapper parentWithAssaultBoost = sniperEntity.FirstParentWithComponent("BoostSniper");
+            if (parentWithAssaultBoost.Valid()) {
+                (double&)sniperEntity["Fill"]["Percentage"] = 1.0;
+            } else {
+                (double&)sniperEntity["Fill"]["Percentage"] = 0.0;
+            }
+        }
+    }
+}
+
Author	SHA1	Message	Date
Tleety	e1ca104fc9	Merge remote-tracking branch 'origin/master' into HUD-Timers # Conflicts: # resources/Schema/Entities/Player.xml	2016-03-02 22:49:26 +01:00
Tleety	2cb4a307eb	Merge branch 'master' into HUD-Timers # Conflicts: # resources/Schema/Entities/QualityAssurance.xml # src/Game/Game.cpp	2016-03-02 22:42:12 +01:00
Jace	6507efc0db	Merge pull request #162 from teamfisk/Boost-icons Boost icons	2016-03-02 22:28:57 +01:00
Tobias Dahl	96a3e68bf4	Merge pull request #160 from teamfisk/EntityFileCaching Entity file caching	2016-03-02 22:19:20 +01:00
Tleety	2d438060dd	Player arrow change	2016-03-02 22:08:23 +01:00
Tleety	a339c61f5b	Merge remote-tracking branch 'origin/master' into Boost-icons # Conflicts: # resources/Schema/Components.xsd # resources/Schema/Types/Entity.xsd	2016-03-02 21:51:52 +01:00
Tleety	8b81ba9019	Some small fixes, also added new UI elements to Player	2016-03-02 21:40:20 +01:00
Tleety	7af17049e9	BoostIcons should now track correctly	2016-03-02 18:13:09 +01:00
Tleety	8b66d29adc	Skeleton system for Boost icons	2016-03-02 17:32:45 +01:00
Tleety	a9a19193ad	Component for Boost icons	2016-03-02 17:21:15 +01:00
Tleety	cdbc348cfa	AbilityCooldownHUD should now correctly track cooldown for dash ability.	2016-03-02 14:46:37 +01:00
Tleety	502a290d36	Merge branch 'master' into HUD-Timers # Conflicts: # resources/Schema/Components.xsd # resources/Schema/Entities/PlayerRed.xml # resources/Schema/Types/Entity.xsd	2016-03-02 14:22:13 +01:00
Tleety	144e548b7a	Added AbilityCooldownHUD component and system to track the cooldown on the dashability, this needs to be extended for other abilities when they are implemented. However current dash time needs to be included into the component, since we can currently just see the max cooldown time.	2016-02-28 17:17:24 +01:00