1
0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00

random tweaks

This commit is contained in:
FunkyFr3sh 2018-05-20 20:22:11 +02:00
parent b26738db5d
commit d43983635c

View File

@ -244,7 +244,7 @@ DWORD WINAPI render_main(void)
} }
} }
GLint textureUniLoc = -1, scaleTexCoordAttrLoc = -1, frameCountUniLoc = -1; GLint textureUniLoc = -1, frameCountUniLoc = -1;
GLuint frameBufferId = 0; GLuint frameBufferId = 0;
GLuint frameBufferTexId = 0; GLuint frameBufferTexId = 0;
GLuint scaleVbos[3], scaleVao; GLuint scaleVbos[3], scaleVao;
@ -254,7 +254,7 @@ DWORD WINAPI render_main(void)
glUseProgram(scaleProgram); glUseProgram(scaleProgram);
GLint vertexCoordAttrLoc = glGetAttribLocation(scaleProgram, "VertexCoord"); GLint vertexCoordAttrLoc = glGetAttribLocation(scaleProgram, "VertexCoord");
scaleTexCoordAttrLoc = glGetAttribLocation(scaleProgram, "TexCoord"); GLint texCoordAttrLoc = glGetAttribLocation(scaleProgram, "TexCoord");
textureUniLoc = glGetUniformLocation(scaleProgram, "Texture"); textureUniLoc = glGetUniformLocation(scaleProgram, "Texture");
frameCountUniLoc = glGetUniformLocation(scaleProgram, "FrameCount"); frameCountUniLoc = glGetUniformLocation(scaleProgram, "FrameCount");
@ -289,8 +289,8 @@ DWORD WINAPI render_main(void)
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindBuffer(GL_ARRAY_BUFFER, scaleVbos[1]); glBindBuffer(GL_ARRAY_BUFFER, scaleVbos[1]);
glVertexAttribPointer(scaleTexCoordAttrLoc, 2, GL_FLOAT, GL_FALSE, 0, NULL); glVertexAttribPointer(texCoordAttrLoc, 2, GL_FLOAT, GL_FALSE, 0, NULL);
glEnableVertexAttribArray(scaleTexCoordAttrLoc); glEnableVertexAttribArray(texCoordAttrLoc);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, scaleVbos[2]); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, scaleVbos[2]);
@ -489,13 +489,13 @@ DWORD WINAPI render_main(void)
{ {
glBindVertexArray(mainVao); glBindVertexArray(mainVao);
glBindBuffer(GL_ARRAY_BUFFER, mainVbos[1]); glBindBuffer(GL_ARRAY_BUFFER, mainVbos[1]);
GLfloat texCoordPal[] = { GLfloat texCoord[] = {
0.0f, 0.0f, 0.0f, 0.0f,
0.0f, scale_h, 0.0f, scale_h,
scale_w, scale_h, scale_w, scale_h,
scale_w, 0.0f, scale_w, 0.0f,
}; };
glBufferData(GL_ARRAY_BUFFER, sizeof(texCoordPal), texCoordPal, GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(texCoord), texCoord, GL_STATIC_DRAW);
glVertexAttribPointer(mainTexCoordAttrLoc, 2, GL_FLOAT, GL_FALSE, 0, NULL); glVertexAttribPointer(mainTexCoordAttrLoc, 2, GL_FLOAT, GL_FALSE, 0, NULL);
glEnableVertexAttribArray(mainTexCoordAttrLoc); glEnableVertexAttribArray(mainTexCoordAttrLoc);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);