Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
This commit is contained in:
@@ -3,7 +3,8 @@
|
||||
uniform vec4 Color;
|
||||
|
||||
in VertexData
|
||||
{ vec3 Position;
|
||||
{
|
||||
vec3 Position;
|
||||
vec3 Normal;
|
||||
vec2 TextureCoord;
|
||||
vec3 ShadowCoord;
|
||||
@@ -12,6 +13,7 @@ in VertexData
|
||||
out vec4 FragmentColor;
|
||||
|
||||
void main()
|
||||
{ //FragmentColor = vec4(1.0 - gl_Color.r, 1.0 - gl_Color.g, 1.0 - gl_Color.b, 0.0);
|
||||
{
|
||||
//FragmentColor = vec4(1.0 - gl_Color.r, 1.0 - gl_Color.g, 1.0 - gl_Color.b, 0.0);
|
||||
FragmentColor = Color;
|
||||
}
|
||||
Reference in New Issue
Block a user