From 101e43213edb2f6d8b334e9dd42e15b763ef9ec0 Mon Sep 17 00:00:00 2001 From: Ian Curtis Date: Wed, 5 Apr 2017 19:32:01 +0000 Subject: [PATCH] cosmetic --- Src/Graphics/New3D/Model.h | 1 - Src/Graphics/New3D/R3DShader.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Src/Graphics/New3D/Model.h b/Src/Graphics/New3D/Model.h index 00ffd29..2832f47 100644 --- a/Src/Graphics/New3D/Model.h +++ b/Src/Graphics/New3D/Model.h @@ -1,7 +1,6 @@ #ifndef _MODEL_H_ #define _MODEL_H_ -#include "Types.h" #include #include #include diff --git a/Src/Graphics/New3D/R3DShader.cpp b/Src/Graphics/New3D/R3DShader.cpp index 41a4173..10c1964 100644 --- a/Src/Graphics/New3D/R3DShader.cpp +++ b/Src/Graphics/New3D/R3DShader.cpp @@ -37,7 +37,7 @@ static const char *fragmentShaderR3D = "uniform bool microTexture;\n" "uniform float microTextureScale;\n" "uniform vec2 baseTexSize;\n" -"uniform bool texureInverted;\n" +"uniform bool textureInverted;\n" "uniform bool alphaTest;\n" "uniform bool textureAlpha;\n" "uniform vec3 fogColour;\n" @@ -62,7 +62,7 @@ static const char *fragmentShaderR3D = "{\n" "vec4 tex1Data = texture2D( tex1, gl_TexCoord[0].st);\n" - "if(texureInverted) {\n" + "if(textureInverted) {\n" "tex1Data.rgb = vec3(1.0) - vec3(tex1Data.rgb);\n" "}\n" @@ -226,7 +226,7 @@ bool R3DShader::LoadShader(const char* vertexShader, const char* fragmentShader) m_locAlphaTest = glGetUniformLocation(m_shaderProgram, "alphaTest"); m_locMicroTexScale = glGetUniformLocation(m_shaderProgram, "microTextureScale"); m_locBaseTexSize = glGetUniformLocation(m_shaderProgram, "baseTexSize"); - m_locTextureInverted= glGetUniformLocation(m_shaderProgram, "texureInverted"); + m_locTextureInverted= glGetUniformLocation(m_shaderProgram, "textureInverted"); m_locFogIntensity = glGetUniformLocation(m_shaderProgram, "fogIntensity"); m_locFogDensity = glGetUniformLocation(m_shaderProgram, "fogDensity");