Updated submodule remotes to something more manageable and accessible.

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "assets"]
 	path = assets
-	url = tacticalz@1.drake.imon.nu:TacticalZ-assets
+	url = https://imon.nu/git/BTH/Axyz-assets.git
 [submodule "deps"]
 	path = deps
-	url = tacticalz@1.drake.imon.nu:TacticalZ-deps
+	url = https://imon.nu/git/BTH/Axyz-deps.git

include/Engine/Rendering/ShadowPass.h

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

resources/DefaultConfig.ini

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

resources/README.txt

@@ -1,6 +1,6 @@
 To start a server
 
-	1. Run Server.bat in the installation directory (C:\Program Files\Axyz)
+	1. Run "Axyz Server" from the start menu or "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,6 +54,7 @@ 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
@@ -67,6 +68,8 @@ 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

resources/Shaders/ForwardPlus.frag.glsl

@@ -321,7 +321,8 @@ void main()
 	float shadowFactor = 0.0;
 
 	for(int i = start; i < start + amount; i++) {
-
+		vec3 shadowColor = vec3(1.0);
+		
 		int l = int(LightIndex[i]);
 		LightSource light = LightSources.List[l];
 
@@ -333,13 +334,11 @@ void main()
 			int DepthMapIndex = getShadowIndex(FarDistance);
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 			shadowFactor = CalcShadowValue(Input.PositionLightSpace[DepthMapIndex], Input.Normal, vec3(light.Direction), DepthMap, DepthMapIndex);
+			shadowColor = min(vec3(shadowFactor), vec3(1.0));
 		}
-		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
-		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
+		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao * shadowColor, light_result.Diffuse.a);
+		totalLighting.Specular += vec4(light_result.Specular.rgb * ao * shadowColor, light_result.Specular.a);
 	}
-	
-	totalLighting.Diffuse *= vec4(min(vec3(shadowFactor) + AmbientColor.xyz, vec3(1.0)), 1.0);
-	totalLighting.Specular *= vec4(min(vec3(shadowFactor) + AmbientColor.xyz, vec3(1.0)), 1.0);
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
 	color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));

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_Config->Get<bool>("Shadows.Enable", false));
+	m_ShadowPass = new ShadowPass(this);
     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,84 +1,21 @@
 #include "Rendering/ShadowPass.h"
 
-ShadowPass::ShadowPass(IRenderer * renderer, int shadow_res_x, int shadow_res_y, bool useShadow)
+ShadowPass::ShadowPass(IRenderer * renderer, int shadow_res_x, int shadow_res_y)
 {
-	m_EnableShadows = useShadow;
-	if (useShadow) {
-		m_Renderer = renderer;
-		m_ResolutionSizeWidth = shadow_res_x;
-		m_ResolutionSizeHeight = shadow_res_y;
+	m_Renderer = renderer;
+	m_ResolutionSizeWidth = shadow_res_x;
+	m_ResolutionSizeHeight = shadow_res_y;
 
-		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();
-	}
+	InitializeFrameBuffers();
+	InitializeShaderPrograms();
 }
 
-ShadowPass::ShadowPass(IRenderer * renderer, bool useShadow)
+ShadowPass::ShadowPass(IRenderer * renderer)
 {
-	m_EnableShadows = useShadow;
-	if (useShadow) {
-		m_Renderer = renderer;
+	m_Renderer = renderer;
 
-		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();
-
-	}
+	InitializeFrameBuffers();
+	InitializeShaderPrograms();
 }
 
 ShadowPass::~ShadowPass()
@@ -183,6 +120,7 @@ float ShadowPass::FindRadius(ShadowFrustum& frustum)
 			radius = distance;
 		}
 	}
+
 	frustum.Radius = radius;
 	return radius;
 }
@@ -230,17 +168,15 @@ void ShadowPass::InitializeShaderPrograms()
 
 void ShadowPass::ClearBuffer()
 {
-	if (m_EnableShadows) {
-		m_DepthBuffer.Bind();
+	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);
-		}
-
-		m_DepthBuffer.Unbind();
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	}
+
+	m_DepthBuffer.Unbind();
 }
 
 void ShadowPass::PointsToLightspace(ShadowFrustum& frustum, glm::mat4 v)

src/Engine/Rendering/Texture.cpp

@@ -28,6 +28,8 @@ 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);