Merge remote-tracking branch 'origin/master' into DDS

Conflicts:
	assets
	resources/DefaultConfig.ini

include/Engine/Rendering/ShadowPass.h

@@ -29,8 +29,8 @@ struct ShadowFrustum
 class ShadowPass
 {
 public:
-	ShadowPass(IRenderer* renderer);
-	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY);
+	ShadowPass(IRenderer* renderer, bool useShadow);
+	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY, bool useShadow);
 	~ShadowPass();
 
 	void InitializeFrameBuffers();

include/Game/Systems/HealthPickupSystem.h

@@ -1,45 +0,0 @@
-#ifndef HealthPickupSystem_h__
-#define HealthPickupSystem_h__
-
-#include "Core/System.h"
-#include "Core/Transform.h"
-#include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EPlayerHealthPickup.h"
-#include "Engine/Collision/ETrigger.h"
-#include "Common.h"
-#include <tuple>
-#include "Core/ConfigFile.h"
-
-class HealthPickupSystem : public ImpureSystem
-{
-public:
-    HealthPickupSystem(SystemParams params);
-
-    virtual void Update(double dt) override;
-
-private:
-    EventRelay<HealthPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
-    bool OnTriggerTouch(Events::TriggerTouch& e);
-    EventRelay<HealthPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
-    bool OnTriggerLeave(Events::TriggerLeave& e);
-
-    struct NewHealthPickup {
-        glm::vec3 Pos;
-        double HealthGain;
-        double RespawnTimer;
-        double DecreaseThisRespawnTimer;
-        EntityID parentID;
-    };
-    std::vector<NewHealthPickup> m_ETriggerTouchVector;
-    struct EntityAtMaxValuePickupStruct {
-        EntityWrapper player;
-        NewHealthPickup pickup;
-        EntityWrapper trigger;
-    };
-    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
-    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
-    void DoPickup(EntityWrapper &player, NewHealthPickup &triggerCopy, EntityWrapper &trigger);
-};
-#endif

resources/DefaultConfig.ini

@@ -89,3 +89,6 @@ NumIterations=6
 
 [MSAA]
 Level=2
+
+[Shadows]
+Enable=false

resources/README.txt

@@ -1,6 +1,6 @@
 To start a server
 
-	1. Run "Axyz Server" from the start menu or "Server.bat" in the installation directory (C:\Program Files\Axyz)
+	1. Run Server.bat in the installation directory (C:\Program Files\Axyz)
 	2. Press F1 to open the editor mode
 	3. Expand the Entities window if it is minimized, by double-clicking it
 	4. Mark StartMenu_Origin and hit Delete twice
@@ -9,7 +9,7 @@ To start a server
 
 To join a game
 
-	1. Run "Axyz" from the start menu or "Axyz.exe" in the installation directory (C:\Program Files\Axyz)
+	1. Run Axyz from the start menu or Axyz.exe in the installation directory (C:\Program Files\Axyz)
 	2. Press Play
 	3. Hit the refresh icon if no server is visible
 	4. Click the server you want to join

resources/Setup/Inno Setup Script.iss

@@ -54,7 +54,6 @@ Source: "..\..\resources\DefaultConfig.ini"; DestDir: "{app}"; Flags: ignorevers
 Source: "..\..\resources\DefaultInput.ini"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\glew32.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\glfw3.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\bin\OpenAL32.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\imgui.ini"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\Input.ini"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -68,8 +67,6 @@ Source: "..\..\deps\redist\VC_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteaf
 [Icons]
 Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-Name: "{commonprograms}\{#MyAppName} Server"; Filename: "{app}\{#MyAppExeName}"; Parameters: "--server"
-Name: "{commondesktop}\{#MyAppName} Server"; Filename: "{app}\{#MyAppExeName}"; Parameters: "--server"; Tasks: desktopicon
 
 [INI]
 Filename: "{app}\Config.ini"; Section: "Networking"; Key: "Name"; String: "{%USERNAME}"; Flags: createkeyifdoesntexist

src/Engine/Network/Client.cpp

@@ -225,7 +225,7 @@ void Client::parsePing()
     m_IsConnected = true;
     // Time since last ping was received
     m_DurationOfPingTime = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
-    //LOG_INFO("%i: response time with ctime(ms): %f", m_PacketID, m_DurationOfPingTime);
+    LOG_INFO("%i: response time with ctime(ms): %f", m_PacketID, m_DurationOfPingTime);
     m_StartPingTime = std::clock();
 
     Packet packet(MessageType::Ping, m_SendPacketID);

src/Engine/Rendering/Renderer.cpp

@@ -321,7 +321,7 @@ void Renderer::InitializeRenderPasses()
     m_LightCullingPass = new LightCullingPass(this);
     m_CubeMapPass = new CubeMapPass(this);
 	m_SSAOPass = new SSAOPass(this, m_Config);
-	m_ShadowPass = new ShadowPass(this);
+	m_ShadowPass = new ShadowPass(this, m_Config->Get<bool>("Shadows.Enable", false));
     m_BlurHUDPass = new BlurHUD(this);
     m_DrawFinalPass = new DrawFinalPass(this, m_LightCullingPass, m_CubeMapPass, m_SSAOPass, m_ShadowPass, m_Config);
     m_DrawScreenQuadPass = new DrawScreenQuadPass(this);

src/Engine/Rendering/ShadowPass.cpp

@@ -1,21 +1,84 @@
 #include "Rendering/ShadowPass.h"
 
-ShadowPass::ShadowPass(IRenderer * renderer, int shadow_res_x, int shadow_res_y)
+ShadowPass::ShadowPass(IRenderer * renderer, int shadow_res_x, int shadow_res_y, bool useShadow)
 {
-	m_Renderer = renderer;
-	m_ResolutionSizeWidth = shadow_res_x;
-	m_ResolutionSizeHeight = shadow_res_y;
+	m_EnableShadows = useShadow;
+	if (useShadow) {
+		m_Renderer = renderer;
+		m_ResolutionSizeWidth = shadow_res_x;
+		m_ResolutionSizeHeight = shadow_res_y;
 
-	InitializeFrameBuffers();
-	InitializeShaderPrograms();
+		InitializeFrameBuffers();
+		InitializeShaderPrograms();
+	} else {
+		glGenTextures(1, &m_DepthMap);
+
+		glBindTexture(GL_TEXTURE_2D_ARRAY, m_DepthMap);
+		glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_DEPTH_COMPONENT16, 1, 1, m_CurrentNrOfSplits);
+
+		//glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, m_ResolutionSizeWidth, m_ResolutionSizeHeight, m_CurrentNrOfSplits, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, nullptr);
+
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
+		glTexParameterfv(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BORDER_COLOR, glm::vec4(1.f).data);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+
+		m_DepthBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2DArray(&m_DepthMap, GL_DEPTH_ATTACHMENT)));
+		m_DepthBuffer.Generate();
+
+		m_DepthBuffer.Bind();
+
+		for (int i = 0; i < m_CurrentNrOfSplits; i++) {
+			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
+
+			glClear(GL_DEPTH_BUFFER_BIT);
+		}
+
+		m_DepthBuffer.Unbind();
+	}
 }
 
-ShadowPass::ShadowPass(IRenderer * renderer)
+ShadowPass::ShadowPass(IRenderer * renderer, bool useShadow)
 {
-	m_Renderer = renderer;
+	m_EnableShadows = useShadow;
+	if (useShadow) {
+		m_Renderer = renderer;
 
-	InitializeFrameBuffers();
-	InitializeShaderPrograms();
+		InitializeFrameBuffers();
+		InitializeShaderPrograms();
+	} else {
+		glGenTextures(1, &m_DepthMap);
+
+		glBindTexture(GL_TEXTURE_2D_ARRAY, m_DepthMap);
+		glTexStorage3D(GL_TEXTURE_2D_ARRAY, 1, GL_DEPTH_COMPONENT16, 1, 1, m_CurrentNrOfSplits);
+
+		//glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, m_ResolutionSizeWidth, m_ResolutionSizeHeight, m_CurrentNrOfSplits, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, nullptr);
+
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
+		glTexParameterfv(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BORDER_COLOR, glm::vec4(1.f).data);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+
+		m_DepthBuffer.AddResource(std::shared_ptr<BufferResource>(new Texture2DArray(&m_DepthMap, GL_DEPTH_ATTACHMENT)));
+		m_DepthBuffer.Generate();
+
+		m_DepthBuffer.Bind();
+
+		for (int i = 0; i < m_CurrentNrOfSplits; i++) {
+			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
+
+			glClear(GL_DEPTH_BUFFER_BIT);
+		}
+
+		m_DepthBuffer.Unbind();
+
+	}
 }
 
 ShadowPass::~ShadowPass()
@@ -120,7 +183,6 @@ float ShadowPass::FindRadius(ShadowFrustum& frustum)
 			radius = distance;
 		}
 	}
-
 	frustum.Radius = radius;
 	return radius;
 }
@@ -168,15 +230,17 @@ void ShadowPass::InitializeShaderPrograms()
 
 void ShadowPass::ClearBuffer()
 {
-	m_DepthBuffer.Bind();
+	if (m_EnableShadows) {
+		m_DepthBuffer.Bind();
 
-	for (int i = 0; i < m_CurrentNrOfSplits; i++) {
-		glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
+		for (int i = 0; i < m_CurrentNrOfSplits; i++) {
+			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
 
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		}
+
+		m_DepthBuffer.Unbind();
 	}
-
-	m_DepthBuffer.Unbind();
 }
 
 void ShadowPass::PointsToLightspace(ShadowFrustum& frustum, glm::mat4 v)

src/Engine/Rendering/Texture.cpp

@@ -28,8 +28,6 @@ Texture::Texture(std::string path)
         break;
     }
 
-	//Master hade PNG release here...
-
     // Construct the OpenGL texture
     glGenTextures(1, &m_Texture);
     glBindTexture(GL_TEXTURE_2D, m_Texture);

src/Game/Systems/HealthPickupSystem.cpp

@@ -1,138 +0,0 @@
-#include "Systems/HealthPickupSystem.h"
-
-HealthPickupSystem::HealthPickupSystem(SystemParams params)
-    : System(params)
-{
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &HealthPickupSystem::OnTriggerTouch);
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &HealthPickupSystem::OnTriggerLeave);
-}
-
-void HealthPickupSystem::Update(double dt)
-{
-    for (auto it = m_ETriggerTouchVector.begin(); it != m_ETriggerTouchVector.end(); ++it)
-    {
-        auto& somePickup = *it;
-        //set the double timer value (value 3)
-        somePickup.DecreaseThisRespawnTimer -= dt;
-        if (somePickup.DecreaseThisRespawnTimer < 0.0) {
-            LOG_INFO("loading healthpickup xml");
-
-            //spawn and delete the vector item
-            auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/HealthPickup.xml");
-            EntityFileParser parser(entityFile);
-            EntityID healthPickupID = parser.MergeEntities(m_World);
-            LOG_INFO("finished loading healthpickup xml");
-
-            //let the world know a pickup has spawned (graphics effects, etc)
-            Events::PickupSpawned ePickupSpawned;
-            ePickupSpawned.Pickup = EntityWrapper(m_World, healthPickupID);
-            m_EventBroker->Publish(ePickupSpawned);
-            LOG_INFO("event published");
-
-            //set values from the old entity to the new entity
-            auto& newHealthPickupEntity = EntityWrapper(m_World, healthPickupID);
-            LOG_INFO("healthpickup id %i", healthPickupID);
-            newHealthPickupEntity["Transform"]["Position"] = somePickup.Pos;
-            newHealthPickupEntity["HealthPickup"]["HealthGain"] = somePickup.HealthGain;
-            newHealthPickupEntity["HealthPickup"]["RespawnTimer"] = somePickup.RespawnTimer;
-            m_World->SetParent(newHealthPickupEntity.ID, somePickup.parentID);
-            LOG_INFO("healthpickup parented to %i", somePickup.parentID);
-            //erase the current element (somePickup)
-            m_ETriggerTouchVector.erase(it);
-            break;
-        }
-    }
-    //still touching AmmoPickupAtMaxHealthAmmo?
-    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
-        if (!it->player.Valid()) {
-            LOG_INFO("player no longer valid, erasing maxPickup");
-            m_PickupAtMaximum.erase(it);
-            break;
-
-        }
-        if ((double)it->player["Health"]["Health"] < (double)it->player["Health"]["MaxHealth"]) {
-            LOG_INFO("maxhealth found in pickupmax.. yada yada");
-            DoPickup(it->player, it->pickup, it->trigger);
-            m_PickupAtMaximum.erase(it);
-            break;
-        }
-    }
-}
-
-bool HealthPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
-{
-    LOG_INFO("OnTriggerTouch");
-    if (!e.Trigger.HasComponent("HealthPickup")) {
-        return false;
-    }
-    LOG_INFO("touch start");
-
-    //cant pick up healthpacks if you are already at MaxHealth
-    if ((double)e.Entity["Health"]["Health"] >= (double)e.Entity["Health"]["MaxHealth"]) {
-        LOG_INFO("triggertouch enter at maxhealth");
-        //push back a copy of the entitys data, rather than e.trigger. since the server might delete e.trigger before client can use it
-        m_PickupAtMaximum.push_back({ e.Entity,{ (glm::vec3)e.Trigger["Transform"]["Position"] ,e.Trigger["HealthPickup"]["HealthGain"],
-            e.Trigger["HealthPickup"]["RespawnTimer"],e.Trigger["HealthPickup"]["RespawnTimer"], m_World->GetParent(e.Trigger.ID) } , e.Trigger });
-        return false;
-    }
-    LOG_INFO("touch doing pickup");
-
-    DoPickup(e.Entity, e.Trigger);
-    return true;
-}
-bool HealthPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
-    //triggerleave erases possible m_PickupAtMaximum
-    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
-        if (it->trigger.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
-            LOG_INFO("trigger leave - erasing max");
-            m_PickupAtMaximum.erase(it);
-            break;
-        }
-    }
-    return true;
-}
-
-void HealthPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
-    double healthGiven = 0.01*(double)trigger["HealthPickup"]["HealthGain"] * (double)player["Health"]["MaxHealth"];
-    LOG_INFO("do pickup start");
-
-    //personEntered = e.Entity, thingEntered = e.Trigger
-    //only the server will increase the players hp and set it in the next delta
-    if (player.ID != LocalPlayer.ID && ResourceManager::Load<ConfigFile>("Config.ini")->Get("Networking.StartNetwork", false)) {
-        Events::PlayerHealthPickup ePlayerHealthPickup;
-        ePlayerHealthPickup.HealthAmount = healthGiven;
-        ePlayerHealthPickup.Player = player;
-        m_EventBroker->Publish(ePlayerHealthPickup);
-        LOG_INFO("do pickup event published");
-    }
-    //copy position, healthgain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
-    //we need to copy all values since each value can be different for each healthPickup
-    m_ETriggerTouchVector.push_back({ (glm::vec3)trigger["Transform"]["Position"] ,trigger["HealthPickup"]["HealthGain"],
-        trigger["HealthPickup"]["RespawnTimer"],trigger["HealthPickup"]["RespawnTimer"], m_World->GetParent(trigger.ID) });
-    LOG_INFO("pickup set id to %i", trigger.ID);
-
-    //delete the healthpickup
-    m_World->DeleteEntity(trigger.ID);
-}
-
-//to be used with at-max-health-pickup
-void HealthPickupSystem::DoPickup(EntityWrapper &player, NewHealthPickup &triggerCopy, EntityWrapper &trigger) {
-    double healthGiven = 0.01*triggerCopy.HealthGain * (double)player["Health"]["MaxHealth"];
-    LOG_INFO("do pickup start");
-
-    //only the server will increase the players hp and set it in the next delta
-    if (player.ID != LocalPlayer.ID && ResourceManager::Load<ConfigFile>("Config.ini")->Get("Networking.StartNetwork", false)) {
-        Events::PlayerHealthPickup ePlayerHealthPickup;
-        ePlayerHealthPickup.HealthAmount = healthGiven;
-        ePlayerHealthPickup.Player = player;
-        m_EventBroker->Publish(ePlayerHealthPickup);
-        LOG_INFO("do pickup event published");
-    }
-    m_ETriggerTouchVector.push_back(triggerCopy);
-    //LOG_INFO("pickup set id to %i", trigger.ID);
-
-    //delete the healthpickup
-    if (trigger.Valid()) {
-        m_World->DeleteEntity(trigger.ID);
-    }
-}

src/Tests/PickupSpawnTest.cpp

@@ -2,7 +2,7 @@
 using boost::unit_test_framework::test_suite;
 using boost::unit_test_framework::test_case;
 
-#include "HealthPickupTest.h"
+#include "PickupSpawnTest.h"
 
 BOOST_AUTO_TEST_SUITE(PickupSpawnTestSuite)
 
@@ -41,7 +41,7 @@ PickupSpawnTest::PickupSpawnTest(int runTestNumber)
     // Create system pipeline
     m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker, false, false);
     m_SystemPipeline->AddSystem<HealthSystem>(0);
-    m_SystemPipeline->AddSystem<HealthPickupSystem>(1);
+    m_SystemPipeline->AddSystem<PickupSpawnSystem>(1);
 
     //must register components (Components.xsd), else you cant create entities. Easiest done by loading a test xsd file
     auto file = ResourceManager::Load<EntityXMLFile>("Schema/Entities/HealthPickup.xml");

src/Tests/PickupSpawnTest.h

@@ -31,7 +31,7 @@
 #include "Collision/CollisionSystem.h"
 #include "Core/EntityXMLFileWriter.h"
 #include "Game/Systems/HealthSystem.h"
-#include "Game/Systems/HealthPickupSystem.h"
+#include "Game/Systems/PickupSpawnSystem.h"
 
 #include "Core/ResourceManager.h"
 
@@ -56,9 +56,9 @@ private:
     EntityID m_PlayerID, m_HealthPickupID;
     int m_RunTestNumber;
 
-    EventRelay<HealthPickupSystem, Events::PlayerHealthPickup> m_HP;
+    EventRelay<PickupSpawnSystem, Events::PlayerHealthPickup> m_HP;
     bool OnHealthPickup(Events::PlayerHealthPickup& e);
-    EventRelay<HealthPickupSystem, Events::PickupSpawned> m_PS;
+    EventRelay<PickupSpawnSystem, Events::PickupSpawned> m_PS;
     bool OnPickupSpawned(Events::PickupSpawned& e);
 
     bool m_TestStage1Success = false;