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
+8 -4
View File
@@ -6,20 +6,24 @@ layout(triangles) in;
layout(line_strip, max_vertices = 6) out;
in VertexData
{ vec3 Position;
{
vec3 Position;
vec3 Normal;
vec2 TextureCoord;
} Input[3];
out VertexData
{ vec3 Position;
{
vec3 Position;
vec3 Normal;
vec2 TextureCoord;
} Output;
void main()
{ for (int i = 0; i < gl_in.length(); i++)
{ gl_Position = MVP * vec4(Input[i].Position, 1.0);
{
for (int i = 0; i < gl_in.length(); i++)
{
gl_Position = MVP * vec4(Input[i].Position, 1.0);
EmitVertex();
gl_Position = MVP * vec4(Input[i].Position + Input[i].Normal, 1.0);
EmitVertex();