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
+4 -2
View File
@@ -3,12 +3,14 @@
uniform samplerCube CubemapTexture;
in VertexData
{ vec3 TextureCoord;
{
vec3 TextureCoord;
} Input;
out vec4 FragColor;
void main()
{ FragColor = texture(CubemapTexture, Input.TextureCoord);
{
FragColor = texture(CubemapTexture, Input.TextureCoord);
//FragColor = vec4(1.0, 1.0, 1.0, 0.0);
}