Fixed compile issue

README.md

@@ -10,7 +10,7 @@
 [build-image]: https://ci.appveyor.com/api/projects/status/p5rwt06036gp5fwy?svg=true
 [build-url]: https://ci.appveyor.com/project/tippesi/atlas-engine
 
-![Example scene](images/sponza_rasterized.png)
+![Example scene](wiki/images/sponza_rasterized.png)
 *Rasterized image using an irradiance volume*
 #### The current version is a WIP which means many changes and less stability.
 ## Introduction
@@ -75,9 +75,9 @@ in the LICENSE file.
 ## Code Example
 For a code example have a look at the [Wiki](https://github.com/tippesi/Atlas-Engine/wiki/Code-example).
 ## Screenshots
-![Island scene](images/island.gif) <br/>
+![Island scene](wiki/images/island.gif) <br/>
 *Island demo scene*
-![Island scene](images/gun.gif) <br/>
+![Island scene](wiki/images/gun.gif) <br/>
 *PBR rendering*
-![Example scene](images/sponza_raytraced.png)
+![Example scene](wiki/images/sponza_raytraced.png)
 *Ray traced image using 3000 samples with 5 bounces*

data/shader/ddgi/copyEdge.fsh

@@ -54,8 +54,7 @@ void main() {
     bool downBorder = pix.y == probeResWithBorder - 1;
 
     if (leftBorder || rightBorder || upBorder || downBorder) {
-        ivec2 offset = 
-        (pix, leftBorder, rightBorder, upBorder, downBorder);
+        ivec2 offset = OctMapStitch(pix, leftBorder, rightBorder, upBorder, downBorder);
         ivec2 base = (ivec2(gl_FragCoord) / ivec2(probeResWithBorder)) * probeResWithBorder;
 
         colorFS = texelFetch(volume, ivec3(base + offset, volumeLayer), 0);

data/shader/deferred/directional.fsh

@@ -176,7 +176,7 @@ void main() {
 	indirect *= occlusionFactor;
 
 	vec3 radiance = light.color * light.intensity;
-	colorFS = vec4(direct * radiance * surface.NdotL * shadowFactor + indirect + light.color * 0.0 *volumetric, 1.0);
+	colorFS = vec4(direct * radiance * surface.NdotL * shadowFactor + indirect + light.color * volumetric, 1.0);
 
 	if (dot(surface.material.emissiveColor, vec3(1.0)) > 0.01) {	
 		colorFS += vec4(surface.material.emissiveColor, 1.0);

src/App.cpp

@@ -1,7 +1,7 @@
 #include "App.h"
 
-std::string Atlas::EngineInstance::assetDirectory = "../../data";
-std::string Atlas::EngineInstance::shaderDirectory = "shader";
+const std::string Atlas::EngineInstance::assetDirectory = "../../data";
+const std::string Atlas::EngineInstance::shaderDirectory = "shader";
 
 void App::LoadContent() {
 

src/renderer/DDGIRenderer.cpp

@@ -1,4 +1,4 @@
-#include "IrradianceVolumeRenderer.h"
+#include "DDGIRenderer.h"
 
 #include "helper/GeometryHelper.h"
 

src/renderer/MasterRenderer.h

@@ -250,7 +250,7 @@ namespace Atlas {
 			TemporalAARenderer taaRenderer;
 			SkyboxRenderer skyboxRenderer;
 			PostProcessRenderer postProcessRenderer;
-			DDGIRenderer irradianceVolumeRenderer;
+			DDGIRenderer ddgiRenderer;
 			SSAORenderer ssaoRenderer;
 			RTAORenderer rtaoRenderer;