diff --git a/.vs/OpenGL/v17/.suo b/.vs/OpenGL/v17/.suo index 583c2b4..e5bafe2 100644 Binary files a/.vs/OpenGL/v17/.suo and b/.vs/OpenGL/v17/.suo differ diff --git a/.vs/OpenGL/v17/Browse.VC.db b/.vs/OpenGL/v17/Browse.VC.db index 9625b35..6ba7f3d 100644 Binary files a/.vs/OpenGL/v17/Browse.VC.db and b/.vs/OpenGL/v17/Browse.VC.db differ diff --git a/.vs/OpenGL/v17/ipch/AutoPCH/19c5fdc91625b6ef/APPLICATION.ipch b/.vs/OpenGL/v17/ipch/AutoPCH/19c5fdc91625b6ef/APPLICATION.ipch index 5d6174c..45e4011 100644 Binary files a/.vs/OpenGL/v17/ipch/AutoPCH/19c5fdc91625b6ef/APPLICATION.ipch and b/.vs/OpenGL/v17/ipch/AutoPCH/19c5fdc91625b6ef/APPLICATION.ipch differ diff --git a/.vs/OpenGL/v17/ipch/AutoPCH/2eb7037a0f95a519/VERTEXBUFFER.ipch b/.vs/OpenGL/v17/ipch/AutoPCH/2eb7037a0f95a519/VERTEXBUFFER.ipch index bbcc6ad..3d36bb5 100644 Binary files a/.vs/OpenGL/v17/ipch/AutoPCH/2eb7037a0f95a519/VERTEXBUFFER.ipch and b/.vs/OpenGL/v17/ipch/AutoPCH/2eb7037a0f95a519/VERTEXBUFFER.ipch differ diff --git a/.vs/OpenGL/v17/ipch/AutoPCH/64e5a29d06d8a206/RENDERER.ipch b/.vs/OpenGL/v17/ipch/AutoPCH/64e5a29d06d8a206/RENDERER.ipch index 1937c19..8990fde 100644 Binary files a/.vs/OpenGL/v17/ipch/AutoPCH/64e5a29d06d8a206/RENDERER.ipch and b/.vs/OpenGL/v17/ipch/AutoPCH/64e5a29d06d8a206/RENDERER.ipch differ diff --git a/.vs/OpenGL/v17/ipch/AutoPCH/ed3850acba3c2a77/INDEXBUFFER.ipch b/.vs/OpenGL/v17/ipch/AutoPCH/ed3850acba3c2a77/INDEXBUFFER.ipch index 3b9755c..f457509 100644 Binary files a/.vs/OpenGL/v17/ipch/AutoPCH/ed3850acba3c2a77/INDEXBUFFER.ipch and b/.vs/OpenGL/v17/ipch/AutoPCH/ed3850acba3c2a77/INDEXBUFFER.ipch differ diff --git a/Debug/OpenGL.exe b/Debug/OpenGL.exe index 4eb0aad..52733be 100644 Binary files a/Debug/OpenGL.exe and b/Debug/OpenGL.exe differ diff --git a/Debug/OpenGL.pdb b/Debug/OpenGL.pdb index 73431ca..b14bf3b 100644 Binary files a/Debug/OpenGL.pdb and b/Debug/OpenGL.pdb differ diff --git a/OpenGL/Debug/Application.obj b/OpenGL/Debug/Application.obj index 77f3621..67fef3c 100644 Binary files a/OpenGL/Debug/Application.obj and b/OpenGL/Debug/Application.obj differ diff --git a/OpenGL/Debug/OpenGL.ilk b/OpenGL/Debug/OpenGL.ilk index a6cd517..815ece4 100644 Binary files a/OpenGL/Debug/OpenGL.ilk and b/OpenGL/Debug/OpenGL.ilk differ diff --git a/OpenGL/Debug/OpenGL.log b/OpenGL/Debug/OpenGL.log index c137235..65f511a 100644 --- a/OpenGL/Debug/OpenGL.log +++ b/OpenGL/Debug/OpenGL.log @@ -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 diff --git a/OpenGL/Debug/OpenGL.tlog/link.read.1.tlog b/OpenGL/Debug/OpenGL.tlog/link.read.1.tlog index d02cc04..2c2fa0c 100644 Binary files a/OpenGL/Debug/OpenGL.tlog/link.read.1.tlog and b/OpenGL/Debug/OpenGL.tlog/link.read.1.tlog differ diff --git a/OpenGL/Debug/OpenGL.tlog/link.write.1.tlog b/OpenGL/Debug/OpenGL.tlog/link.write.1.tlog index 08deab1..d5c7d51 100644 Binary files a/OpenGL/Debug/OpenGL.tlog/link.write.1.tlog and b/OpenGL/Debug/OpenGL.tlog/link.write.1.tlog differ diff --git a/OpenGL/Debug/vc143.idb b/OpenGL/Debug/vc143.idb index 918b66e..31001fd 100644 Binary files a/OpenGL/Debug/vc143.idb and b/OpenGL/Debug/vc143.idb differ diff --git a/OpenGL/Debug/vc143.pdb b/OpenGL/Debug/vc143.pdb index 2f5b7fb..c31e4c2 100644 Binary files a/OpenGL/Debug/vc143.pdb and b/OpenGL/Debug/vc143.pdb differ diff --git a/OpenGL/src/Application.cpp b/OpenGL/src/Application.cpp index fee1537..3a29a94 100644 --- a/OpenGL/src/Application.cpp +++ b/OpenGL/src/Application.cpp @@ -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();