Commits

Jason McKesson committed b464519

Tutorials now use glload instead of glloader.

Comments (0)

Files changed (50)

Tut 01 Hello Triangle/tut1.cpp

 
 #include <string>
 #include <vector>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 
 

Tut 02 Playing with Colors/FragPosition.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 02 Playing with Colors/VertexColors.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 03 OpenGLs Moving Triangle/cpuPositionOffset.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 03 OpenGLs Moving Triangle/fragChangeColor.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 03 OpenGLs Moving Triangle/vertCalcOffset.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 03 OpenGLs Moving Triangle/vertPositionOffset.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 04 Objects at Rest/AspectRatio.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 04 Objects at Rest/MatrixPerspective.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 04 Objects at Rest/OrthoCube.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 04 Objects at Rest/ShaderPerspective.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 05 Objects in Depth/BaseVertexOverlap.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 05 Objects in Depth/DepthBuffer.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 05 Objects in Depth/DepthClamping.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 05 Objects in Depth/DepthFighting.cpp

 #include <iostream>
 #include <fstream>
 #include <sstream>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 05 Objects in Depth/OverlapNoDepth.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 05 Objects in Depth/VertexClipping.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 

Tut 06 Objects in Motion/Hierarchy.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include <glm/glm.hpp>

Tut 06 Objects in Motion/Rotations.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include <glm/glm.hpp>

Tut 06 Objects in Motion/Scale.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include <glm/glm.hpp>

Tut 06 Objects in Motion/Translation.cpp

 #include <string>
 #include <vector>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include <glm/glm.hpp>

Tut 07 World in Motion/World Scene.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 07 World in Motion/World With UBO.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 08 Getting Oriented/CameraRelative.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 08 Getting Oriented/GimbalLock.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 08 Getting Oriented/Interpolation.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 08 Getting Oriented/QuaternionYPR.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 09 Lights on/Ambient Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 09 Lights on/Basic Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 09 Lights on/Scale and Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 10 Plane Lights/Fragment Attenuation.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 10 Plane Lights/Fragment Point Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 10 Plane Lights/Vertex Point Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 11 Shinies/Blinn vs Phong Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 11 Shinies/Gaussian Specular Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 11 Shinies/Phong Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 12 Dynamic Range/Gamma Correction.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_3_comp.h>
+#include <glload/gl_3_3_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 12 Dynamic Range/HDR Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_3_comp.h>
+#include <glload/gl_3_3_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 12 Dynamic Range/Scene Lighting.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_3_comp.h>
+#include <glload/gl_3_3_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 12 Dynamic Range/Scene.h

 #include <memory>
 #include <string>
 #include <glm/glm.hpp>
-#include <glloader/gl_3_3_comp.h>
+#include <glload/gl_3_3_comp.h>
 #include "../framework/framework.h"
 #include "../framework/MatrixStack.h"
 #include "../framework/Mesh.h"

Tut 13 Impostors/BasicImpostor.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_3_comp.h>
+#include <glload/gl_3_3_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 13 Impostors/GeomImpostor.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_3_comp.h>
+#include <glload/gl_3_3_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 14 Textures Are Not Pictures/Perspective Interpolation.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

Tut 14 Textures Are Not Pictures/tutorials.lua

-SetupProject("Tut 12 Perspective Interpolation", "Perspective Interpolation.cpp",
+SetupProject("Tut 14 Perspective Interpolation", "Perspective Interpolation.cpp",
 	"data/SmoothVertexColors.vert",
 	"data/SmoothVertexColors.frag",
 	"data/NoCorrectVertexColors.vert",

framework/MatrixStack.cpp

 
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include "framework.h"
 #include "MatrixStack.h"
 #include <glm/gtc/matrix_projection.hpp>

framework/Mesh.cpp

 #include <sstream>
 #include <functional>
 #include <algorithm>
-#include <glloader/gl_3_2_comp.h>
-#include <glloader/wgl_exts.h>
-#include <glloader/gle.h>
+#include <glload/gl_3_2_comp.h>
+#include <glload/gll.h>
 #include <GL/freeglut.h>
 #include <tinyxml.h>
 #include "framework.h"

framework/UniformBlockArray.h

 #ifndef UNIFORM_BLOCK_ARRAY_H
 #define UNIFORM_BLOCK_ARRAY_H
 
-#include <glloader/gl_3_3_comp.h>
+#include <glload/gl_3_3_comp.h>
 #include <vector>
 
 namespace Framework

framework/empty.cpp

 these function.
 ***********************************************************************/
 
-#include <glloader/gl_3_2_comp.h>
+#include <glload/gl_3_2_comp.h>
 #include <GL/freeglut.h>
 
 

framework/framework.cpp

 #include <vector>
 #include <fstream>
 #include <sstream>
-#include <glloader/gl_3_2_comp.h>
-#include <glloader/wgl_exts.h>
-#include <glloader/gle.h>
+#include <glload/gl_3_2_comp.h>
+#include <glload/gll.h>
 #include <GL/freeglut.h>
 #include "framework.h"
 
 
 	glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_CONTINUE_EXECUTION);
 
-	gleLoadFunctions();
+	glload::LoadFunctions();
 	init();
 
 // 	glutMouseFunc(MouseButton);

framework/framework.lua

 		targetdir "../framework/lib"
 		objdir "../framework/lib"
 
-		includedirs {"../freeglut-2.6.0/include", "../glloader/include",
+		includedirs {"../freeglut-2.6.0/include", "../glload/include",
 			"../FreeImage/dist", "../glm-0.9.0.7", "../tinyxml", "../framework"}
 		
 		configuration "Debug"
 		files {...}
 --		targetdir "bin"
 
-		includedirs {"../freeglut-2.6.0/include", "../glloader/include",
+		includedirs {"../freeglut-2.6.0/include", "../glload/include",
 			"../FreeImage/dist", "../glm-0.9.0.7", "../tinyxml"}
 			
 		links "framework"
 			flags "Symbols"
 			links "../freeglut-2.6.0/VisualStudio2008Static/debug/freeglut_static"
 			links "../FreeImage/dist/FreeImageD"
-			links "../glloader/lib/glloaderD"
+			links "../glload/lib/glloadD"
 			links "../tinyxml/lib/tinyxml_pmD"
 			targetname(projName .. "D")
 		
 			defines {"RELEASE", "NDEBUG"};
 			links "../freeglut-2.6.0/VisualStudio2008Static/release/freeglut_static"
 			links "../FreeImage/dist/FreeImage"
-			links "../glloader/lib/glloader"
+			links "../glload/lib/glload"
 			links "../tinyxml/lib/tinyxml_pm"
 			targetname(projName)
 end
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.