Jason McKesson avatar Jason McKesson committed 74c4b9b

Correcting some header includes to use Core rather than compatibility.

Comments (0)

Files changed (45)

 glloader/*.sln
 glloader/*.vcproj
 website/*
+glload/*.sln
+glload/*.vcproj

Tut 02 Playing with Colors/FragPosition.cpp

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

Tut 02 Playing with Colors/VertexColors.cpp

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

Tut 03 OpenGLs Moving Triangle/cpuPositionOffset.cpp

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

Tut 03 OpenGLs Moving Triangle/fragChangeColor.cpp

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

Tut 03 OpenGLs Moving Triangle/vertCalcOffset.cpp

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

Tut 03 OpenGLs Moving Triangle/vertPositionOffset.cpp

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

Tut 04 Objects at Rest/AspectRatio.cpp

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

Tut 04 Objects at Rest/MatrixPerspective.cpp

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

Tut 04 Objects at Rest/OrthoCube.cpp

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

Tut 04 Objects at Rest/ShaderPerspective.cpp

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

Tut 05 Objects in Depth/BaseVertexOverlap.cpp

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

Tut 05 Objects in Depth/DepthBuffer.cpp

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

Tut 05 Objects in Depth/DepthClamping.cpp

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

Tut 05 Objects in Depth/DepthFighting.cpp

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

Tut 05 Objects in Depth/OverlapNoDepth.cpp

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

Tut 05 Objects in Depth/VertexClipping.cpp

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

Tut 06 Objects in Motion/Hierarchy.cpp

 #include <vector>
 #include <stack>
 #include <math.h>
-#include <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_3_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_3_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_3_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_3_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_3_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_3_comp.h>
+#include <glload/gl_3_3.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 <glload/gl_3_2_comp.h>
+#include <glload/gl_3_3.h>
 #include <GL/freeglut.h>
 #include "../framework/framework.h"
 #include "../framework/Mesh.h"

framework/UniformBlockArray.h

 #ifndef UNIFORM_BLOCK_ARRAY_H
 #define UNIFORM_BLOCK_ARRAY_H
 
-#include <glload/gl_3_3_comp.h>
+//To use this file, you must include one of the glload headers before including this.
+
 #include <vector>
 
 namespace Framework
 		dofile(filename)
 	end
 end
+
+dofile("framework/framework.lua")
+
+SetupSolution("AllTutorials")
+
+local dirList = os.matchdirs("*");
+
+for i, theDir in ipairs(dirList) do
+    local filename = string.format("%s/tutorials.lua", theDir);
+	if(os.isfile(filename)) then
+		dofile(filename)
+	end
+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.