BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Recording' of github.com:teamfisk/TacticalZ into Recording

Browse Source 
# Conflicts:
#	src/Engine/Editor/EditorSystem.cpp
This commit is contained in:
William Moberg
2016-03-14 06:02:47 +01:00
parent 0cd161184e 87b983ec6f
commit 6daaccb9ed
8 changed files with 30929 additions and 27401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/ShadowPass.h
+1 -1
View File
@@ -69,7 +69,7 @@ private:
std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
std::array<glm::mat4, MAX_SPLITS> m_LightView;
GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
GLfloat m_NearFarPlane[2] = { -128.f, 128.f };
GLuint m_ResolutionSizeWidth = 1024 * 2;
GLuint m_ResolutionSizeHeight = 1024 * 2;