Browse Source

Fixed a typo in OpenGLDemo

tags/2021-05-28
Noah Dayan 7 years ago
parent
commit
bcd3fd7689
1 changed files with 11 additions and 11 deletions
  1. +11
    -11
      examples/GUI/OpenGLAppDemo.h

+ 11
- 11
examples/GUI/OpenGLAppDemo.h View File

@@ -147,7 +147,7 @@ public:
vertexShader = vertexShader =
"attribute vec4 position;\n" "attribute vec4 position;\n"
"attribute vec4 sourceColour;\n" "attribute vec4 sourceColour;\n"
"attribute vec2 texureCoordIn;\n"
"attribute vec2 textureCoordIn;\n"
"\n" "\n"
"uniform mat4 projectionMatrix;\n" "uniform mat4 projectionMatrix;\n"
"uniform mat4 viewMatrix;\n" "uniform mat4 viewMatrix;\n"
@@ -158,7 +158,7 @@ public:
"void main()\n" "void main()\n"
"{\n" "{\n"
" destinationColour = sourceColour;\n" " destinationColour = sourceColour;\n"
" textureCoordOut = texureCoordIn;\n"
" textureCoordOut = textureCoordIn;\n"
" gl_Position = projectionMatrix * viewMatrix * position;\n" " gl_Position = projectionMatrix * viewMatrix * position;\n"
"}\n"; "}\n";
@@ -224,10 +224,10 @@ private:
{ {
Attributes (OpenGLContext& openGLContext, OpenGLShaderProgram& shaderProgram) Attributes (OpenGLContext& openGLContext, OpenGLShaderProgram& shaderProgram)
{ {
position .reset (createAttribute (openGLContext, shaderProgram, "position"));
normal .reset (createAttribute (openGLContext, shaderProgram, "normal"));
sourceColour .reset (createAttribute (openGLContext, shaderProgram, "sourceColour"));
texureCoordIn.reset (createAttribute (openGLContext, shaderProgram, "texureCoordIn"));
position .reset (createAttribute (openGLContext, shaderProgram, "position"));
normal .reset (createAttribute (openGLContext, shaderProgram, "normal"));
sourceColour .reset (createAttribute (openGLContext, shaderProgram, "sourceColour"));
textureCoordIn.reset (createAttribute (openGLContext, shaderProgram, "textureCoordIn"));
} }
void enable (OpenGLContext& glContext) void enable (OpenGLContext& glContext)
@@ -250,10 +250,10 @@ private:
glContext.extensions.glEnableVertexAttribArray (sourceColour->attributeID); glContext.extensions.glEnableVertexAttribArray (sourceColour->attributeID);
} }
if (texureCoordIn.get() != nullptr)
if (textureCoordIn.get() != nullptr)
{ {
glContext.extensions.glVertexAttribPointer (texureCoordIn->attributeID, 2, GL_FLOAT, GL_FALSE, sizeof (Vertex), (GLvoid*) (sizeof (float) * 10));
glContext.extensions.glEnableVertexAttribArray (texureCoordIn->attributeID);
glContext.extensions.glVertexAttribPointer (textureCoordIn->attributeID, 2, GL_FLOAT, GL_FALSE, sizeof (Vertex), (GLvoid*) (sizeof (float) * 10));
glContext.extensions.glEnableVertexAttribArray (textureCoordIn->attributeID);
} }
} }
@@ -262,10 +262,10 @@ private:
if (position.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (position->attributeID); if (position.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (position->attributeID);
if (normal.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (normal->attributeID); if (normal.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (normal->attributeID);
if (sourceColour.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (sourceColour->attributeID); if (sourceColour.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (sourceColour->attributeID);
if (texureCoordIn.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (texureCoordIn->attributeID);
if (textureCoordIn.get() != nullptr) glContext.extensions.glDisableVertexAttribArray (textureCoordIn->attributeID);
} }
ScopedPointer<OpenGLShaderProgram::Attribute> position, normal, sourceColour, texureCoordIn;
ScopedPointer<OpenGLShaderProgram::Attribute> position, normal, sourceColour, textureCoordIn;
private: private:
static OpenGLShaderProgram::Attribute* createAttribute (OpenGLContext& openGLContext, static OpenGLShaderProgram::Attribute* createAttribute (OpenGLContext& openGLContext,


Loading…
Cancel
Save