Revert "Indentation style changed to Horstmann"

This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
This commit is contained in:
2014-04-12 01:48:15 +02:00
parent d7e65ff118
commit 3470a80f40
61 changed files with 697 additions and 354 deletions
+6 -3
View File
@@ -3,20 +3,23 @@
layout(binding = 0) uniform sampler2D DepthTexture;
in VertexData
{ vec3 Position;
{
vec3 Position;
vec2 TextureCoord;
} Input;
out vec4 FragmentColor;
float LinearizeDepth(float z)
{ float n = 0.1; // camera z near
{
float n = 0.1; // camera z near
float f = 800.0; // camera z far
return (2.0 * n) / (f + n - z * (f - n));
}
void main()
{ float z = texture(DepthTexture, Input.TextureCoord).x;
{
float z = texture(DepthTexture, Input.TextureCoord).x;
vec4 color = vec4(z, z, z, 0);
FragmentColor = color;