Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
This commit is contained in:
@@ -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);
|
||||
}
|
||||
Reference in New Issue
Block a user