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, bool useShadow);
-	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY);
+	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY, bool useShadow);
 	~ShadowPass();
 
 	void InitializeFrameBuffers();

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/Schema/Entities/DefenderShield.xml

@@ -31,13 +31,22 @@
           <Components>
             <c:Animation>
               <AnimationName>ActivateShieldU</AnimationName>
-              <Play>true</Play>
               <Loop>false</Loop>
             </c:Animation>
             <c:Transform/>
           </Components>
           <Children/>
         </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>ShieldFrontU</AnimationName>
+              <Play>true</Play>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
       </Children>
     </Entity>
     <Entity name="Front">
@@ -65,7 +74,16 @@
           <Components>
             <c:Animation>
               <AnimationName>ActivateShieldU</AnimationName>
-              <Play>true</Play>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>ShieldFrontU</AnimationName>
               <Loop>false</Loop>
             </c:Animation>
             <c:Transform/>

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/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_EnableShadows = useShadow;
-	m_ResolutionSizeWidth = shadow_res_x;
+	if (useShadow) {
-	m_ResolutionSizeHeight = shadow_res_y;
+		m_Renderer = renderer;
+		m_ResolutionSizeWidth = shadow_res_x;
+		m_ResolutionSizeHeight = shadow_res_y;
 
-	InitializeFrameBuffers();
+		InitializeFrameBuffers();
-	InitializeShaderPrograms();
+		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();
+		InitializeFrameBuffers();
-	InitializeShaderPrograms();
+		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++) {
+		for (int i = 0; i < m_CurrentNrOfSplits; i++) {
-		glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, 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/Weapon/DefenderWeaponBehaviour.cpp

@@ -160,9 +160,9 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     }
                 }
 
-                SpawnerSystem::Spawn(attachment, attachment);
+                if (IsServer) {
-                
+                    SpawnerSystem::Spawn(attachment, attachment);
-/*
+                }
 
                 EntityWrapper backAttachment = attachment.FirstChildByName("Back");
                 if (backAttachment.Valid()) {
@@ -172,11 +172,7 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     eDeployShieldAttachement.Restart = true;
                     eDeployShieldAttachement.Start = true;
                     m_EventBroker->Publish(eDeployShieldAttachement);
-                } else {
-                    LOG_ERROR("back shield invalid");
                 }
-
-
                 EntityWrapper frontAttachment = attachment.FirstChildByName("Front");
                 if (frontAttachment.Valid()) {
                     Events::AutoAnimationBlend eDeployShieldAttachement;
@@ -186,10 +182,7 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     eDeployShieldAttachement.Start = true;
                     m_EventBroker->Publish(eDeployShieldAttachement);
 
-                } else {
-                    LOG_ERROR("front shield invalid");
                 }
-*/
 
                 if (IsClient) {
                     EntityWrapper root = wi.FirstPersonEntity;