lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105 from keith2018/keith2018-patch-1

Browse Source 
fix shader file names
This commit is contained in:
Joey de Vries
2018-04-12 07:48:49 +02:00
committed by GitHub
parent d0fc384f29 1a70c3efad
commit 79ff6cbb68
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/2.lighting/3.2.materials_exercise1/materials_exercise1.cpp
View File

@@ -77,8 +77,8 @@ int main()
// build and compile our shader zprogram // build and compile our shader zprogram
// ------------------------------------ // ------------------------------------
Shader lightingShader("3.1.materials.vs", "3.1.materials.fs"); Shader lightingShader("3.2.materials.vs", "3.2.materials.fs");
Shader lampShader("3.1.lamp.vs", "3.1.lamp.fs"); Shader lampShader("3.2.lamp.vs", "3.2.lamp.fs");
// set up vertex data (and buffer(s)) and configure vertex attributes // set up vertex data (and buffer(s)) and configure vertex attributes
// ------------------------------------------------------------------ // ------------------------------------------------------------------
@@ -287,4 +287,4 @@ void mouse_callback(GLFWwindow* window, double xpos, double ypos)
void scroll_callback(GLFWwindow* window, double xoffset, double yoffset) void scroll_callback(GLFWwindow* window, double xoffset, double yoffset)
{ {
camera.ProcessMouseScroll(yoffset); camera.ProcessMouseScroll(yoffset);
} }