triforce!
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Debug/OpenGL.exe
BIN
Debug/OpenGL.exe
Binary file not shown.
BIN
Debug/OpenGL.pdb
BIN
Debug/OpenGL.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,2 +1,5 @@
|
||||
Application.cpp
|
||||
LINK : warning LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
|
||||
LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
|
||||
glew32s.lib(glew.obj) : warning LNK4099: PDB 'vc120.pdb' was not found with 'glew32s.lib(glew.obj)' or at 'D:\cpp\OpenGL\Debug\vc120.pdb'; linking object as if no debug info
|
||||
OpenGL.vcxproj -> D:\cpp\OpenGL\Debug\OpenGL.exe
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -155,12 +155,12 @@ int main(void)
|
||||
GLCall(glGenVertexArrays(1, &vao));
|
||||
GLCall(glBindVertexArray(vao));
|
||||
|
||||
VertexBuffer vb(positions, 4 * 2 * sizeof(float));
|
||||
VertexBuffer vb(triforcePos, 6 * 2 * sizeof(float));
|
||||
|
||||
glEnableVertexAttribArray(0);
|
||||
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 2, 0);
|
||||
|
||||
IndexBuffer ib(indices, 3 * 2);
|
||||
IndexBuffer ib(triforceInd, 3 * 3);
|
||||
|
||||
ShaderProgramSource source = ParseShader("res/shaders/Basic.shader");
|
||||
|
||||
@@ -189,7 +189,7 @@ int main(void)
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
glUseProgram(shader);
|
||||
glUniform4f(location, r, 0.3f, 0.8f, 1.0f);
|
||||
glUniform4f(location, r, 1.0f, 0.0f, 1.0f);
|
||||
|
||||
GLCall(glBindVertexArray(vao));
|
||||
ib.Bind();
|
||||
|
||||
Reference in New Issue
Block a user