diff --git a/CHANGELOG.md b/CHANGELOG.md index 9905156f..9337c94a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Revision History -## v ?.?.? - ?? ??? ???? +## v 5.4.0 - 26 Aug 2024 - Updated glm dependency to v1.0.1 - Added half sphere and dome to HUD example - Fixed shader uniform debug output typos diff --git a/csci441.dox.config b/csci441.dox.config index baedbb15..1cbbc497 100644 --- a/csci441.dox.config +++ b/csci441.dox.config @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "CSCI441 OpenGL Library" -PROJECT_NUMBER = 5.3.0 +PROJECT_NUMBER = 5.4.0 PROJECT_BRIEF = "CS@Mines CSCI441 Computer Graphics Course Library" PROJECT_LOGO = OUTPUT_DIRECTORY = diff --git a/docs/_arcball_cam_8hpp.html b/docs/_arcball_cam_8hpp.html index 9bc37a67..9d283224 100644 --- a/docs/_arcball_cam_8hpp.html +++ b/docs/_arcball_cam_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_arcball_cam_8hpp_source.html b/docs/_arcball_cam_8hpp_source.html index c0d8167d..b8056c96 100644 --- a/docs/_arcball_cam_8hpp_source.html +++ b/docs/_arcball_cam_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_c_s_c_i441_8hpp.html b/docs/_c_s_c_i441_8hpp.html index cc86bd04..b6af771b 100644 --- a/docs/_c_s_c_i441_8hpp.html +++ b/docs/_c_s_c_i441_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -89,7 +89,10 @@ #include "ModelLoader.hpp"
#include "objects.hpp"
#include "OpenGL3DEngine.hpp"
+#include "OpenGLEngine.hpp"
#include "OpenGLUtils.hpp"
+#include "OrthographicCamera.hpp"
+#include "PerspectiveCamera.hpp"
#include "ShaderProgram.hpp"
#include "ShaderProgramPipeline.hpp"
#include "ShaderUtils.hpp"
diff --git a/docs/_c_s_c_i441_8hpp_source.html b/docs/_c_s_c_i441_8hpp_source.html index 6bd924a8..269b4368 100644 --- a/docs/_c_s_c_i441_8hpp_source.html +++ b/docs/_c_s_c_i441_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -90,15 +90,18 @@
44#include "ModelLoader.hpp" // to load OBJ, OFF, PLY, STL files
45#include "objects.hpp" // include 3D objects (cube, cylinder, cone, torus, sphere, disk, teapot)
46#include "OpenGL3DEngine.hpp" // to create a concrete 3D Rendering engine
-
47#include "OpenGLUtils.hpp" // to query OpenGL features
-
48#include "ShaderProgram.hpp" // helper class to compile and use shaders
-
49#include "ShaderProgramPipeline.hpp"// helper class to compile and use shader program pipelines
-
50#include "ShaderUtils.hpp" // helper functions to work with shader programs
-
51#include "SimpleShader.hpp" // default shader programs for 2D and 3D applications
-
52#include "TextureUtils.hpp" // helper functions for registering textures
-
53#include "UniformBufferObject.hpp" // helper class to use UBOs
-
54
-
55#endif // CSCI441_CSCI441_HPP
+
47#include "OpenGLEngine.hpp" // to create a concrete Rendering engine
+
48#include "OpenGLUtils.hpp" // to query OpenGL features
+
49#include "OrthographicCamera.hpp" // to create a camera with an orthographic projection
+
50#include "PerspectiveCamera.hpp" // to create a camera with a perspective projection
+
51#include "ShaderProgram.hpp" // helper class to compile and use shaders
+
52#include "ShaderProgramPipeline.hpp"// helper class to compile and use shader program pipelines
+
53#include "ShaderUtils.hpp" // helper functions to work with shader programs
+
54#include "SimpleShader.hpp" // default shader programs for 2D and 3D applications
+
55#include "TextureUtils.hpp" // helper functions for registering textures
+
56#include "UniformBufferObject.hpp" // helper class to use UBOs
+
57
+
58#endif // CSCI441_CSCI441_HPP
ArcballCam.hpp
Concrete Arcball Camera implementation with Perspective Projection.
Camera.hpp
Abstract Camera class to be placed (position and orientation) within our scene.
ComputeShaderProgram.hpp
Class to work with OpenGL Compute Shaders.
@@ -110,6 +113,7 @@
MD5Model.hpp
Doom3 MD5 Model + Animation implementations.
ModelLoader.hpp
Loads OBJ+MTL, OFF, PLY, STL object files into a VAO.
OpenGL3DEngine.hpp
Abstract class engine class to setup a 3D world with an arcball camera, storage for left button state...
+
OpenGLEngine.hpp
Abstract class engine class to setup window, register callbacks, vaos, textures, and shaders,...
OpenGLUtils.hpp
Helper functions to work with OpenGL 3.0+.
ShaderProgram.hpp
Class to work with OpenGL 4.0+ Shaders.
ShaderProgramPipeline.hpp
Class to work with Shader Program Pipelines.
diff --git a/docs/_camera_8hpp.html b/docs/_camera_8hpp.html index 45d0b947..696c2ff0 100644 --- a/docs/_camera_8hpp.html +++ b/docs/_camera_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_camera_8hpp_source.html b/docs/_camera_8hpp_source.html index 1f66053c..7e958eb9 100644 --- a/docs/_camera_8hpp_source.html +++ b/docs/_camera_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_compute_shader_program_8hpp.html b/docs/_compute_shader_program_8hpp.html index 4e23d222..cb9b70a6 100644 --- a/docs/_compute_shader_program_8hpp.html +++ b/docs/_compute_shader_program_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_compute_shader_program_8hpp_source.html b/docs/_compute_shader_program_8hpp_source.html index 87c72d33..76ecf20b 100644 --- a/docs/_compute_shader_program_8hpp_source.html +++ b/docs/_compute_shader_program_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_fixed_cam_8hpp.html b/docs/_fixed_cam_8hpp.html index ecd09065..3c0c7722 100644 --- a/docs/_fixed_cam_8hpp.html +++ b/docs/_fixed_cam_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_fixed_cam_8hpp_source.html b/docs/_fixed_cam_8hpp_source.html index 182b3dfe..0d847a12 100644 --- a/docs/_fixed_cam_8hpp_source.html +++ b/docs/_fixed_cam_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_framebuffer_utils_8hpp.html b/docs/_framebuffer_utils_8hpp.html index 947058a9..1a2ca458 100644 --- a/docs/_framebuffer_utils_8hpp.html +++ b/docs/_framebuffer_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_framebuffer_utils_8hpp_source.html b/docs/_framebuffer_utils_8hpp_source.html index 1d167abe..609be466 100644 --- a/docs/_framebuffer_utils_8hpp_source.html +++ b/docs/_framebuffer_utils_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_free_cam_8hpp.html b/docs/_free_cam_8hpp.html index 94c74a4f..d0e02dbd 100644 --- a/docs/_free_cam_8hpp.html +++ b/docs/_free_cam_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_free_cam_8hpp_source.html b/docs/_free_cam_8hpp_source.html index a8542f36..b344d37e 100644 --- a/docs/_free_cam_8hpp_source.html +++ b/docs/_free_cam_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_h_u_d_camera_8hpp.html b/docs/_h_u_d_camera_8hpp.html index 88b10510..c26ffd42 100644 --- a/docs/_h_u_d_camera_8hpp.html +++ b/docs/_h_u_d_camera_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_h_u_d_camera_8hpp_source.html b/docs/_h_u_d_camera_8hpp_source.html index 8f8bc312..a788f586 100644 --- a/docs/_h_u_d_camera_8hpp_source.html +++ b/docs/_h_u_d_camera_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_m_d5_camera_8hpp.html b/docs/_m_d5_camera_8hpp.html index 61c512a3..2e9cd792 100644 --- a/docs/_m_d5_camera_8hpp.html +++ b/docs/_m_d5_camera_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_m_d5_camera_8hpp_source.html b/docs/_m_d5_camera_8hpp_source.html index b1bcf99f..1d8fd846 100644 --- a/docs/_m_d5_camera_8hpp_source.html +++ b/docs/_m_d5_camera_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -452,7 +452,7 @@
435 // set direction and look at point
436 glm::vec3 defaultCameraDirection(0.0f, 0.0f, -1.0f);
437 glm::vec4 inverseQ(-q.x, -q.y, -q.z, q.w);
-
438 glm::normalize(inverseQ);
+
438 inverseQ = glm::normalize(inverseQ);
439
440 glm::vec4 tmp( (q.w * defaultCameraDirection.x) + (q.y * defaultCameraDirection.z) - (q.z * defaultCameraDirection.y),
441 (q.w * defaultCameraDirection.y) + (q.z * defaultCameraDirection.x) - (q.x * defaultCameraDirection.z),
diff --git a/docs/_m_d5_model_8hpp.html b/docs/_m_d5_model_8hpp.html index ef912630..a66e11f0 100644 --- a/docs/_m_d5_model_8hpp.html +++ b/docs/_m_d5_model_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -72,7 +72,8 @@
Classes | -Namespaces
+Namespaces | +Macros
MD5Model.hpp File Reference
diff --git a/docs/_m_d5_model_8hpp_source.html b/docs/_m_d5_model_8hpp_source.html index 4a257d13..cfe8f4c8 100644 --- a/docs/_m_d5_model_8hpp_source.html +++ b/docs/_m_d5_model_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -121,1012 +121,1014 @@
56#include <glm/exponential.hpp>
57#include <glm/ext/quaternion_common.hpp>
58#include <glm/ext/quaternion_float.hpp>
-
59#include <glm/gtx/quaternion.hpp>
-
60
-
61#include <cassert>
-
62#include <cmath>
-
63#include <cstdio>
-
64#include <cstdlib>
-
65#include <cstring>
-
66
-
67namespace CSCI441 {
+
59
+
60#define GLM_ENABLE_EXPERIMENTAL
+
61#include <glm/gtx/quaternion.hpp>
+
62
+
63#include <cassert>
+
64#include <cmath>
+
65#include <cstdio>
+
66#include <cstdlib>
+
67#include <cstring>
68
-
73 class [[maybe_unused]] MD5Model {
-
74 protected:
-
75 // md5mesh types
-
79 struct MD5Joint {
-
83 static const GLint NULL_JOINT = -1;
-
87 char name[256] = "";
-
91 GLint parent = NULL_JOINT;
-
95 glm::vec3 position = {0.0f, 0.0f, 0.0f};
-
99 glm::quat orientation = {0.0f, 0.0f, 0.0f, 0.0f};
-
100 };
-
101
-
105 struct MD5Vertex {
-
109 glm::vec2 texCoord = {0.0f, 0.0f};
-
113 GLint start = 0;
-
117 GLint count = 0;
-
118 };
-
119
-
123 struct MD5Triangle {
-
127 GLint index[3] = {0};
-
128 };
-
129
-
133 struct MD5Weight {
-
137 GLint joint = MD5Joint::NULL_JOINT;
-
141 GLfloat bias = 0.f;
-
145 glm::vec3 position = {0.0f, 0.0f, 0.0f};
-
146 };
-
147
-
151 struct MD5Texture {
-
155 GLuint texHandle = 0;
-
159 char filename[512] = "";
-
160 };
-
161
-
165 struct MD5Mesh {
-
169 MD5Vertex *vertices = nullptr;
-
173 MD5Triangle *triangles = nullptr;
-
177 MD5Weight *weights = nullptr;
-
181 MD5Texture textures[4];
-
185 enum TextureMap {
-
189 DIFFUSE,
-
193 SPECULAR,
-
197 NORMAL,
-
201 HEIGHT
-
202 };
-
203
-
207 GLint numVertices = 0;
-
211 GLint numTriangles = 0;
-
215 GLint numWeights = 0;
-
216
-
220 char shader[512] = "";
-
221 };
-
222
-
223 // md5anim types
-
227 struct MD5JointInfo {
-
231 char name[256] = "";
-
235 GLint parent = MD5Joint::NULL_JOINT;
-
239 GLuint flags = 0;
-
243 GLint startIndex = 0;
-
244 };
-
245
-
249 struct MD5BaseFrameJoint {
-
253 glm::vec3 position = {0.0f, 0.0f, 0.0f};
-
257 glm::quat orientation = {0.0f, 0.0f, 0.0f, 0.0f};
-
258 };
-
259
-
264 struct MD5BoundingBox {
-
268 glm::vec3 min = {0.0f, 0.0f, 0.0f};
-
272 glm::vec3 max = {0.0f, 0.0f, 0.0f};
-
273 };
-
274
-
278 struct MD5Animation {
-
282 GLint numFrames = 0;
-
287 GLint numJoints = 0;
-
292 GLint frameRate = 0;
-
293
-
297 MD5Joint **skeletonFrames = nullptr;
-
301 MD5BoundingBox *boundingBoxes = nullptr;
-
302 };
-
303
-
307 struct MD5AnimationState {
-
311 GLint currFrame = 0;
-
315 GLint nextFrame = 0;
-
316
-
320 GLfloat lastTime = 0.0f;
-
325 GLfloat maxTime = 0.0f;
-
326 };
-
327
-
328 public:
-
333 MD5Model();
-
337 ~MD5Model();
-
338
-
342 MD5Model(const MD5Model&) = delete;
-
346 MD5Model& operator=(const MD5Model&) = delete;
-
347
-
354 [[maybe_unused]] bool loadMD5Model(const char* MD5_MESH_FILE, const char* MD5_ANIM_FILE = "");
-
355
-
360 [[nodiscard]] bool isAnimated() const { return _isAnimated; }
-
361
-
362 // md5mesh prototypes
-
368 [[nodiscard]] bool readMD5Model(const char* FILENAME);
-
377 [[maybe_unused]]void allocVertexArrays(GLuint vPosAttribLoc, GLuint vColorAttribLoc, GLuint vTexCoordAttribLoc);
-
381 [[maybe_unused]] void draw() const;
-
385 [[maybe_unused]] void drawSkeleton() const;
-
386
-
387 // md5anim prototypes
-
393 [[nodiscard]] bool readMD5Anim(const char* filename);
-
398 void animate(GLfloat dt);
-
399
-
400 private:
-
401 MD5Joint* _baseSkeleton;
-
402 MD5Mesh* _meshes;
-
403
-
404 GLint _numJoints;
-
405 GLint _numMeshes;
-
406
-
407 // vertex array related stuff
-
408 GLint _maxVertices;
-
409 GLint _maxTriangles;
-
410
-
411 glm::vec3* _vertexArray;
-
412 glm::vec2* _texelArray;
-
413 GLuint* _vertexIndicesArray;
-
414
-
415 GLuint _vao;
-
416 GLuint _vbo[2];
-
417
-
418 GLuint _skeletonVAO;
-
419 GLuint _skeletonVBO;
-
420
-
424 MD5Joint* _skeleton;
-
428 MD5Animation _animation;
-
432 bool _isAnimated;
-
436 MD5AnimationState _animationInfo;
-
437
-
438 void _prepareMesh(const MD5Mesh* pMESH) const;
-
439 void _drawMesh(const MD5Mesh* pMESH) const;
-
440 [[nodiscard]] bool _checkAnimValidity() const;
-
441 static void _buildFrameSkeleton(const MD5JointInfo* pJOINT_INFOS,
-
442 const MD5BaseFrameJoint* pBASE_FRAME,
-
443 const GLfloat* pANIM_FRAME_DATA,
-
444 MD5Joint* pSkeletonFrame,
-
445 GLint NUM_JOINTS);
-
446 void _interpolateSkeletons(GLfloat interp);
-
447 void _freeModel();
-
448 void _freeVertexArrays();
-
449 void _freeAnim();
-
450 };
-
451}
-
452
-
453//----------------------------------------------------------------------------------------------------
+
69namespace CSCI441 {
+
70
+
75 class [[maybe_unused]] MD5Model {
+
76 protected:
+
77 // md5mesh types
+
81 struct MD5Joint {
+
85 static const GLint NULL_JOINT = -1;
+
89 char name[256] = "";
+
93 GLint parent = NULL_JOINT;
+
97 glm::vec3 position = {0.0f, 0.0f, 0.0f};
+
101 glm::quat orientation = {0.0f, 0.0f, 0.0f, 0.0f};
+
102 };
+
103
+
107 struct MD5Vertex {
+
111 glm::vec2 texCoord = {0.0f, 0.0f};
+
115 GLint start = 0;
+
119 GLint count = 0;
+
120 };
+
121
+
125 struct MD5Triangle {
+
129 GLint index[3] = {0};
+
130 };
+
131
+
135 struct MD5Weight {
+
139 GLint joint = MD5Joint::NULL_JOINT;
+
143 GLfloat bias = 0.f;
+
147 glm::vec3 position = {0.0f, 0.0f, 0.0f};
+
148 };
+
149
+
153 struct MD5Texture {
+
157 GLuint texHandle = 0;
+
161 char filename[512] = "";
+
162 };
+
163
+
167 struct MD5Mesh {
+
171 MD5Vertex *vertices = nullptr;
+
175 MD5Triangle *triangles = nullptr;
+
179 MD5Weight *weights = nullptr;
+
183 MD5Texture textures[4];
+
187 enum TextureMap {
+
191 DIFFUSE,
+
195 SPECULAR,
+
199 NORMAL,
+
203 HEIGHT
+
204 };
+
205
+
209 GLint numVertices = 0;
+
213 GLint numTriangles = 0;
+
217 GLint numWeights = 0;
+
218
+
222 char shader[512] = "";
+
223 };
+
224
+
225 // md5anim types
+
229 struct MD5JointInfo {
+
233 char name[256] = "";
+
237 GLint parent = MD5Joint::NULL_JOINT;
+
241 GLuint flags = 0;
+
245 GLint startIndex = 0;
+
246 };
+
247
+
251 struct MD5BaseFrameJoint {
+
255 glm::vec3 position = {0.0f, 0.0f, 0.0f};
+
259 glm::quat orientation = {0.0f, 0.0f, 0.0f, 0.0f};
+
260 };
+
261
+
266 struct MD5BoundingBox {
+
270 glm::vec3 min = {0.0f, 0.0f, 0.0f};
+
274 glm::vec3 max = {0.0f, 0.0f, 0.0f};
+
275 };
+
276
+
280 struct MD5Animation {
+
284 GLint numFrames = 0;
+
289 GLint numJoints = 0;
+
294 GLint frameRate = 0;
+
295
+
299 MD5Joint **skeletonFrames = nullptr;
+
303 MD5BoundingBox *boundingBoxes = nullptr;
+
304 };
+
305
+
309 struct MD5AnimationState {
+
313 GLint currFrame = 0;
+
317 GLint nextFrame = 0;
+
318
+
322 GLfloat lastTime = 0.0f;
+
327 GLfloat maxTime = 0.0f;
+
328 };
+
329
+
330 public:
+
335 MD5Model();
+
339 ~MD5Model();
+
340
+
344 MD5Model(const MD5Model&) = delete;
+
348 MD5Model& operator=(const MD5Model&) = delete;
+
349
+
356 [[maybe_unused]] bool loadMD5Model(const char* MD5_MESH_FILE, const char* MD5_ANIM_FILE = "");
+
357
+
362 [[nodiscard]] bool isAnimated() const { return _isAnimated; }
+
363
+
364 // md5mesh prototypes
+
370 [[nodiscard]] bool readMD5Model(const char* FILENAME);
+
379 [[maybe_unused]]void allocVertexArrays(GLuint vPosAttribLoc, GLuint vColorAttribLoc, GLuint vTexCoordAttribLoc);
+
383 [[maybe_unused]] void draw() const;
+
387 [[maybe_unused]] void drawSkeleton() const;
+
388
+
389 // md5anim prototypes
+
395 [[nodiscard]] bool readMD5Anim(const char* filename);
+
400 void animate(GLfloat dt);
+
401
+
402 private:
+
403 MD5Joint* _baseSkeleton;
+
404 MD5Mesh* _meshes;
+
405
+
406 GLint _numJoints;
+
407 GLint _numMeshes;
+
408
+
409 // vertex array related stuff
+
410 GLint _maxVertices;
+
411 GLint _maxTriangles;
+
412
+
413 glm::vec3* _vertexArray;
+
414 glm::vec2* _texelArray;
+
415 GLuint* _vertexIndicesArray;
+
416
+
417 GLuint _vao;
+
418 GLuint _vbo[2];
+
419
+
420 GLuint _skeletonVAO;
+
421 GLuint _skeletonVBO;
+
422
+
426 MD5Joint* _skeleton;
+
430 MD5Animation _animation;
+
434 bool _isAnimated;
+
438 MD5AnimationState _animationInfo;
+
439
+
440 void _prepareMesh(const MD5Mesh* pMESH) const;
+
441 void _drawMesh(const MD5Mesh* pMESH) const;
+
442 [[nodiscard]] bool _checkAnimValidity() const;
+
443 static void _buildFrameSkeleton(const MD5JointInfo* pJOINT_INFOS,
+
444 const MD5BaseFrameJoint* pBASE_FRAME,
+
445 const GLfloat* pANIM_FRAME_DATA,
+
446 MD5Joint* pSkeletonFrame,
+
447 GLint NUM_JOINTS);
+
448 void _interpolateSkeletons(GLfloat interp);
+
449 void _freeModel();
+
450 void _freeVertexArrays();
+
451 void _freeAnim();
+
452 };
+
453}
454
-
455inline CSCI441::MD5Model::MD5Model()
-
456{
-
457 _baseSkeleton = nullptr;
-
458 _meshes = nullptr;
-
459 _numJoints = 0;
-
460 _numMeshes = 0;
-
461 _maxVertices = 0;
-
462 _maxTriangles = 0;
-
463 _vertexArray = nullptr;
-
464 _texelArray = nullptr;
-
465 _vertexIndicesArray = nullptr;
-
466 _vao = 0;
-
467 _vbo[0] = 0;
-
468 _vbo[1] = 0;
-
469 _skeletonVAO = 0;
-
470 _skeletonVBO = 0;
-
471 _animation = MD5Animation();
-
472 _skeleton = nullptr;
-
473 _animationInfo = MD5AnimationState();
-
474 _isAnimated = false;
-
475}
-
476
-
477inline CSCI441::MD5Model::~MD5Model()
-
478{
-
479 _freeVertexArrays();
-
480 _freeAnim();
-
481 _freeModel();
-
482}
-
483
-
484// load our MD5 model
-
485[[maybe_unused]]
-
486inline bool
-
487CSCI441::MD5Model::loadMD5Model(
-
488 const char* MD5_MESH_FILE,
-
489 const char* MD5_ANIM_FILE
-
490) {
-
491 // Load MD5 _model file
-
492 if( readMD5Model(MD5_MESH_FILE) ) {
-
493 // if MD5 animation file name provided
-
494 if(strcmp(MD5_ANIM_FILE, "") != 0 ) {
-
495 // Load MD5 animation file
-
496 if( !readMD5Anim(MD5_ANIM_FILE) ) {
-
497 return false;
-
498 }
-
499 }
-
500 if( !isAnimated() ) {
-
501 printf ("[.MD5_ANIM_FILE]: no animation loaded.\n");
-
502 }
-
503 } else {
-
504 return false;
-
505 }
-
506 return true;
-
507}
-
508
-
509// Load an MD5 model from file.
-
510inline bool
-
511CSCI441::MD5Model::readMD5Model(
-
512 const char* FILENAME
-
513) {
-
514 FILE *fp;
-
515 char buff[512];
-
516 GLint version;
-
517 GLint currentMesh = 0;
-
518 GLint i;
-
519 unsigned long uli;
-
520
-
521 GLint totalVertices = 0;
-
522 GLint totalWeights = 0;
-
523 GLint totalTriangles = 0;
-
524
-
525 GLfloat minX = 999999, minY = 999999, minZ = 999999;
-
526 GLfloat maxX = -999999, maxY = -999999, maxZ = -999999;
-
527
-
528 printf("[.md5mesh]: about to read %s\n", FILENAME );
+
455//----------------------------------------------------------------------------------------------------
+
456
+
457inline CSCI441::MD5Model::MD5Model()
+
458{
+
459 _baseSkeleton = nullptr;
+
460 _meshes = nullptr;
+
461 _numJoints = 0;
+
462 _numMeshes = 0;
+
463 _maxVertices = 0;
+
464 _maxTriangles = 0;
+
465 _vertexArray = nullptr;
+
466 _texelArray = nullptr;
+
467 _vertexIndicesArray = nullptr;
+
468 _vao = 0;
+
469 _vbo[0] = 0;
+
470 _vbo[1] = 0;
+
471 _skeletonVAO = 0;
+
472 _skeletonVBO = 0;
+
473 _animation = MD5Animation();
+
474 _skeleton = nullptr;
+
475 _animationInfo = MD5AnimationState();
+
476 _isAnimated = false;
+
477}
+
478
+
479inline CSCI441::MD5Model::~MD5Model()
+
480{
+
481 _freeVertexArrays();
+
482 _freeAnim();
+
483 _freeModel();
+
484}
+
485
+
486// load our MD5 model
+
487[[maybe_unused]]
+
488inline bool
+
489CSCI441::MD5Model::loadMD5Model(
+
490 const char* MD5_MESH_FILE,
+
491 const char* MD5_ANIM_FILE
+
492) {
+
493 // Load MD5 _model file
+
494 if( readMD5Model(MD5_MESH_FILE) ) {
+
495 // if MD5 animation file name provided
+
496 if(strcmp(MD5_ANIM_FILE, "") != 0 ) {
+
497 // Load MD5 animation file
+
498 if( !readMD5Anim(MD5_ANIM_FILE) ) {
+
499 return false;
+
500 }
+
501 }
+
502 if( !isAnimated() ) {
+
503 printf ("[.MD5_ANIM_FILE]: no animation loaded.\n");
+
504 }
+
505 } else {
+
506 return false;
+
507 }
+
508 return true;
+
509}
+
510
+
511// Load an MD5 model from file.
+
512inline bool
+
513CSCI441::MD5Model::readMD5Model(
+
514 const char* FILENAME
+
515) {
+
516 FILE *fp;
+
517 char buff[512];
+
518 GLint version;
+
519 GLint currentMesh = 0;
+
520 GLint i;
+
521 unsigned long uli;
+
522
+
523 GLint totalVertices = 0;
+
524 GLint totalWeights = 0;
+
525 GLint totalTriangles = 0;
+
526
+
527 GLfloat minX = 999999, minY = 999999, minZ = 999999;
+
528 GLfloat maxX = -999999, maxY = -999999, maxZ = -999999;
529
-
530 fp = fopen(FILENAME, "rb" );
-
531 if( !fp ) {
-
532 fprintf (stderr, "[.md5mesh]: Error: couldn't open \"%s\"!\n", FILENAME);
-
533 return false;
-
534 }
-
535
-
536 while( !feof(fp) ) {
-
537 // Read whole line
-
538 fgets( buff, sizeof(buff), fp );
-
539
-
540 if( sscanf(buff, " MD5Version %d", &version) == 1 ) {
-
541 if( version != 10 ) {
-
542 // Bad version
-
543 fprintf (stderr, "[.md5mesh]: Error: bad model version\n");
-
544 fclose (fp);
-
545 return false;
-
546 }
-
547 } else if( sscanf(buff, " numJoints %d", &_numJoints) == 1 ) {
-
548 if( _numJoints > 0 ) {
-
549 // Allocate memory for base skeleton joints
-
550 _baseSkeleton = new MD5Joint[_numJoints];
-
551 }
-
552 } else if( sscanf(buff, " numMeshes %d", &_numMeshes) == 1 ) {
-
553 if( _numMeshes > 0 ) {
-
554 // Allocate memory for meshes
-
555 _meshes = new MD5Mesh[_numMeshes];
-
556 }
-
557 } else if( strncmp(buff, "joints {", 8) == 0 ) {
-
558 // Read each joint
-
559 for(i = 0; i < _numJoints; ++i) {
-
560 MD5Joint *joint = &_baseSkeleton[i];
-
561
-
562 // Read whole line
-
563 fgets( buff, sizeof(buff), fp );
-
564
-
565 if( sscanf(buff, "%s %d ( %f %f %f ) ( %f %f %f )",
-
566 joint->name, &joint->parent,
-
567 &joint->position[0], &joint->position[1], &joint->position[2],
-
568 &joint->orientation[0],&joint->orientation[1], &joint->orientation[2]) == 8
-
569 ) {
-
570 // Compute the w component
-
571 joint->orientation.w = glm::extractRealComponent(joint->orientation);
-
572 }
-
573 }
-
574 } else if( strncmp(buff, "mesh {", 6) == 0 ) {
-
575 MD5Mesh *mesh = &_meshes[currentMesh];
-
576 GLint vert_index = 0;
-
577 GLint tri_index = 0;
-
578 GLint weight_index = 0;
-
579 GLfloat fdata[4];
-
580 GLint idata[3];
-
581
-
582 while( buff[0] != '}' && !feof(fp) ) {
-
583 // Read whole line
-
584 fgets( buff, sizeof(buff), fp );
-
585
-
586 if( strstr( buff, "shader ") ) {
-
587 GLint quote = 0, j = 0;
-
588
-
589 // Copy the shader name without the quote marks
-
590 for(uli = 0; uli < sizeof(buff) && (quote < 2); ++uli) {
-
591 if( buff[uli] == '\"' )
-
592 quote++;
-
593
-
594 if( (quote == 1) && (buff[uli] != '\"') ) {
-
595 mesh->shader[j] = buff[uli];
-
596 j++;
-
597 }
-
598 }
-
599 // there was a shader name
-
600 if( j > 0 ) {
-
601 // diffuse map
-
602 strcpy(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, mesh->shader);
-
603 strcat(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, ".tga");
-
604 mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
605 if( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle == 0 ) {
-
606 strcpy(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, mesh->shader);
-
607 strcat(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, "_d.tga");
-
608 mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
609 if( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle == 0 ) {
-
610 strcpy(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, mesh->shader);
-
611 strcat(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, ".png");
-
612 mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
613 }
-
614 }
-
615
-
616 // specular map
-
617 strcpy(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, mesh->shader);
-
618 strcat(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, "_s.tga");
-
619 mesh->textures[MD5Mesh::TextureMap::SPECULAR].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
620 if( mesh->textures[MD5Mesh::TextureMap::SPECULAR].texHandle == 0 ) {
-
621 strcpy(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, mesh->shader);
-
622 strcat(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, "_s.png");
-
623 mesh->textures[MD5Mesh::TextureMap::SPECULAR].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
624 }
-
625
-
626 // normal map
-
627 strcpy(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, mesh->shader);
-
628 strcat(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, "_local.tga");
-
629 mesh->textures[MD5Mesh::TextureMap::NORMAL].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
630 if( mesh->textures[MD5Mesh::TextureMap::NORMAL].texHandle == 0 ) {
-
631 strcpy(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, mesh->shader);
-
632 strcat(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, "_local.png");
-
633 mesh->textures[MD5Mesh::TextureMap::NORMAL].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
634 }
-
635
-
636 // height map
-
637 strcpy(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, mesh->shader);
-
638 strcat(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, "_h.tga");
-
639 mesh->textures[MD5Mesh::TextureMap::HEIGHT].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
640 if( mesh->textures[MD5Mesh::TextureMap::HEIGHT].texHandle == 0 ) {
-
641 strcpy(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, mesh->shader);
-
642 strcat(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, "_h.png");
-
643 mesh->textures[MD5Mesh::TextureMap::HEIGHT].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
-
644 }
-
645 }
-
646 } else if( sscanf(buff, " numverts %d", &mesh->numVertices) == 1 ) {
-
647 if( mesh->numVertices > 0 ) {
-
648 // Allocate memory for vertices
-
649 mesh->vertices = new MD5Vertex[mesh->numVertices];
-
650 }
-
651
-
652 if( mesh->numVertices > _maxVertices )
-
653 _maxVertices = mesh->numVertices;
-
654
-
655 totalVertices += mesh->numVertices;
-
656 } else if( sscanf(buff, " numtris %d", &mesh->numTriangles) == 1 ) {
-
657 if( mesh->numTriangles > 0 ) {
-
658 // Allocate memory for triangles
-
659 mesh->triangles = new MD5Triangle[mesh->numTriangles];
-
660 }
-
661
-
662 if( mesh->numTriangles > _maxTriangles )
-
663 _maxTriangles = mesh->numTriangles;
-
664
-
665 totalTriangles += mesh->numTriangles;
-
666 } else if( sscanf(buff, " numweights %d", &mesh->numWeights) == 1 ) {
-
667 if( mesh->numWeights > 0 ) {
-
668 // Allocate memory for vertex weights
-
669 mesh->weights = new MD5Weight[mesh->numWeights];
-
670 }
-
671
-
672 totalWeights += mesh->numWeights;
-
673 } else if( sscanf(buff, " vert %d ( %f %f ) %d %d",
-
674 &vert_index,
-
675 &fdata[0], &fdata[1],
-
676 &idata[0], &idata[1]) == 5
-
677 ) {
-
678 // Copy vertex data
-
679 mesh->vertices[vert_index].texCoord.s = fdata[0];
-
680 mesh->vertices[vert_index].texCoord.t = fdata[1];
-
681 mesh->vertices[vert_index].start = idata[0];
-
682 mesh->vertices[vert_index].count = idata[1];
-
683 } else if( sscanf(buff, " tri %d %d %d %d",
-
684 &tri_index,
-
685 &idata[0], &idata[1], &idata[2]) == 4
-
686 ) {
-
687 // Copy triangle data
-
688 mesh->triangles[tri_index ].index[0] = idata[0];
-
689 mesh->triangles[tri_index ].index[1] = idata[1];
-
690 mesh->triangles[tri_index ].index[2] = idata[2];
-
691 } else if( sscanf(buff, " weight %d %d %f ( %f %f %f )",
-
692 &weight_index, &idata[0], &fdata[3],
-
693 &fdata[0], &fdata[1], &fdata[2]) == 6
-
694 ) {
-
695 // Copy vertex data
-
696 mesh->weights[weight_index].joint = idata[0];
-
697 mesh->weights[weight_index].bias = fdata[3];
-
698 mesh->weights[weight_index].position[0] = fdata[0];
-
699 mesh->weights[weight_index].position[1] = fdata[1];
-
700 mesh->weights[weight_index].position[2] = fdata[2];
-
701
-
702 if( fdata[0] < minX ) { minX = fdata[0]; }
-
703 if( fdata[0] > maxX ) { maxX = fdata[0]; }
-
704 if( fdata[1] < minY ) { minY = fdata[1]; }
-
705 if( fdata[1] > maxY ) { maxY = fdata[1]; }
-
706 if( fdata[2] < minZ ) { minZ = fdata[2]; }
-
707 if( fdata[2] > maxZ ) { maxZ = fdata[2]; }
-
708 }
-
709 }
-
710
-
711 currentMesh++;
-
712 }
-
713 }
-
714
-
715 fclose(fp);
+
530 printf("[.md5mesh]: about to read %s\n", FILENAME );
+
531
+
532 fp = fopen(FILENAME, "rb" );
+
533 if( !fp ) {
+
534 fprintf (stderr, "[.md5mesh]: Error: couldn't open \"%s\"!\n", FILENAME);
+
535 return false;
+
536 }
+
537
+
538 while( !feof(fp) ) {
+
539 // Read whole line
+
540 fgets( buff, sizeof(buff), fp );
+
541
+
542 if( sscanf(buff, " MD5Version %d", &version) == 1 ) {
+
543 if( version != 10 ) {
+
544 // Bad version
+
545 fprintf (stderr, "[.md5mesh]: Error: bad model version\n");
+
546 fclose (fp);
+
547 return false;
+
548 }
+
549 } else if( sscanf(buff, " numJoints %d", &_numJoints) == 1 ) {
+
550 if( _numJoints > 0 ) {
+
551 // Allocate memory for base skeleton joints
+
552 _baseSkeleton = new MD5Joint[_numJoints];
+
553 }
+
554 } else if( sscanf(buff, " numMeshes %d", &_numMeshes) == 1 ) {
+
555 if( _numMeshes > 0 ) {
+
556 // Allocate memory for meshes
+
557 _meshes = new MD5Mesh[_numMeshes];
+
558 }
+
559 } else if( strncmp(buff, "joints {", 8) == 0 ) {
+
560 // Read each joint
+
561 for(i = 0; i < _numJoints; ++i) {
+
562 MD5Joint *joint = &_baseSkeleton[i];
+
563
+
564 // Read whole line
+
565 fgets( buff, sizeof(buff), fp );
+
566
+
567 if( sscanf(buff, "%s %d ( %f %f %f ) ( %f %f %f )",
+
568 joint->name, &joint->parent,
+
569 &joint->position[0], &joint->position[1], &joint->position[2],
+
570 &joint->orientation[0],&joint->orientation[1], &joint->orientation[2]) == 8
+
571 ) {
+
572 // Compute the w component
+
573 joint->orientation.w = glm::extractRealComponent(joint->orientation);
+
574 }
+
575 }
+
576 } else if( strncmp(buff, "mesh {", 6) == 0 ) {
+
577 MD5Mesh *mesh = &_meshes[currentMesh];
+
578 GLint vert_index = 0;
+
579 GLint tri_index = 0;
+
580 GLint weight_index = 0;
+
581 GLfloat fdata[4];
+
582 GLint idata[3];
+
583
+
584 while( buff[0] != '}' && !feof(fp) ) {
+
585 // Read whole line
+
586 fgets( buff, sizeof(buff), fp );
+
587
+
588 if( strstr( buff, "shader ") ) {
+
589 GLint quote = 0, j = 0;
+
590
+
591 // Copy the shader name without the quote marks
+
592 for(uli = 0; uli < sizeof(buff) && (quote < 2); ++uli) {
+
593 if( buff[uli] == '\"' )
+
594 quote++;
+
595
+
596 if( (quote == 1) && (buff[uli] != '\"') ) {
+
597 mesh->shader[j] = buff[uli];
+
598 j++;
+
599 }
+
600 }
+
601 // there was a shader name
+
602 if( j > 0 ) {
+
603 // diffuse map
+
604 strcpy(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, mesh->shader);
+
605 strcat(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, ".tga");
+
606 mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
607 if( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle == 0 ) {
+
608 strcpy(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, mesh->shader);
+
609 strcat(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, "_d.tga");
+
610 mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
611 if( mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle == 0 ) {
+
612 strcpy(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, mesh->shader);
+
613 strcat(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, ".png");
+
614 mesh->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture(mesh->textures[MD5Mesh::TextureMap::DIFFUSE].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
615 }
+
616 }
+
617
+
618 // specular map
+
619 strcpy(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, mesh->shader);
+
620 strcat(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, "_s.tga");
+
621 mesh->textures[MD5Mesh::TextureMap::SPECULAR].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
622 if( mesh->textures[MD5Mesh::TextureMap::SPECULAR].texHandle == 0 ) {
+
623 strcpy(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, mesh->shader);
+
624 strcat(mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, "_s.png");
+
625 mesh->textures[MD5Mesh::TextureMap::SPECULAR].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::SPECULAR].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
626 }
+
627
+
628 // normal map
+
629 strcpy(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, mesh->shader);
+
630 strcat(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, "_local.tga");
+
631 mesh->textures[MD5Mesh::TextureMap::NORMAL].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
632 if( mesh->textures[MD5Mesh::TextureMap::NORMAL].texHandle == 0 ) {
+
633 strcpy(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, mesh->shader);
+
634 strcat(mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, "_local.png");
+
635 mesh->textures[MD5Mesh::TextureMap::NORMAL].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::NORMAL].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
636 }
+
637
+
638 // height map
+
639 strcpy(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, mesh->shader);
+
640 strcat(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, "_h.tga");
+
641 mesh->textures[MD5Mesh::TextureMap::HEIGHT].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
642 if( mesh->textures[MD5Mesh::TextureMap::HEIGHT].texHandle == 0 ) {
+
643 strcpy(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, mesh->shader);
+
644 strcat(mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, "_h.png");
+
645 mesh->textures[MD5Mesh::TextureMap::HEIGHT].texHandle = CSCI441::TextureUtils::loadAndRegisterTexture( mesh->textures[MD5Mesh::TextureMap::HEIGHT].filename, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, GL_REPEAT, GL_REPEAT, false );
+
646 }
+
647 }
+
648 } else if( sscanf(buff, " numverts %d", &mesh->numVertices) == 1 ) {
+
649 if( mesh->numVertices > 0 ) {
+
650 // Allocate memory for vertices
+
651 mesh->vertices = new MD5Vertex[mesh->numVertices];
+
652 }
+
653
+
654 if( mesh->numVertices > _maxVertices )
+
655 _maxVertices = mesh->numVertices;
+
656
+
657 totalVertices += mesh->numVertices;
+
658 } else if( sscanf(buff, " numtris %d", &mesh->numTriangles) == 1 ) {
+
659 if( mesh->numTriangles > 0 ) {
+
660 // Allocate memory for triangles
+
661 mesh->triangles = new MD5Triangle[mesh->numTriangles];
+
662 }
+
663
+
664 if( mesh->numTriangles > _maxTriangles )
+
665 _maxTriangles = mesh->numTriangles;
+
666
+
667 totalTriangles += mesh->numTriangles;
+
668 } else if( sscanf(buff, " numweights %d", &mesh->numWeights) == 1 ) {
+
669 if( mesh->numWeights > 0 ) {
+
670 // Allocate memory for vertex weights
+
671 mesh->weights = new MD5Weight[mesh->numWeights];
+
672 }
+
673
+
674 totalWeights += mesh->numWeights;
+
675 } else if( sscanf(buff, " vert %d ( %f %f ) %d %d",
+
676 &vert_index,
+
677 &fdata[0], &fdata[1],
+
678 &idata[0], &idata[1]) == 5
+
679 ) {
+
680 // Copy vertex data
+
681 mesh->vertices[vert_index].texCoord.s = fdata[0];
+
682 mesh->vertices[vert_index].texCoord.t = fdata[1];
+
683 mesh->vertices[vert_index].start = idata[0];
+
684 mesh->vertices[vert_index].count = idata[1];
+
685 } else if( sscanf(buff, " tri %d %d %d %d",
+
686 &tri_index,
+
687 &idata[0], &idata[1], &idata[2]) == 4
+
688 ) {
+
689 // Copy triangle data
+
690 mesh->triangles[tri_index ].index[0] = idata[0];
+
691 mesh->triangles[tri_index ].index[1] = idata[1];
+
692 mesh->triangles[tri_index ].index[2] = idata[2];
+
693 } else if( sscanf(buff, " weight %d %d %f ( %f %f %f )",
+
694 &weight_index, &idata[0], &fdata[3],
+
695 &fdata[0], &fdata[1], &fdata[2]) == 6
+
696 ) {
+
697 // Copy vertex data
+
698 mesh->weights[weight_index].joint = idata[0];
+
699 mesh->weights[weight_index].bias = fdata[3];
+
700 mesh->weights[weight_index].position[0] = fdata[0];
+
701 mesh->weights[weight_index].position[1] = fdata[1];
+
702 mesh->weights[weight_index].position[2] = fdata[2];
+
703
+
704 if( fdata[0] < minX ) { minX = fdata[0]; }
+
705 if( fdata[0] > maxX ) { maxX = fdata[0]; }
+
706 if( fdata[1] < minY ) { minY = fdata[1]; }
+
707 if( fdata[1] > maxY ) { maxY = fdata[1]; }
+
708 if( fdata[2] < minZ ) { minZ = fdata[2]; }
+
709 if( fdata[2] > maxZ ) { maxZ = fdata[2]; }
+
710 }
+
711 }
+
712
+
713 currentMesh++;
+
714 }
+
715 }
716
-
717 _skeleton = _baseSkeleton;
+
717 fclose(fp);
718
-
719 printf("[.md5mesh]: finished reading %s\n", FILENAME );
-
720 printf("[.md5mesh]: read in %d meshes, %d joints, %d vertices, %d weights, and %d triangles\n", _numMeshes, _numJoints, totalVertices, totalWeights, totalTriangles );
-
721 printf( "[.md5mesh]: base pose %f units across in X, %f units across in Y, %f units across in Z\n", (maxX - minX), (maxY-minY), (maxZ - minZ) );
-
722 printf( "\n" );
-
723
-
724 return true;
-
725}
-
726
-
727//Free resources allocated for the model.
-
728inline void
-
729CSCI441::MD5Model::_freeModel()
-
730{
-
731 delete _baseSkeleton;
-
732 _baseSkeleton = nullptr;
-
733
-
734 // Free mesh data
-
735 for(GLint i = 0; i < _numMeshes; ++i) {
-
736 delete _meshes[i].vertices;
-
737 _meshes[i].vertices = nullptr;
-
738
-
739 delete _meshes[i].triangles;
-
740 _meshes[i].triangles = nullptr;
-
741
-
742 delete _meshes[i].weights;
-
743 _meshes[i].weights = nullptr;
-
744 }
-
745
-
746 delete _meshes;
-
747 _meshes = nullptr;
-
748}
-
749
-
750[[maybe_unused]]
-
751inline void
-
752CSCI441::MD5Model::draw() const
-
753{
-
754 // Draw each mesh of the model
-
755 for(GLint i = 0; i < _numMeshes; ++i) {
-
756 MD5Mesh mesh = _meshes[i]; // get the mesh
-
757 _prepareMesh(&mesh); // do some preprocessing on it
-
758 _drawMesh(&mesh);
-
759 }
-
760}
-
761
-
762// Prepare a mesh for drawing. Compute mesh's final vertex positions
-
763// given a skeleton. Put the vertices in vertex arrays.
-
764inline void
-
765CSCI441::MD5Model::_prepareMesh(
-
766 const MD5Mesh *pMESH
-
767) const {
-
768 GLint i, j, k;
-
769
-
770 // Setup vertex indices
-
771 for(k = 0, i = 0; i < pMESH->numTriangles; ++i) {
-
772 for(j = 0; j < 3; ++j, ++k)
-
773 _vertexIndicesArray[k] = pMESH->triangles[i].index[j];
-
774 }
-
775
-
776 // Setup vertices
-
777 for(i = 0; i < pMESH->numVertices; ++i) {
-
778 glm::vec3 finalVertex = {0.0f, 0.0f, 0.0f };
-
779
-
780 // Calculate final vertex to draw with weights
-
781 for(j = 0; j < pMESH->vertices[i].count; ++j) {
-
782 const MD5Weight *weight = &pMESH->weights[pMESH->vertices[i].start + j];
-
783 const MD5Joint *joint = &_skeleton[weight->joint];
-
784
-
785 // Calculate transformed vertex for this weight
-
786 glm::vec3 weightedVertex;
-
787 weightedVertex = glm::rotate(joint->orientation, glm::vec4(weight->position, 0.0f));
-
788
-
789 // The sum of all weight->bias should be 1.0
-
790 finalVertex.x += (joint->position.x + weightedVertex.x) * weight->bias;
-
791 finalVertex.y += (joint->position.y + weightedVertex.y) * weight->bias;
-
792 finalVertex.z += (joint->position.z + weightedVertex.z) * weight->bias;
-
793 }
-
794
-
795 _vertexArray[i].x = finalVertex.x;
-
796 _vertexArray[i].y = finalVertex.y;
-
797 _vertexArray[i].z = finalVertex.z;
-
798
-
799 _texelArray[i].s = pMESH->vertices[i].texCoord.s;
-
800 _texelArray[i].t = pMESH->vertices[i].texCoord.t;
-
801 }
-
802
-
803 glBindVertexArray(_vao );
-
804 glBindBuffer(GL_ARRAY_BUFFER, _vbo[0] );
-
805 glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(glm::vec3) * pMESH->numVertices, &_vertexArray[0] );
-
806 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _maxVertices, sizeof(glm::vec2) * pMESH->numVertices, &_texelArray[0] );
-
807 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo[1] );
-
808 glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, sizeof(GLuint) * pMESH->numTriangles * 3, _vertexIndicesArray );
-
809}
-
810
-
811inline void
-
812CSCI441::MD5Model::_drawMesh(
-
813 const MD5Mesh *pMESH
-
814) const {
-
815 // Bind Diffuse Map
-
816 glBindTexture(GL_TEXTURE_2D, pMESH->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle );
-
817
-
818 glBindVertexArray(_vao );
-
819 glDrawElements(GL_TRIANGLES, pMESH->numTriangles * 3, GL_UNSIGNED_INT, (void*)nullptr );
-
820}
-
821
-
822[[maybe_unused]]
-
823inline void
-
824CSCI441::MD5Model::allocVertexArrays(
-
825 GLuint vPosAttribLoc,
-
826 GLuint vColorAttribLoc,
-
827 GLuint vTexCoordAttribLoc
-
828) {
-
829 _vertexArray = new glm::vec3[_maxVertices];
-
830 _texelArray = new glm::vec2[_maxVertices];
-
831 _vertexIndicesArray = new GLuint[_maxTriangles * 3];
-
832
-
833 glGenVertexArrays( 1, &_vao );
-
834 glBindVertexArray(_vao );
-
835
-
836 glGenBuffers(2, _vbo );
-
837 glBindBuffer(GL_ARRAY_BUFFER, _vbo[0] );
-
838 glBufferData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _maxVertices + sizeof(glm::vec2) * _maxVertices, nullptr, GL_DYNAMIC_DRAW );
-
839
-
840 glEnableVertexAttribArray( vPosAttribLoc );
-
841 glVertexAttribPointer( vPosAttribLoc, 3, GL_FLOAT, GL_FALSE, 0, (void*)nullptr );
-
842
-
843 glEnableVertexAttribArray( vTexCoordAttribLoc );
-
844 glVertexAttribPointer( vTexCoordAttribLoc, 2, GL_FLOAT, GL_FALSE, 0, (void*)(sizeof(glm::vec3) * _maxVertices) );
-
845
-
846 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo[1] );
-
847 glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * _maxTriangles * 3, nullptr, GL_DYNAMIC_DRAW );
-
848
-
849 printf("[.md5mesh]: Model VAO/VBO/IBO registered at %u/%u/%u\n", _vao, _vbo[0], _vbo[1] );
+
719 _skeleton = _baseSkeleton;
+
720
+
721 printf("[.md5mesh]: finished reading %s\n", FILENAME );
+
722 printf("[.md5mesh]: read in %d meshes, %d joints, %d vertices, %d weights, and %d triangles\n", _numMeshes, _numJoints, totalVertices, totalWeights, totalTriangles );
+
723 printf( "[.md5mesh]: base pose %f units across in X, %f units across in Y, %f units across in Z\n", (maxX - minX), (maxY-minY), (maxZ - minZ) );
+
724 printf( "\n" );
+
725
+
726 return true;
+
727}
+
728
+
729//Free resources allocated for the model.
+
730inline void
+
731CSCI441::MD5Model::_freeModel()
+
732{
+
733 delete _baseSkeleton;
+
734 _baseSkeleton = nullptr;
+
735
+
736 // Free mesh data
+
737 for(GLint i = 0; i < _numMeshes; ++i) {
+
738 delete _meshes[i].vertices;
+
739 _meshes[i].vertices = nullptr;
+
740
+
741 delete _meshes[i].triangles;
+
742 _meshes[i].triangles = nullptr;
+
743
+
744 delete _meshes[i].weights;
+
745 _meshes[i].weights = nullptr;
+
746 }
+
747
+
748 delete _meshes;
+
749 _meshes = nullptr;
+
750}
+
751
+
752[[maybe_unused]]
+
753inline void
+
754CSCI441::MD5Model::draw() const
+
755{
+
756 // Draw each mesh of the model
+
757 for(GLint i = 0; i < _numMeshes; ++i) {
+
758 MD5Mesh mesh = _meshes[i]; // get the mesh
+
759 _prepareMesh(&mesh); // do some preprocessing on it
+
760 _drawMesh(&mesh);
+
761 }
+
762}
+
763
+
764// Prepare a mesh for drawing. Compute mesh's final vertex positions
+
765// given a skeleton. Put the vertices in vertex arrays.
+
766inline void
+
767CSCI441::MD5Model::_prepareMesh(
+
768 const MD5Mesh *pMESH
+
769) const {
+
770 GLint i, j, k;
+
771
+
772 // Setup vertex indices
+
773 for(k = 0, i = 0; i < pMESH->numTriangles; ++i) {
+
774 for(j = 0; j < 3; ++j, ++k)
+
775 _vertexIndicesArray[k] = pMESH->triangles[i].index[j];
+
776 }
+
777
+
778 // Setup vertices
+
779 for(i = 0; i < pMESH->numVertices; ++i) {
+
780 glm::vec3 finalVertex = {0.0f, 0.0f, 0.0f };
+
781
+
782 // Calculate final vertex to draw with weights
+
783 for(j = 0; j < pMESH->vertices[i].count; ++j) {
+
784 const MD5Weight *weight = &pMESH->weights[pMESH->vertices[i].start + j];
+
785 const MD5Joint *joint = &_skeleton[weight->joint];
+
786
+
787 // Calculate transformed vertex for this weight
+
788 glm::vec3 weightedVertex;
+
789 weightedVertex = glm::rotate(joint->orientation, glm::vec4(weight->position, 0.0f));
+
790
+
791 // The sum of all weight->bias should be 1.0
+
792 finalVertex.x += (joint->position.x + weightedVertex.x) * weight->bias;
+
793 finalVertex.y += (joint->position.y + weightedVertex.y) * weight->bias;
+
794 finalVertex.z += (joint->position.z + weightedVertex.z) * weight->bias;
+
795 }
+
796
+
797 _vertexArray[i].x = finalVertex.x;
+
798 _vertexArray[i].y = finalVertex.y;
+
799 _vertexArray[i].z = finalVertex.z;
+
800
+
801 _texelArray[i].s = pMESH->vertices[i].texCoord.s;
+
802 _texelArray[i].t = pMESH->vertices[i].texCoord.t;
+
803 }
+
804
+
805 glBindVertexArray(_vao );
+
806 glBindBuffer(GL_ARRAY_BUFFER, _vbo[0] );
+
807 glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(glm::vec3) * pMESH->numVertices, &_vertexArray[0] );
+
808 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _maxVertices, sizeof(glm::vec2) * pMESH->numVertices, &_texelArray[0] );
+
809 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo[1] );
+
810 glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, sizeof(GLuint) * pMESH->numTriangles * 3, _vertexIndicesArray );
+
811}
+
812
+
813inline void
+
814CSCI441::MD5Model::_drawMesh(
+
815 const MD5Mesh *pMESH
+
816) const {
+
817 // Bind Diffuse Map
+
818 glBindTexture(GL_TEXTURE_2D, pMESH->textures[MD5Mesh::TextureMap::DIFFUSE].texHandle );
+
819
+
820 glBindVertexArray(_vao );
+
821 glDrawElements(GL_TRIANGLES, pMESH->numTriangles * 3, GL_UNSIGNED_INT, (void*)nullptr );
+
822}
+
823
+
824[[maybe_unused]]
+
825inline void
+
826CSCI441::MD5Model::allocVertexArrays(
+
827 GLuint vPosAttribLoc,
+
828 GLuint vColorAttribLoc,
+
829 GLuint vTexCoordAttribLoc
+
830) {
+
831 _vertexArray = new glm::vec3[_maxVertices];
+
832 _texelArray = new glm::vec2[_maxVertices];
+
833 _vertexIndicesArray = new GLuint[_maxTriangles * 3];
+
834
+
835 glGenVertexArrays( 1, &_vao );
+
836 glBindVertexArray(_vao );
+
837
+
838 glGenBuffers(2, _vbo );
+
839 glBindBuffer(GL_ARRAY_BUFFER, _vbo[0] );
+
840 glBufferData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _maxVertices + sizeof(glm::vec2) * _maxVertices, nullptr, GL_DYNAMIC_DRAW );
+
841
+
842 glEnableVertexAttribArray( vPosAttribLoc );
+
843 glVertexAttribPointer( vPosAttribLoc, 3, GL_FLOAT, GL_FALSE, 0, (void*)nullptr );
+
844
+
845 glEnableVertexAttribArray( vTexCoordAttribLoc );
+
846 glVertexAttribPointer( vTexCoordAttribLoc, 2, GL_FLOAT, GL_FALSE, 0, (void*)(sizeof(glm::vec3) * _maxVertices) );
+
847
+
848 glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo[1] );
+
849 glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * _maxTriangles * 3, nullptr, GL_DYNAMIC_DRAW );
850
-
851 glGenVertexArrays( 1, &_skeletonVAO );
-
852 glBindVertexArray(_skeletonVAO );
-
853
-
854 glGenBuffers( 1, &_skeletonVBO );
-
855 glBindBuffer(GL_ARRAY_BUFFER, _skeletonVBO );
-
856 glBufferData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints * 3 * 2, nullptr, GL_DYNAMIC_DRAW );
-
857
-
858 glEnableVertexAttribArray( vPosAttribLoc ); // vPos
-
859 glVertexAttribPointer( vPosAttribLoc, 3, GL_FLOAT, GL_FALSE, 0, (void*)nullptr );
-
860
-
861 glEnableVertexAttribArray( vColorAttribLoc ); // vColor
-
862 glVertexAttribPointer( vColorAttribLoc, 3, GL_FLOAT, GL_FALSE, 0, (void*)(sizeof(glm::vec3) * _numJoints * 3) );
-
863
-
864 printf("[.md5mesh]: Skeleton VAO/VBO registered at %u/%u\n", _skeletonVAO, _skeletonVBO );
-
865}
-
866
-
867inline void
-
868CSCI441::MD5Model::_freeVertexArrays()
-
869{
-
870 delete[] _vertexArray;
-
871 _vertexArray = nullptr;
-
872
-
873 delete[] _vertexIndicesArray;
-
874 _vertexIndicesArray = nullptr;
-
875
-
876 delete[] _texelArray;
-
877 _texelArray = nullptr;
-
878
-
879 glDeleteVertexArrays( 1, &_vao );
-
880 glDeleteBuffers(2, _vbo );
-
881 glDeleteVertexArrays( 1, &_skeletonVAO );
-
882 glDeleteBuffers( 1, &_skeletonVBO );
-
883}
-
884
-
885// Draw the skeleton as lines and points (for joints).
-
886[[maybe_unused]]
-
887inline void
-
888CSCI441::MD5Model::drawSkeleton() const
-
889{
-
890 glBindVertexArray(_skeletonVAO );
-
891 glBindBuffer(GL_ARRAY_BUFFER, _skeletonVBO );
-
892
-
893 glm::vec3 jointColor = {1.0f, 1.0f, 0.0f };
-
894 glm::vec3 boneColor = {1.0f, 0.0f, 1.0f };
-
895
-
896 // put in points for joints
-
897 for(GLint i = 0; i < _numJoints; ++i ) {
-
898 glBufferSubData(GL_ARRAY_BUFFER, i * sizeof(glm::vec3), sizeof(glm::vec3), &(_skeleton[i].position) );
-
899 glBufferSubData(GL_ARRAY_BUFFER, i * sizeof(glm::vec3) + sizeof(glm::vec3) * _numJoints * 3, sizeof(glm::vec3), &jointColor[0]);
-
900 }
-
901
-
902 // put in lines for bones
-
903 GLint numBones = 0;
-
904 for(GLint i = 0; i < _numJoints; ++i ) {
-
905 if( _skeleton[i].parent != MD5Joint::NULL_JOINT ) {
-
906 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3), sizeof(glm::vec3), &(_skeleton[_skeleton[i].parent].position) );
-
907 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3) + sizeof(glm::vec3) * _numJoints * 3, sizeof(glm::vec3), &boneColor[0]);
-
908
-
909 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3) + sizeof(glm::vec3), sizeof(glm::vec3), &(_skeleton[i].position) );
-
910 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3) + sizeof(glm::vec3) + sizeof(glm::vec3) * _numJoints * 3, sizeof(glm::vec3), &boneColor[0]);
-
911 numBones++;
-
912 }
-
913 }
-
914
-
915 glPointSize (5.0f);
-
916 glDrawArrays(GL_POINTS, 0, _numJoints );
-
917 glPointSize(1.0f);
-
918
-
919 glLineWidth( 3.0f );
-
920 glDrawArrays(GL_LINES, _numJoints, numBones * 2 );
-
921 glLineWidth(1.0f);
-
922}
-
923
-
924// Check if an animation can be used for a given model. Model's
-
925// skeleton and animation's skeleton must match.
-
926inline bool
-
927CSCI441::MD5Model::_checkAnimValidity() const
-
928{
-
929 // md5mesh and md5anim must have the same number of joints
-
930 if( _numJoints != _animation.numJoints ) {
-
931 printf("\n[.md5anim]: skeleton and animation do not have same number of joints. cannot apply animation to skeleton\n\n");
-
932 return false;
-
933 }
-
934
-
935 // We just check with frame[0]
-
936 for(GLint i = 0; i < _numJoints; ++i) {
-
937 // Joints must have the same parent index
-
938 if (_baseSkeleton[i].parent != _animation.skeletonFrames[0][i].parent) {
-
939 printf("\n[.md5anim]: skeleton and animation joints do not have same parent index. cannot apply animation to skeleton\n\n");
-
940 return false;
-
941 }
-
942
-
943 // Joints must have the same name
-
944 if (strcmp (_baseSkeleton[i].name, _animation.skeletonFrames[0][i].name) != 0) {
-
945 printf("\n[.md5anim]: skeleton and animation joints do not have same name. cannot apply animation to skeleton\n\n");
-
946 return false;
-
947 }
-
948 }
-
949
-
950 printf("\n[.md5anim]: skeleton and animation match. animation can be applied to skeleton\n\n");
-
951 return true;
-
952}
-
953
-
954// Build _skeleton for a given frame data.
-
955inline void
-
956CSCI441::MD5Model::_buildFrameSkeleton(
-
957 const MD5JointInfo* pJOINT_INFOS,
-
958 const MD5BaseFrameJoint* pBASE_FRAME,
-
959 const GLfloat* pANIM_FRAME_DATA,
-
960 MD5Joint* pSkeletonFrame,
-
961 const GLint NUM_JOINTS
-
962) {
-
963 if(pJOINT_INFOS == nullptr
-
964 || pBASE_FRAME == nullptr
-
965 || pANIM_FRAME_DATA == nullptr
-
966 || pSkeletonFrame == nullptr) return;
-
967
-
968 GLint i;
+
851 printf("[.md5mesh]: Model VAO/VBO/IBO registered at %u/%u/%u\n", _vao, _vbo[0], _vbo[1] );
+
852
+
853 glGenVertexArrays( 1, &_skeletonVAO );
+
854 glBindVertexArray(_skeletonVAO );
+
855
+
856 glGenBuffers( 1, &_skeletonVBO );
+
857 glBindBuffer(GL_ARRAY_BUFFER, _skeletonVBO );
+
858 glBufferData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints * 3 * 2, nullptr, GL_DYNAMIC_DRAW );
+
859
+
860 glEnableVertexAttribArray( vPosAttribLoc ); // vPos
+
861 glVertexAttribPointer( vPosAttribLoc, 3, GL_FLOAT, GL_FALSE, 0, (void*)nullptr );
+
862
+
863 glEnableVertexAttribArray( vColorAttribLoc ); // vColor
+
864 glVertexAttribPointer( vColorAttribLoc, 3, GL_FLOAT, GL_FALSE, 0, (void*)(sizeof(glm::vec3) * _numJoints * 3) );
+
865
+
866 printf("[.md5mesh]: Skeleton VAO/VBO registered at %u/%u\n", _skeletonVAO, _skeletonVBO );
+
867}
+
868
+
869inline void
+
870CSCI441::MD5Model::_freeVertexArrays()
+
871{
+
872 delete[] _vertexArray;
+
873 _vertexArray = nullptr;
+
874
+
875 delete[] _vertexIndicesArray;
+
876 _vertexIndicesArray = nullptr;
+
877
+
878 delete[] _texelArray;
+
879 _texelArray = nullptr;
+
880
+
881 glDeleteVertexArrays( 1, &_vao );
+
882 glDeleteBuffers(2, _vbo );
+
883 glDeleteVertexArrays( 1, &_skeletonVAO );
+
884 glDeleteBuffers( 1, &_skeletonVBO );
+
885}
+
886
+
887// Draw the skeleton as lines and points (for joints).
+
888[[maybe_unused]]
+
889inline void
+
890CSCI441::MD5Model::drawSkeleton() const
+
891{
+
892 glBindVertexArray(_skeletonVAO );
+
893 glBindBuffer(GL_ARRAY_BUFFER, _skeletonVBO );
+
894
+
895 glm::vec3 jointColor = {1.0f, 1.0f, 0.0f };
+
896 glm::vec3 boneColor = {1.0f, 0.0f, 1.0f };
+
897
+
898 // put in points for joints
+
899 for(GLint i = 0; i < _numJoints; ++i ) {
+
900 glBufferSubData(GL_ARRAY_BUFFER, i * sizeof(glm::vec3), sizeof(glm::vec3), &(_skeleton[i].position) );
+
901 glBufferSubData(GL_ARRAY_BUFFER, i * sizeof(glm::vec3) + sizeof(glm::vec3) * _numJoints * 3, sizeof(glm::vec3), &jointColor[0]);
+
902 }
+
903
+
904 // put in lines for bones
+
905 GLint numBones = 0;
+
906 for(GLint i = 0; i < _numJoints; ++i ) {
+
907 if( _skeleton[i].parent != MD5Joint::NULL_JOINT ) {
+
908 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3), sizeof(glm::vec3), &(_skeleton[_skeleton[i].parent].position) );
+
909 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3) + sizeof(glm::vec3) * _numJoints * 3, sizeof(glm::vec3), &boneColor[0]);
+
910
+
911 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3) + sizeof(glm::vec3), sizeof(glm::vec3), &(_skeleton[i].position) );
+
912 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * _numJoints + (i * 2) * sizeof(glm::vec3) + sizeof(glm::vec3) + sizeof(glm::vec3) * _numJoints * 3, sizeof(glm::vec3), &boneColor[0]);
+
913 numBones++;
+
914 }
+
915 }
+
916
+
917 glPointSize (5.0f);
+
918 glDrawArrays(GL_POINTS, 0, _numJoints );
+
919 glPointSize(1.0f);
+
920
+
921 glLineWidth( 3.0f );
+
922 glDrawArrays(GL_LINES, _numJoints, numBones * 2 );
+
923 glLineWidth(1.0f);
+
924}
+
925
+
926// Check if an animation can be used for a given model. Model's
+
927// skeleton and animation's skeleton must match.
+
928inline bool
+
929CSCI441::MD5Model::_checkAnimValidity() const
+
930{
+
931 // md5mesh and md5anim must have the same number of joints
+
932 if( _numJoints != _animation.numJoints ) {
+
933 printf("\n[.md5anim]: skeleton and animation do not have same number of joints. cannot apply animation to skeleton\n\n");
+
934 return false;
+
935 }
+
936
+
937 // We just check with frame[0]
+
938 for(GLint i = 0; i < _numJoints; ++i) {
+
939 // Joints must have the same parent index
+
940 if (_baseSkeleton[i].parent != _animation.skeletonFrames[0][i].parent) {
+
941 printf("\n[.md5anim]: skeleton and animation joints do not have same parent index. cannot apply animation to skeleton\n\n");
+
942 return false;
+
943 }
+
944
+
945 // Joints must have the same name
+
946 if (strcmp (_baseSkeleton[i].name, _animation.skeletonFrames[0][i].name) != 0) {
+
947 printf("\n[.md5anim]: skeleton and animation joints do not have same name. cannot apply animation to skeleton\n\n");
+
948 return false;
+
949 }
+
950 }
+
951
+
952 printf("\n[.md5anim]: skeleton and animation match. animation can be applied to skeleton\n\n");
+
953 return true;
+
954}
+
955
+
956// Build _skeleton for a given frame data.
+
957inline void
+
958CSCI441::MD5Model::_buildFrameSkeleton(
+
959 const MD5JointInfo* pJOINT_INFOS,
+
960 const MD5BaseFrameJoint* pBASE_FRAME,
+
961 const GLfloat* pANIM_FRAME_DATA,
+
962 MD5Joint* pSkeletonFrame,
+
963 const GLint NUM_JOINTS
+
964) {
+
965 if(pJOINT_INFOS == nullptr
+
966 || pBASE_FRAME == nullptr
+
967 || pANIM_FRAME_DATA == nullptr
+
968 || pSkeletonFrame == nullptr) return;
969
-
970 for(i = 0; i < NUM_JOINTS; ++i) {
-
971 const MD5BaseFrameJoint *baseJoint = &pBASE_FRAME[i];
-
972 glm::vec3 animatedPosition = baseJoint->position;
-
973 glm::quat animatedOrientation = baseJoint->orientation;
-
974 GLint j = 0;
-
975
-
976 // Tx
-
977 if(pJOINT_INFOS[i].flags & 1 ) {
-
978 animatedPosition.x = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
-
979 ++j;
-
980 }
-
981
-
982 // Ty
-
983 if(pJOINT_INFOS[i].flags & 2 ) {
-
984 animatedPosition.y = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
-
985 ++j;
-
986 }
-
987
-
988 // Tz
-
989 if(pJOINT_INFOS[i].flags & 4 ) {
-
990 animatedPosition.z = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
-
991 ++j;
-
992 }
-
993
-
994 // Qx
-
995 if(pJOINT_INFOS[i].flags & 8 ) {
-
996 animatedOrientation.x = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
-
997 ++j;
-
998 }
-
999
-
1000 // Qy
-
1001 if(pJOINT_INFOS[i].flags & 16 ) {
-
1002 animatedOrientation.y = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
-
1003 ++j;
-
1004 }
-
1005
-
1006 // Qz
-
1007 if(pJOINT_INFOS[i].flags & 32 ) {
-
1008 animatedOrientation.z = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
-
1009 }
-
1010
-
1011 // Compute orientation quaternion's w value
-
1012 animatedOrientation.w = glm::extractRealComponent(animatedOrientation);
-
1013
-
1014 // NOTE: we assume that this joint's parent has
-
1015 // already been calculated, i.e. joint's ID should
-
1016 // never be smaller than its parent ID.
-
1017 MD5Joint *thisJoint = &pSkeletonFrame[i];
-
1018
-
1019 GLint parent = pJOINT_INFOS[i].parent;
-
1020 thisJoint->parent = parent;
-
1021 strcpy (thisJoint->name, pJOINT_INFOS[i].name);
-
1022
-
1023 // Has parent?
-
1024 if( thisJoint->parent == MD5Joint::NULL_JOINT ) {
-
1025 thisJoint->position = animatedPosition;
-
1026 thisJoint->orientation = animatedOrientation;
-
1027 } else {
-
1028 MD5Joint *parentJoint = &pSkeletonFrame[parent];
-
1029 glm::vec3 rotatedPosition = glm::rotate(parentJoint->orientation, glm::vec4(animatedPosition, 0.0f));
-
1030
-
1031 // Add positions
-
1032 thisJoint->position = parentJoint->position + rotatedPosition;
-
1033
-
1034 // Concatenate rotations
-
1035 thisJoint->orientation = glm::normalize( glm::cross(parentJoint->orientation, animatedOrientation) );
-
1036 }
-
1037 }
-
1038}
-
1039
-
1040// Load an MD5 animation from file.
-
1041inline bool
-
1042CSCI441::MD5Model::readMD5Anim(
-
1043 const char *filename
-
1044) {
-
1045 char buff[512];
-
1046 MD5JointInfo *jointInfos = nullptr;
-
1047 MD5BaseFrameJoint *baseFrame = nullptr;
-
1048 GLfloat *animFrameData = nullptr;
-
1049 GLint version;
-
1050 GLint numAnimatedComponents;
-
1051 GLint frameIndex;
-
1052 GLint i;
-
1053
-
1054 printf( "[.md5anim]: about to read %s\n", filename );
+
970 GLint i;
+
971
+
972 for(i = 0; i < NUM_JOINTS; ++i) {
+
973 const MD5BaseFrameJoint *baseJoint = &pBASE_FRAME[i];
+
974 glm::vec3 animatedPosition = baseJoint->position;
+
975 glm::quat animatedOrientation = baseJoint->orientation;
+
976 GLint j = 0;
+
977
+
978 // Tx
+
979 if(pJOINT_INFOS[i].flags & 1 ) {
+
980 animatedPosition.x = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
+
981 ++j;
+
982 }
+
983
+
984 // Ty
+
985 if(pJOINT_INFOS[i].flags & 2 ) {
+
986 animatedPosition.y = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
+
987 ++j;
+
988 }
+
989
+
990 // Tz
+
991 if(pJOINT_INFOS[i].flags & 4 ) {
+
992 animatedPosition.z = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
+
993 ++j;
+
994 }
+
995
+
996 // Qx
+
997 if(pJOINT_INFOS[i].flags & 8 ) {
+
998 animatedOrientation.x = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
+
999 ++j;
+
1000 }
+
1001
+
1002 // Qy
+
1003 if(pJOINT_INFOS[i].flags & 16 ) {
+
1004 animatedOrientation.y = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
+
1005 ++j;
+
1006 }
+
1007
+
1008 // Qz
+
1009 if(pJOINT_INFOS[i].flags & 32 ) {
+
1010 animatedOrientation.z = pANIM_FRAME_DATA[pJOINT_INFOS[i].startIndex + j];
+
1011 }
+
1012
+
1013 // Compute orientation quaternion's w value
+
1014 animatedOrientation.w = glm::extractRealComponent(animatedOrientation);
+
1015
+
1016 // NOTE: we assume that this joint's parent has
+
1017 // already been calculated, i.e. joint's ID should
+
1018 // never be smaller than its parent ID.
+
1019 MD5Joint *thisJoint = &pSkeletonFrame[i];
+
1020
+
1021 GLint parent = pJOINT_INFOS[i].parent;
+
1022 thisJoint->parent = parent;
+
1023 strcpy (thisJoint->name, pJOINT_INFOS[i].name);
+
1024
+
1025 // Has parent?
+
1026 if( thisJoint->parent == MD5Joint::NULL_JOINT ) {
+
1027 thisJoint->position = animatedPosition;
+
1028 thisJoint->orientation = animatedOrientation;
+
1029 } else {
+
1030 MD5Joint *parentJoint = &pSkeletonFrame[parent];
+
1031 glm::vec3 rotatedPosition = glm::rotate(parentJoint->orientation, glm::vec4(animatedPosition, 0.0f));
+
1032
+
1033 // Add positions
+
1034 thisJoint->position = parentJoint->position + rotatedPosition;
+
1035
+
1036 // Concatenate rotations
+
1037 thisJoint->orientation = glm::normalize( glm::cross(parentJoint->orientation, animatedOrientation) );
+
1038 }
+
1039 }
+
1040}
+
1041
+
1042// Load an MD5 animation from file.
+
1043inline bool
+
1044CSCI441::MD5Model::readMD5Anim(
+
1045 const char *filename
+
1046) {
+
1047 char buff[512];
+
1048 MD5JointInfo *jointInfos = nullptr;
+
1049 MD5BaseFrameJoint *baseFrame = nullptr;
+
1050 GLfloat *animFrameData = nullptr;
+
1051 GLint version;
+
1052 GLint numAnimatedComponents;
+
1053 GLint frameIndex;
+
1054 GLint i;
1055
-
1056 FILE *fp = fopen( filename, "rb" );
-
1057 if( !fp ) {
-
1058 fprintf (stderr, "[.md5anim]: Error: couldn't open \"%s\"!\n", filename);
-
1059 return false;
-
1060 }
-
1061
-
1062 while( !feof(fp) ) {
-
1063 // Read whole line
-
1064 fgets( buff, sizeof(buff), fp );
-
1065
-
1066 if( sscanf(buff, " MD5Version %d", &version) == 1 ) {
-
1067 if( version != 10 ) {
-
1068 // Bad version
-
1069 fprintf (stderr, "[.md5anim]: Error: bad animation version\n");
-
1070 fclose (fp);
-
1071 return false;
-
1072 }
-
1073 } else if( sscanf(buff, " numFrames %d", &_animation.numFrames) == 1 ) {
-
1074 // Allocate memory for skeleton frames and bounding boxes
-
1075 if( _animation.numFrames > 0 ) {
-
1076 _animation.skeletonFrames = new MD5Joint*[_animation.numFrames];
-
1077 _animation.boundingBoxes = new MD5BoundingBox[_animation.numFrames];
-
1078 }
-
1079 } else if( sscanf(buff, " numJoints %d", &_animation.numJoints) == 1 ) {
-
1080 if( _animation.numJoints > 0 ) {
-
1081 for(i = 0; i < _animation.numFrames; ++i) {
-
1082 // Allocate memory for joints of each frame
-
1083 _animation.skeletonFrames[i] = new MD5Joint[_animation.numJoints];
-
1084 }
-
1085
-
1086 // Allocate temporary memory for building skeleton frames
-
1087 jointInfos = new MD5JointInfo[_animation.numJoints];
-
1088
-
1089 baseFrame = new MD5BaseFrameJoint[_animation.numJoints];
-
1090 }
-
1091 } else if( sscanf(buff, " frameRate %d", &_animation.frameRate) == 1 ) {
-
1092
-
1093 } else if( sscanf(buff, " numAnimatedComponents %d", &numAnimatedComponents) == 1 ) {
-
1094 if( numAnimatedComponents > 0 ) {
-
1095 // Allocate memory for animation frame data
-
1096 animFrameData = new GLfloat[numAnimatedComponents];
-
1097 }
-
1098 } else if( strncmp(buff, "hierarchy {", 11) == 0 ) {
-
1099 for(i = 0; i < _animation.numJoints; ++i) {
-
1100 // Read whole line
-
1101 fgets( buff, sizeof(buff), fp );
-
1102
-
1103 // Read joint info
-
1104 sscanf(buff, " %s %d %d %d",
-
1105 jointInfos[i].name, &jointInfos[i].parent,
-
1106 &jointInfos[i].flags, &jointInfos[i].startIndex);
-
1107 }
-
1108 } else if( strncmp(buff, "bounds {", 8) == 0 ) {
-
1109 for(i = 0; i < _animation.numFrames; ++i) {
-
1110 // Read whole line
-
1111 fgets( buff, sizeof(buff), fp );
-
1112
-
1113 // Read bounding box
-
1114 sscanf(buff, " ( %f %f %f ) ( %f %f %f )",
-
1115 &_animation.boundingBoxes[i].min[0], &_animation.boundingBoxes[i].min[1], &_animation.boundingBoxes[i].min[2],
-
1116 &_animation.boundingBoxes[i].max[0], &_animation.boundingBoxes[i].max[1], &_animation.boundingBoxes[i].max[2]);
-
1117 }
-
1118 } else if( strncmp(buff, "baseframe {", 10) == 0 ) {
-
1119 for(i = 0; i < _animation.numJoints; ++i) {
-
1120 // Read whole line
-
1121 fgets( buff, sizeof(buff), fp );
-
1122
-
1123 // Read base frame joint
-
1124 if( sscanf(buff, " ( %f %f %f ) ( %f %f %f )",
-
1125 &baseFrame[i].position[0], &baseFrame[i].position[1], &baseFrame[i].position[2],
-
1126 &baseFrame[i].orientation[0], &baseFrame[i].orientation[1], &baseFrame[i].orientation[2]) == 6 ) {
-
1127 // Compute the w component
-
1128 baseFrame[i].orientation.w = glm::extractRealComponent(baseFrame[i].orientation);
-
1129 }
-
1130 }
-
1131 } else if(sscanf(buff, " frame %d", &frameIndex) == 1 ) {
-
1132 // Read frame data
-
1133 for(i = 0; i < numAnimatedComponents; ++i)
-
1134 fscanf( fp, "%f", &animFrameData[i] );
-
1135
-
1136 // Build frame _skeleton from the collected data
-
1137 _buildFrameSkeleton(jointInfos, baseFrame, animFrameData,
-
1138 _animation.skeletonFrames[frameIndex],
-
1139 _animation.numJoints);
-
1140 }
-
1141 }
-
1142
-
1143 fclose( fp );
+
1056 printf( "[.md5anim]: about to read %s\n", filename );
+
1057
+
1058 FILE *fp = fopen( filename, "rb" );
+
1059 if( !fp ) {
+
1060 fprintf (stderr, "[.md5anim]: Error: couldn't open \"%s\"!\n", filename);
+
1061 return false;
+
1062 }
+
1063
+
1064 while( !feof(fp) ) {
+
1065 // Read whole line
+
1066 fgets( buff, sizeof(buff), fp );
+
1067
+
1068 if( sscanf(buff, " MD5Version %d", &version) == 1 ) {
+
1069 if( version != 10 ) {
+
1070 // Bad version
+
1071 fprintf (stderr, "[.md5anim]: Error: bad animation version\n");
+
1072 fclose (fp);
+
1073 return false;
+
1074 }
+
1075 } else if( sscanf(buff, " numFrames %d", &_animation.numFrames) == 1 ) {
+
1076 // Allocate memory for skeleton frames and bounding boxes
+
1077 if( _animation.numFrames > 0 ) {
+
1078 _animation.skeletonFrames = new MD5Joint*[_animation.numFrames];
+
1079 _animation.boundingBoxes = new MD5BoundingBox[_animation.numFrames];
+
1080 }
+
1081 } else if( sscanf(buff, " numJoints %d", &_animation.numJoints) == 1 ) {
+
1082 if( _animation.numJoints > 0 ) {
+
1083 for(i = 0; i < _animation.numFrames; ++i) {
+
1084 // Allocate memory for joints of each frame
+
1085 _animation.skeletonFrames[i] = new MD5Joint[_animation.numJoints];
+
1086 }
+
1087
+
1088 // Allocate temporary memory for building skeleton frames
+
1089 jointInfos = new MD5JointInfo[_animation.numJoints];
+
1090
+
1091 baseFrame = new MD5BaseFrameJoint[_animation.numJoints];
+
1092 }
+
1093 } else if( sscanf(buff, " frameRate %d", &_animation.frameRate) == 1 ) {
+
1094
+
1095 } else if( sscanf(buff, " numAnimatedComponents %d", &numAnimatedComponents) == 1 ) {
+
1096 if( numAnimatedComponents > 0 ) {
+
1097 // Allocate memory for animation frame data
+
1098 animFrameData = new GLfloat[numAnimatedComponents];
+
1099 }
+
1100 } else if( strncmp(buff, "hierarchy {", 11) == 0 ) {
+
1101 for(i = 0; i < _animation.numJoints; ++i) {
+
1102 // Read whole line
+
1103 fgets( buff, sizeof(buff), fp );
+
1104
+
1105 // Read joint info
+
1106 sscanf(buff, " %s %d %d %d",
+
1107 jointInfos[i].name, &jointInfos[i].parent,
+
1108 &jointInfos[i].flags, &jointInfos[i].startIndex);
+
1109 }
+
1110 } else if( strncmp(buff, "bounds {", 8) == 0 ) {
+
1111 for(i = 0; i < _animation.numFrames; ++i) {
+
1112 // Read whole line
+
1113 fgets( buff, sizeof(buff), fp );
+
1114
+
1115 // Read bounding box
+
1116 sscanf(buff, " ( %f %f %f ) ( %f %f %f )",
+
1117 &_animation.boundingBoxes[i].min[0], &_animation.boundingBoxes[i].min[1], &_animation.boundingBoxes[i].min[2],
+
1118 &_animation.boundingBoxes[i].max[0], &_animation.boundingBoxes[i].max[1], &_animation.boundingBoxes[i].max[2]);
+
1119 }
+
1120 } else if( strncmp(buff, "baseframe {", 10) == 0 ) {
+
1121 for(i = 0; i < _animation.numJoints; ++i) {
+
1122 // Read whole line
+
1123 fgets( buff, sizeof(buff), fp );
+
1124
+
1125 // Read base frame joint
+
1126 if( sscanf(buff, " ( %f %f %f ) ( %f %f %f )",
+
1127 &baseFrame[i].position[0], &baseFrame[i].position[1], &baseFrame[i].position[2],
+
1128 &baseFrame[i].orientation[0], &baseFrame[i].orientation[1], &baseFrame[i].orientation[2]) == 6 ) {
+
1129 // Compute the w component
+
1130 baseFrame[i].orientation.w = glm::extractRealComponent(baseFrame[i].orientation);
+
1131 }
+
1132 }
+
1133 } else if(sscanf(buff, " frame %d", &frameIndex) == 1 ) {
+
1134 // Read frame data
+
1135 for(i = 0; i < numAnimatedComponents; ++i)
+
1136 fscanf( fp, "%f", &animFrameData[i] );
+
1137
+
1138 // Build frame _skeleton from the collected data
+
1139 _buildFrameSkeleton(jointInfos, baseFrame, animFrameData,
+
1140 _animation.skeletonFrames[frameIndex],
+
1141 _animation.numJoints);
+
1142 }
+
1143 }
1144
-
1145 printf( "[.md5anim]: finished reading %s\n", filename );
-
1146 printf( "[.md5anim]: read in %d frames of %d joints with %d animated components\n", _animation.numFrames, _animation.numJoints, numAnimatedComponents );
-
1147 printf( "[.md5anim]: animation's frame rate is %d\n", _animation.frameRate );
-
1148
-
1149 // Free temporary data allocated
-
1150 if( animFrameData )
-
1151 free( animFrameData );
-
1152
-
1153 if( baseFrame )
-
1154 free( baseFrame );
-
1155
-
1156 if( jointInfos )
-
1157 free( jointInfos );
-
1158
-
1159 // successful loading...set up animation parameters
-
1160 _animationInfo.currFrame = 0;
-
1161 _animationInfo.nextFrame = 1;
-
1162
-
1163 _animationInfo.lastTime = 0.0f;
-
1164 _animationInfo.maxTime = 1.0f / (GLfloat)_animation.frameRate;
-
1165
-
1166 // Allocate memory for animated _skeleton
-
1167 _skeleton = new MD5Joint[_animation.numJoints];
-
1168
-
1169 if( _checkAnimValidity() ) {
-
1170 _isAnimated = true;
-
1171 // compute initial pose
-
1172 animate(0.0);
-
1173 }
-
1174
-
1175 return true;
-
1176}
-
1177
-
1178// Free resources allocated for the animation.
-
1179inline void
-
1180CSCI441::MD5Model::_freeAnim()
-
1181{
-
1182 GLint i;
-
1183
-
1184 for(i = 0; i < _animation.numFrames; ++i) {
-
1185 delete _animation.skeletonFrames[i];
-
1186 _animation.skeletonFrames[i] = nullptr;
-
1187 }
-
1188
-
1189 delete[] _animation.skeletonFrames;
-
1190 _animation.skeletonFrames = nullptr;
-
1191
-
1192 delete _animation.boundingBoxes;
-
1193 _animation.boundingBoxes = nullptr;
-
1194
-
1195 delete _skeleton;
-
1196 _skeleton = nullptr;
-
1197}
-
1198
-
1199// Smoothly interpolate two skeletons
-
1200inline void
-
1201CSCI441::MD5Model::_interpolateSkeletons(GLfloat interp)
-
1202{
-
1203 const MD5Joint *skeletonA = _animation.skeletonFrames[_animationInfo.currFrame];
-
1204 const MD5Joint *skeletonB = _animation.skeletonFrames[_animationInfo.nextFrame];
-
1205
-
1206 GLint i;
+
1145 fclose( fp );
+
1146
+
1147 printf( "[.md5anim]: finished reading %s\n", filename );
+
1148 printf( "[.md5anim]: read in %d frames of %d joints with %d animated components\n", _animation.numFrames, _animation.numJoints, numAnimatedComponents );
+
1149 printf( "[.md5anim]: animation's frame rate is %d\n", _animation.frameRate );
+
1150
+
1151 // Free temporary data allocated
+
1152 if( animFrameData )
+
1153 free( animFrameData );
+
1154
+
1155 if( baseFrame )
+
1156 free( baseFrame );
+
1157
+
1158 if( jointInfos )
+
1159 free( jointInfos );
+
1160
+
1161 // successful loading...set up animation parameters
+
1162 _animationInfo.currFrame = 0;
+
1163 _animationInfo.nextFrame = 1;
+
1164
+
1165 _animationInfo.lastTime = 0.0f;
+
1166 _animationInfo.maxTime = 1.0f / (GLfloat)_animation.frameRate;
+
1167
+
1168 // Allocate memory for animated _skeleton
+
1169 _skeleton = new MD5Joint[_animation.numJoints];
+
1170
+
1171 if( _checkAnimValidity() ) {
+
1172 _isAnimated = true;
+
1173 // compute initial pose
+
1174 animate(0.0);
+
1175 }
+
1176
+
1177 return true;
+
1178}
+
1179
+
1180// Free resources allocated for the animation.
+
1181inline void
+
1182CSCI441::MD5Model::_freeAnim()
+
1183{
+
1184 GLint i;
+
1185
+
1186 for(i = 0; i < _animation.numFrames; ++i) {
+
1187 delete _animation.skeletonFrames[i];
+
1188 _animation.skeletonFrames[i] = nullptr;
+
1189 }
+
1190
+
1191 delete[] _animation.skeletonFrames;
+
1192 _animation.skeletonFrames = nullptr;
+
1193
+
1194 delete _animation.boundingBoxes;
+
1195 _animation.boundingBoxes = nullptr;
+
1196
+
1197 delete _skeleton;
+
1198 _skeleton = nullptr;
+
1199}
+
1200
+
1201// Smoothly interpolate two skeletons
+
1202inline void
+
1203CSCI441::MD5Model::_interpolateSkeletons(GLfloat interp)
+
1204{
+
1205 const MD5Joint *skeletonA = _animation.skeletonFrames[_animationInfo.currFrame];
+
1206 const MD5Joint *skeletonB = _animation.skeletonFrames[_animationInfo.nextFrame];
1207
-
1208 for(i = 0; i < _animation.numJoints; ++i) {
-
1209 // Copy parent index
-
1210 _skeleton[i].parent = skeletonA[i].parent;
-
1211
-
1212 // Linear interpolation for position
-
1213 _skeleton[i].position[0] = skeletonA[i].position[0] + interp * (skeletonB[i].position[0] - skeletonA[i].position[0]);
-
1214 _skeleton[i].position[1] = skeletonA[i].position[1] + interp * (skeletonB[i].position[1] - skeletonA[i].position[1]);
-
1215 _skeleton[i].position[2] = skeletonA[i].position[2] + interp * (skeletonB[i].position[2] - skeletonA[i].position[2]);
-
1216
-
1217 // Spherical linear interpolation for orientation
-
1218 _skeleton[i].orientation = glm::slerp(skeletonA[i].orientation, skeletonB[i].orientation, interp);
-
1219 }
-
1220}
-
1221
-
1222// Perform animation related computations. Calculate the current and
-
1223// next frames, given a delta time.
-
1224inline void
-
1225CSCI441::MD5Model::animate(GLfloat dt)
-
1226{
-
1227 GLint maxFrames = _animation.numFrames - 1;
-
1228
-
1229 _animationInfo.lastTime += dt;
+
1208 GLint i;
+
1209
+
1210 for(i = 0; i < _animation.numJoints; ++i) {
+
1211 // Copy parent index
+
1212 _skeleton[i].parent = skeletonA[i].parent;
+
1213
+
1214 // Linear interpolation for position
+
1215 _skeleton[i].position[0] = skeletonA[i].position[0] + interp * (skeletonB[i].position[0] - skeletonA[i].position[0]);
+
1216 _skeleton[i].position[1] = skeletonA[i].position[1] + interp * (skeletonB[i].position[1] - skeletonA[i].position[1]);
+
1217 _skeleton[i].position[2] = skeletonA[i].position[2] + interp * (skeletonB[i].position[2] - skeletonA[i].position[2]);
+
1218
+
1219 // Spherical linear interpolation for orientation
+
1220 _skeleton[i].orientation = glm::slerp(skeletonA[i].orientation, skeletonB[i].orientation, interp);
+
1221 }
+
1222}
+
1223
+
1224// Perform animation related computations. Calculate the current and
+
1225// next frames, given a delta time.
+
1226inline void
+
1227CSCI441::MD5Model::animate(GLfloat dt)
+
1228{
+
1229 GLint maxFrames = _animation.numFrames - 1;
1230
-
1231 // move to next frame
-
1232 if( _animationInfo.lastTime >= _animationInfo.maxTime ) {
-
1233 _animationInfo.currFrame++;
-
1234 _animationInfo.nextFrame++;
-
1235 _animationInfo.lastTime = 0.0;
-
1236
-
1237 if( _animationInfo.currFrame > maxFrames )
-
1238 _animationInfo.currFrame = 0;
-
1239
-
1240 if( _animationInfo.nextFrame > maxFrames )
-
1241 _animationInfo.nextFrame = 0;
-
1242 }
-
1243
-
1244 // Interpolate skeletons between two frames
-
1245 _interpolateSkeletons( _animationInfo.lastTime * _animation.frameRate );
-
1246}
-
1247
-
1248#endif//CSCI441_MD5_MODEL_HPP
+
1231 _animationInfo.lastTime += dt;
+
1232
+
1233 // move to next frame
+
1234 if( _animationInfo.lastTime >= _animationInfo.maxTime ) {
+
1235 _animationInfo.currFrame++;
+
1236 _animationInfo.nextFrame++;
+
1237 _animationInfo.lastTime = 0.0;
+
1238
+
1239 if( _animationInfo.currFrame > maxFrames )
+
1240 _animationInfo.currFrame = 0;
+
1241
+
1242 if( _animationInfo.nextFrame > maxFrames )
+
1243 _animationInfo.nextFrame = 0;
+
1244 }
+
1245
+
1246 // Interpolate skeletons between two frames
+
1247 _interpolateSkeletons( _animationInfo.lastTime * _animation.frameRate );
+
1248}
+
1249
+
1250#endif//CSCI441_MD5_MODEL_HPP
TextureUtils.hpp
Helper functions to work with OpenGL Textures.
-
CSCI441::MD5Model
stores a Doom3 MD5 Mesh + Animation
Definition: MD5Model.hpp:73
-
CSCI441::MD5Model::draw
void draw() const
draws all the meshes that make up the model
Definition: MD5Model.hpp:752
-
CSCI441::MD5Model::readMD5Model
bool readMD5Model(const char *FILENAME)
parses md5mesh file and allocates corresponding mesh data
Definition: MD5Model.hpp:511
-
CSCI441::MD5Model::isAnimated
bool isAnimated() const
returns if the MD5 Model has an accompanying animation
Definition: MD5Model.hpp:360
-
CSCI441::MD5Model::loadMD5Model
bool loadMD5Model(const char *MD5_MESH_FILE, const char *MD5_ANIM_FILE="")
loads a corresponding md5mesh and md5anim file to the object
Definition: MD5Model.hpp:487
-
CSCI441::MD5Model::MD5Model
MD5Model()
initializes an empty MD5 Model
Definition: MD5Model.hpp:455
+
CSCI441::MD5Model
stores a Doom3 MD5 Mesh + Animation
Definition: MD5Model.hpp:75
+
CSCI441::MD5Model::draw
void draw() const
draws all the meshes that make up the model
Definition: MD5Model.hpp:754
+
CSCI441::MD5Model::readMD5Model
bool readMD5Model(const char *FILENAME)
parses md5mesh file and allocates corresponding mesh data
Definition: MD5Model.hpp:513
+
CSCI441::MD5Model::isAnimated
bool isAnimated() const
returns if the MD5 Model has an accompanying animation
Definition: MD5Model.hpp:362
+
CSCI441::MD5Model::loadMD5Model
bool loadMD5Model(const char *MD5_MESH_FILE, const char *MD5_ANIM_FILE="")
loads a corresponding md5mesh and md5anim file to the object
Definition: MD5Model.hpp:489
+
CSCI441::MD5Model::MD5Model
MD5Model()
initializes an empty MD5 Model
Definition: MD5Model.hpp:457
CSCI441::MD5Model::operator=
MD5Model & operator=(const MD5Model &)=delete
do not allow MD5 models to be copied
-
CSCI441::MD5Model::readMD5Anim
bool readMD5Anim(const char *filename)
reads in an animation sequence from an external file
Definition: MD5Model.hpp:1042
-
CSCI441::MD5Model::allocVertexArrays
void allocVertexArrays(GLuint vPosAttribLoc, GLuint vColorAttribLoc, GLuint vTexCoordAttribLoc)
binds model VBOs to attribute pointer locations
Definition: MD5Model.hpp:824
-
CSCI441::MD5Model::animate
void animate(GLfloat dt)
advances the model forward in its animation sequence the corresponding amount of time based on frame ...
Definition: MD5Model.hpp:1225
+
CSCI441::MD5Model::readMD5Anim
bool readMD5Anim(const char *filename)
reads in an animation sequence from an external file
Definition: MD5Model.hpp:1044
+
CSCI441::MD5Model::allocVertexArrays
void allocVertexArrays(GLuint vPosAttribLoc, GLuint vColorAttribLoc, GLuint vTexCoordAttribLoc)
binds model VBOs to attribute pointer locations
Definition: MD5Model.hpp:826
+
CSCI441::MD5Model::animate
void animate(GLfloat dt)
advances the model forward in its animation sequence the corresponding amount of time based on frame ...
Definition: MD5Model.hpp:1227
CSCI441::MD5Model::MD5Model
MD5Model(const MD5Model &)=delete
do not allow MD5 models to be copied
-
CSCI441::MD5Model::~MD5Model
~MD5Model()
deallocates any used memory on the CPU and GPU
Definition: MD5Model.hpp:477
-
CSCI441::MD5Model::drawSkeleton
void drawSkeleton() const
draws the skeleton joints (as points) and bones (as lines)
Definition: MD5Model.hpp:888
+
CSCI441::MD5Model::~MD5Model
~MD5Model()
deallocates any used memory on the CPU and GPU
Definition: MD5Model.hpp:479
+
CSCI441::MD5Model::drawSkeleton
void drawSkeleton() const
draws the skeleton joints (as points) and bones (as lines)
Definition: MD5Model.hpp:890
CSCI441
CSCI441 Helper Functions for OpenGL.
Definition: ArcballCam.hpp:17
-
CSCI441::MD5Model::MD5Animation
stores an entire animation sequence for a given MD5 Model
Definition: MD5Model.hpp:278
-
CSCI441::MD5Model::MD5AnimationState
stores state of current animation frame
Definition: MD5Model.hpp:307
-
CSCI441::MD5Model::MD5BaseFrameJoint
base frame joint
Definition: MD5Model.hpp:249
-
CSCI441::MD5Model::MD5BaseFrameJoint::orientation
glm::quat orientation
joint orientation expressed as a quaternion in object space
Definition: MD5Model.hpp:257
-
CSCI441::MD5Model::MD5BoundingBox
bounding box containing the model during animation
Definition: MD5Model.hpp:264
-
CSCI441::MD5Model::MD5Joint
a joint of the MD5 Skeleton
Definition: MD5Model.hpp:79
-
CSCI441::MD5Model::MD5Joint::position
glm::vec3 position
position of the joint in object space
Definition: MD5Model.hpp:95
-
CSCI441::MD5Model::MD5Joint::orientation
glm::quat orientation
joint orientation expressed as a quaternion in object space
Definition: MD5Model.hpp:99
-
CSCI441::MD5Model::MD5Joint::name
char name[256]
joint identifier
Definition: MD5Model.hpp:87
-
CSCI441::MD5Model::MD5Joint::parent
GLint parent
index of the parent joint on skeletal tree
Definition: MD5Model.hpp:91
-
CSCI441::MD5Model::MD5JointInfo
information pertaining to each animation joint
Definition: MD5Model.hpp:227
-
CSCI441::MD5Model::MD5Mesh
mesh that comprises the model's skin
Definition: MD5Model.hpp:165
-
CSCI441::MD5Model::MD5Mesh::numTriangles
GLint numTriangles
number of triangles in the mesh triangle array
Definition: MD5Model.hpp:211
-
CSCI441::MD5Model::MD5Mesh::TextureMap
TextureMap
named entities for different texture maps applied to the model
Definition: MD5Model.hpp:185
-
CSCI441::MD5Model::MD5Mesh::DIFFUSE
@ DIFFUSE
diffuse map
Definition: MD5Model.hpp:189
-
CSCI441::MD5Model::MD5Mesh::SPECULAR
@ SPECULAR
specular map
Definition: MD5Model.hpp:193
-
CSCI441::MD5Model::MD5Mesh::NORMAL
@ NORMAL
normal map
Definition: MD5Model.hpp:197
-
CSCI441::MD5Model::MD5Mesh::textures
MD5Texture textures[4]
texture map array
Definition: MD5Model.hpp:181
-
CSCI441::MD5Model::MD5Mesh::numVertices
GLint numVertices
number of vertices in the mesh vertex array
Definition: MD5Model.hpp:207
-
CSCI441::MD5Model::MD5Mesh::triangles
MD5Triangle * triangles
array triangles comprising the mesh
Definition: MD5Model.hpp:173
-
CSCI441::MD5Model::MD5Mesh::vertices
MD5Vertex * vertices
array of vertices comprising the mesh
Definition: MD5Model.hpp:169
-
CSCI441::MD5Model::MD5Mesh::numWeights
GLint numWeights
number of weights in the mesh weight array
Definition: MD5Model.hpp:215
-
CSCI441::MD5Model::MD5Mesh::weights
MD5Weight * weights
array of weights to determine vertex position based on joint positions
Definition: MD5Model.hpp:177
-
CSCI441::MD5Model::MD5Mesh::shader
char shader[512]
base filename for all textures applied to mesh
Definition: MD5Model.hpp:220
-
CSCI441::MD5Model::MD5Texture
texture handle for the model
Definition: MD5Model.hpp:151
-
CSCI441::MD5Model::MD5Texture::texHandle
GLuint texHandle
handle of texture stored on the GPU
Definition: MD5Model.hpp:155
-
CSCI441::MD5Model::MD5Texture::filename
char filename[512]
filename texture was loaded from
Definition: MD5Model.hpp:159
-
CSCI441::MD5Model::MD5Triangle
a triangle on the mesh
Definition: MD5Model.hpp:123
-
CSCI441::MD5Model::MD5Triangle::index
GLint index[3]
vertex indices that make up triangle
Definition: MD5Model.hpp:127
-
CSCI441::MD5Model::MD5Vertex
a vertex on the mesh
Definition: MD5Model.hpp:105
-
CSCI441::MD5Model::MD5Vertex::texCoord
glm::vec2 texCoord
texture coordinate for vertex
Definition: MD5Model.hpp:109
-
CSCI441::MD5Model::MD5Vertex::start
GLint start
index of starting weight
Definition: MD5Model.hpp:113
-
CSCI441::MD5Model::MD5Vertex::count
GLint count
number of weights that determine vertex's position
Definition: MD5Model.hpp:117
-
CSCI441::MD5Model::MD5Weight
the weight for a mesh vertex
Definition: MD5Model.hpp:133
-
CSCI441::MD5Model::MD5Weight::bias
GLfloat bias
contribution of the weight
Definition: MD5Model.hpp:141
-
CSCI441::MD5Model::MD5Weight::joint
GLint joint
index of joint the weight depends on
Definition: MD5Model.hpp:137
-
CSCI441::MD5Model::MD5Weight::position
glm::vec3 position
weight's position in object space
Definition: MD5Model.hpp:145
+
CSCI441::MD5Model::MD5Animation
stores an entire animation sequence for a given MD5 Model
Definition: MD5Model.hpp:280
+
CSCI441::MD5Model::MD5AnimationState
stores state of current animation frame
Definition: MD5Model.hpp:309
+
CSCI441::MD5Model::MD5BaseFrameJoint
base frame joint
Definition: MD5Model.hpp:251
+
CSCI441::MD5Model::MD5BaseFrameJoint::orientation
glm::quat orientation
joint orientation expressed as a quaternion in object space
Definition: MD5Model.hpp:259
+
CSCI441::MD5Model::MD5BoundingBox
bounding box containing the model during animation
Definition: MD5Model.hpp:266
+
CSCI441::MD5Model::MD5Joint
a joint of the MD5 Skeleton
Definition: MD5Model.hpp:81
+
CSCI441::MD5Model::MD5Joint::position
glm::vec3 position
position of the joint in object space
Definition: MD5Model.hpp:97
+
CSCI441::MD5Model::MD5Joint::orientation
glm::quat orientation
joint orientation expressed as a quaternion in object space
Definition: MD5Model.hpp:101
+
CSCI441::MD5Model::MD5Joint::name
char name[256]
joint identifier
Definition: MD5Model.hpp:89
+
CSCI441::MD5Model::MD5Joint::parent
GLint parent
index of the parent joint on skeletal tree
Definition: MD5Model.hpp:93
+
CSCI441::MD5Model::MD5JointInfo
information pertaining to each animation joint
Definition: MD5Model.hpp:229
+
CSCI441::MD5Model::MD5Mesh
mesh that comprises the model's skin
Definition: MD5Model.hpp:167
+
CSCI441::MD5Model::MD5Mesh::numTriangles
GLint numTriangles
number of triangles in the mesh triangle array
Definition: MD5Model.hpp:213
+
CSCI441::MD5Model::MD5Mesh::TextureMap
TextureMap
named entities for different texture maps applied to the model
Definition: MD5Model.hpp:187
+
CSCI441::MD5Model::MD5Mesh::DIFFUSE
@ DIFFUSE
diffuse map
Definition: MD5Model.hpp:191
+
CSCI441::MD5Model::MD5Mesh::SPECULAR
@ SPECULAR
specular map
Definition: MD5Model.hpp:195
+
CSCI441::MD5Model::MD5Mesh::NORMAL
@ NORMAL
normal map
Definition: MD5Model.hpp:199
+
CSCI441::MD5Model::MD5Mesh::textures
MD5Texture textures[4]
texture map array
Definition: MD5Model.hpp:183
+
CSCI441::MD5Model::MD5Mesh::numVertices
GLint numVertices
number of vertices in the mesh vertex array
Definition: MD5Model.hpp:209
+
CSCI441::MD5Model::MD5Mesh::triangles
MD5Triangle * triangles
array triangles comprising the mesh
Definition: MD5Model.hpp:175
+
CSCI441::MD5Model::MD5Mesh::vertices
MD5Vertex * vertices
array of vertices comprising the mesh
Definition: MD5Model.hpp:171
+
CSCI441::MD5Model::MD5Mesh::numWeights
GLint numWeights
number of weights in the mesh weight array
Definition: MD5Model.hpp:217
+
CSCI441::MD5Model::MD5Mesh::weights
MD5Weight * weights
array of weights to determine vertex position based on joint positions
Definition: MD5Model.hpp:179
+
CSCI441::MD5Model::MD5Mesh::shader
char shader[512]
base filename for all textures applied to mesh
Definition: MD5Model.hpp:222
+
CSCI441::MD5Model::MD5Texture
texture handle for the model
Definition: MD5Model.hpp:153
+
CSCI441::MD5Model::MD5Texture::texHandle
GLuint texHandle
handle of texture stored on the GPU
Definition: MD5Model.hpp:157
+
CSCI441::MD5Model::MD5Texture::filename
char filename[512]
filename texture was loaded from
Definition: MD5Model.hpp:161
+
CSCI441::MD5Model::MD5Triangle
a triangle on the mesh
Definition: MD5Model.hpp:125
+
CSCI441::MD5Model::MD5Triangle::index
GLint index[3]
vertex indices that make up triangle
Definition: MD5Model.hpp:129
+
CSCI441::MD5Model::MD5Vertex
a vertex on the mesh
Definition: MD5Model.hpp:107
+
CSCI441::MD5Model::MD5Vertex::texCoord
glm::vec2 texCoord
texture coordinate for vertex
Definition: MD5Model.hpp:111
+
CSCI441::MD5Model::MD5Vertex::start
GLint start
index of starting weight
Definition: MD5Model.hpp:115
+
CSCI441::MD5Model::MD5Vertex::count
GLint count
number of weights that determine vertex's position
Definition: MD5Model.hpp:119
+
CSCI441::MD5Model::MD5Weight
the weight for a mesh vertex
Definition: MD5Model.hpp:135
+
CSCI441::MD5Model::MD5Weight::bias
GLfloat bias
contribution of the weight
Definition: MD5Model.hpp:143
+
CSCI441::MD5Model::MD5Weight::joint
GLint joint
index of joint the weight depends on
Definition: MD5Model.hpp:139
+
CSCI441::MD5Model::MD5Weight::position
glm::vec3 position
weight's position in object space
Definition: MD5Model.hpp:147
diff --git a/docs/_model_loader_8hpp.html b/docs/_model_loader_8hpp.html index d0de7f68..0a49af38 100644 --- a/docs/_model_loader_8hpp.html +++ b/docs/_model_loader_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_model_loader_8hpp_source.html b/docs/_model_loader_8hpp_source.html index 65000960..b1341085 100644 --- a/docs/_model_loader_8hpp_source.html +++ b/docs/_model_loader_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_open_g_l3_d_engine_8hpp.html b/docs/_open_g_l3_d_engine_8hpp.html index 957dceeb..830df361 100644 --- a/docs/_open_g_l3_d_engine_8hpp.html +++ b/docs/_open_g_l3_d_engine_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_open_g_l3_d_engine_8hpp_source.html b/docs/_open_g_l3_d_engine_8hpp_source.html index 513dc736..a6fb758d 100644 --- a/docs/_open_g_l3_d_engine_8hpp_source.html +++ b/docs/_open_g_l3_d_engine_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_open_g_l_engine_8hpp.html b/docs/_open_g_l_engine_8hpp.html index a6a00c4d..cc4bf5e4 100644 --- a/docs/_open_g_l_engine_8hpp.html +++ b/docs/_open_g_l_engine_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_open_g_l_engine_8hpp_source.html b/docs/_open_g_l_engine_8hpp_source.html index e7a991cb..d39612be 100644 --- a/docs/_open_g_l_engine_8hpp_source.html +++ b/docs/_open_g_l_engine_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_open_g_l_utils_8hpp.html b/docs/_open_g_l_utils_8hpp.html index e828f890..57be280d 100644 --- a/docs/_open_g_l_utils_8hpp.html +++ b/docs/_open_g_l_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -101,6 +101,10 @@ void CSCI441::OpenGLUtils::printOpenGLInfo ()  Prints information about our OpenGL context.
  + +void CSCI441::OpenGLUtils::printOpenGLExtensions () + Prints the list of available extensions.
+ 

Detailed Description

Helper functions to work with OpenGL 3.0+.

diff --git a/docs/_open_g_l_utils_8hpp_source.html b/docs/_open_g_l_utils_8hpp_source.html index 3f1e8c05..510fe05f 100644 --- a/docs/_open_g_l_utils_8hpp_source.html +++ b/docs/_open_g_l_utils_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -103,223 +103,228 @@
72
77 namespace OpenGLUtils {
81 void printOpenGLInfo();
-
82 };
-
83
-
84}
-
85
-
86//**********************************************************************************
-
87//**********************************************************************************
-
88// Internal definitions
+
85 [[maybe_unused]] void printOpenGLExtensions();
+
86 };
+
87
+
88}
89
-
90namespace CSCI441_INTERNAL {
-
91 void printOpenGLParamHeader(int MAJOR, int MINOR );
-
92 void printOpenGLParamIndexed(const char *FORMAT, GLenum name, GLuint index );
-
93 void printOpenGLParam(const char *FORMAT, GLenum name );
-
94 void printOpenGLParam2(const char *FORMAT, GLenum name );
-
95 void printOpenGLParam2f(const char *FORMAT, GLenum name );
-
96 [[maybe_unused]] void printOpenGLParam3(const char *FORMAT, GLenum name );
-
97 void printOpenGLParam4(const char *FORMAT, GLenum name );
-
98}
-
99
-
100//**********************************************************************************
-
101//**********************************************************************************
-
102// Outward facing function implementations
+
90//**********************************************************************************
+
91//**********************************************************************************
+
92// Internal definitions
+
93
+
94namespace CSCI441_INTERNAL {
+
95 void printOpenGLParamHeader(int MAJOR, int MINOR );
+
96 void printOpenGLParamIndexed(const char *FORMAT, GLenum name, GLuint index );
+
97 void printOpenGLParam(const char *FORMAT, GLenum name );
+
98 void printOpenGLParam2(const char *FORMAT, GLenum name );
+
99 void printOpenGLParam2f(const char *FORMAT, GLenum name );
+
100 [[maybe_unused]] void printOpenGLParam3(const char *FORMAT, GLenum name );
+
101 void printOpenGLParam4(const char *FORMAT, GLenum name );
+
102}
103
-
104inline void CSCI441::OpenGLUtils::printOpenGLInfo() {
-
105 GLint major, minor;
-
106 glGetIntegerv(GL_MAJOR_VERSION, &major);
-
107 glGetIntegerv(GL_MINOR_VERSION, &minor);
-
108
-
109 fprintf( stdout, "\n[INFO]: /--------------------------------------------------------\\\n" );
-
110 fprintf( stdout, "[INFO]: | OpenGL Information |\n" );
-
111 fprintf( stdout, "[INFO]: |--------------------------------------------------------|\n" );
-
112 fprintf( stdout, "[INFO]: | OpenGL Version: %35s |\n", glGetString(GL_VERSION) );
-
113 fprintf( stdout, "[INFO]: | OpenGL Renderer: %35s |\n", glGetString(GL_RENDERER) );
-
114 fprintf( stdout, "[INFO]: | OpenGL Vendor: %35s |\n", glGetString(GL_VENDOR) );
-
115 fprintf( stdout, "[INFO]: | Shading Version: %35s |\n", glGetString(GL_SHADING_LANGUAGE_VERSION) );
-
116
-
117 if( (major >= 2 && minor >= 0) || major > 2 ) {
-
118 CSCI441_INTERNAL::printOpenGLParamHeader( 2, 0 );
-
119 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Color Attachments: %26d |\n", GL_MAX_COLOR_ATTACHMENTS );
-
120 CSCI441_INTERNAL::printOpenGLParam2f("[INFO]: | Point Size Range: %24.2f %8.2f |\n", GL_POINT_SIZE_RANGE );
-
121 }
+
104//**********************************************************************************
+
105//**********************************************************************************
+
106// Outward facing function implementations
+
107
+
108inline void CSCI441::OpenGLUtils::printOpenGLInfo() {
+
109 GLint major = 0, minor = 0, numExtensions = 0;
+
110 glGetIntegerv(GL_MAJOR_VERSION, &major);
+
111 glGetIntegerv(GL_MINOR_VERSION, &minor);
+
112 glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+
113
+
114 fprintf( stdout, "\n[INFO]: /--------------------------------------------------------\\\n" );
+
115 fprintf( stdout, "[INFO]: | OpenGL Information |\n" );
+
116 fprintf( stdout, "[INFO]: |--------------------------------------------------------|\n" );
+
117 fprintf( stdout, "[INFO]: | OpenGL Version: %35s |\n", glGetString(GL_VERSION) );
+
118 fprintf( stdout, "[INFO]: | OpenGL Renderer: %35s |\n", glGetString(GL_RENDERER) );
+
119 fprintf( stdout, "[INFO]: | OpenGL Vendor: %35s |\n", glGetString(GL_VENDOR) );
+
120 fprintf( stdout, "[INFO]: | Shading Version: %35s |\n", glGetString(GL_SHADING_LANGUAGE_VERSION) );
+
121 fprintf( stdout, "[INFO]: | Number of Extensions: %30d |\n", numExtensions );
122
-
123 if( (major >= 2 && minor >= 1) || major > 2 ) {
-
124 CSCI441_INTERNAL::printOpenGLParamHeader( 2, 1 );
-
125 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Attributes: %26d |\n", GL_MAX_VERTEX_ATTRIBS );
-
126 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Uniforms: %28d |\n", GL_MAX_VERTEX_UNIFORM_COMPONENTS );
-
127 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Textures: %28d |\n", GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS );
-
128 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Outputs: %29d |\n", GL_MAX_VERTEX_OUTPUT_COMPONENTS );
-
129 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Inputs: %28d |\n", GL_MAX_FRAGMENT_INPUT_COMPONENTS );
-
130 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Uniforms: %26d |\n", GL_MAX_FRAGMENT_UNIFORM_COMPONENTS );
-
131 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Textures: %26d |\n", GL_MAX_TEXTURE_IMAGE_UNITS );
-
132 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Draw Buffers: %31d |\n", GL_MAX_DRAW_BUFFERS );
-
133 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Textures Combined: %26d |\n", GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS );
-
134 }
-
135
-
136 if( (major >= 3 && minor >= 0) || major > 3 ) {
-
137 CSCI441_INTERNAL::printOpenGLParamHeader( 3, 0 );
-
138 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Feedback Buffers: %17d |\n", GL_MAX_TRANSFORM_FEEDBACK_BUFFERS );
-
139 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Separate Attributes: %14d |\n", GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS );
-
140 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Separate Components: %14d |\n", GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS );
-
141 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Interleaved Buffers: %14d |\n", GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS );
-
142 }
-
143
-
144 if( (major >= 3 && minor >= 1) || major > 3 ) {
-
145 CSCI441_INTERNAL::printOpenGLParamHeader( 3, 1 );
-
146 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Uniform Blocks: %20d |\n", GL_MAX_FRAGMENT_UNIFORM_BLOCKS );
-
147 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Uniform Blocks: %22d |\n", GL_MAX_VERTEX_UNIFORM_BLOCKS );
-
148 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max Uniform Blocks Size: %20d bytes |\n", GL_MAX_UNIFORM_BLOCK_SIZE );
-
149 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Uniform Blocks: %20d |\n", GL_MAX_COMBINED_UNIFORM_BLOCKS );
-
150 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Uniform Bindings: %27d |\n", GL_MAX_UNIFORM_BUFFER_BINDINGS );
-
151 }
-
152
-
153 if( (major >= 3 && minor >= 2) || major > 3 ) {
-
154 CSCI441_INTERNAL::printOpenGLParamHeader( 3, 2 );
-
155 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Uniforms: %26d |\n", GL_MAX_GEOMETRY_UNIFORM_COMPONENTS );
-
156 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Uniform Blocks: %20d |\n", GL_MAX_GEOMETRY_UNIFORM_BLOCKS );
-
157 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Textures: %26d |\n", GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS );
-
158 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Inputs: %28d |\n", GL_MAX_GEOMETRY_INPUT_COMPONENTS );
-
159 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Output Vertices: %19d |\n", GL_MAX_GEOMETRY_OUTPUT_VERTICES );
-
160 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Total Output Components: %11d |\n", GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS );
-
161 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Outputs: %27d |\n", GL_MAX_GEOMETRY_OUTPUT_COMPONENTS );
-
162 }
-
163
-
164 if( (major >= 4 && minor >= 0) || major > 4 ) {
-
165 CSCI441_INTERNAL::printOpenGLParamHeader( 4, 0 );
-
166 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Patch Vertices: %29d |\n", GL_MAX_PATCH_VERTICES );
-
167 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tessellation Level: %25d |\n", GL_MAX_TESS_GEN_LEVEL );
-
168 CSCI441_INTERNAL::printOpenGLParam4("[INFO]: | Default Tessellation Outer Levels: %7d %2d %2d %2d |\n", GL_PATCH_DEFAULT_OUTER_LEVEL );
-
169 CSCI441_INTERNAL::printOpenGLParam2("[INFO]: | Default Tessellation Inner Levels: %13d %2d |\n", GL_PATCH_DEFAULT_INNER_LEVEL );
-
170 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Inputs: %24d |\n", GL_MAX_GEOMETRY_INPUT_COMPONENTS );
-
171 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Uniforms: %22d |\n", GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS );
-
172 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Uniform Blocks: %16d |\n", GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS );
-
173 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Textures: %22d |\n", GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS );
-
174 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Outputs: %23d |\n", GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS );
-
175 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Inputs: %21d |\n", GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS );
-
176 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Uniforms: %19d |\n", GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS );
-
177 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Uniform Blocks: %13d |\n", GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS );
-
178 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Textures: %19d |\n", GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS );
-
179 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Outputs: %20d |\n", GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS );
-
180 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Invocations: %23d |\n", GL_MAX_GEOMETRY_SHADER_INVOCATIONS );
-
181 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Streams: %29d |\n", GL_MAX_VERTEX_STREAMS );
-
182 }
-
183
-
184 if( (major >= 4 && minor >= 2) || major > 4 ) {
-
185 CSCI441_INTERNAL::printOpenGLParamHeader( 4, 2 );
-
186 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Atomic Counters: %21d |\n", GL_MAX_VERTEX_ATOMIC_COUNTERS );
-
187 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Atomic Counters: %15d |\n", GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS );
-
188 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Atomic Counters: %12d |\n", GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS );
-
189 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Atomic Counters: %19d |\n", GL_MAX_GEOMETRY_ATOMIC_COUNTERS );
-
190 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Atomic Counters: %19d |\n", GL_MAX_FRAGMENT_ATOMIC_COUNTERS );
-
191 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Atomic Counters: %19d |\n", GL_MAX_COMBINED_ATOMIC_COUNTERS );
-
192 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Atomic Counter Buffers: %14d |\n", GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS );
-
193 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Atomic Counter Buffers: %8d |\n", GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS );
-
194 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Atomic Counter Buffers: %5d |\n", GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS );
-
195 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Atomic Counter Buffers: %12d |\n", GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS );
-
196 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Atomic Counter Buffers: %12d |\n", GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS );
-
197 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Atomic Counter Buffers: %12d |\n", GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS );
-
198 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Atomic Counter Buffer Bindings: %13d |\n", GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS );
-
199 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Image Uniforms: %22d |\n", GL_MAX_VERTEX_IMAGE_UNIFORMS );
-
200 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Image Uniforms: %16d |\n", GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS );
-
201 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Image Uniforms: %13d |\n", GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS );
-
202 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Image Uniforms: %20d |\n", GL_MAX_GEOMETRY_IMAGE_UNIFORMS );
-
203 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Image Uniforms: %20d |\n", GL_MAX_FRAGMENT_IMAGE_UNIFORMS );
-
204 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Image Uniforms: %20d |\n", GL_MAX_IMAGE_UNITS );
-
205 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Shader Storage Buffer Bindings: %13d |\n", GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS );
-
206 }
-
207
-
208 if( (major >= 4 && minor >= 3) || major > 4 ) {
-
209 CSCI441_INTERNAL::printOpenGLParamHeader( 4, 3 );
-
210 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Uniforms: %27d |\n", GL_MAX_COMPUTE_UNIFORM_COMPONENTS );
-
211 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Uniform Blocks: %21d |\n", GL_MAX_COMPUTE_UNIFORM_BLOCKS );
-
212 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Textures: %27d |\n", GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS );
-
213 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Image Uniforms: %21d |\n", GL_MAX_COMPUTE_IMAGE_UNIFORMS );
-
214 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Atomic Counters: %20d |\n", GL_MAX_COMPUTE_ATOMIC_COUNTERS );
-
215 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Atomic Counter Buffers: %13d |\n", GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS );
-
216
-
217 CSCI441_INTERNAL::printOpenGLParamIndexed("[INFO]: | Max # Work Groups Per Dispatch: %6d", GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0 );
-
218 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d", GL_MAX_COMPUTE_WORK_GROUP_COUNT, 1 );
-
219 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d |\n", GL_MAX_COMPUTE_WORK_GROUP_COUNT, 2 );
-
220
-
221 CSCI441_INTERNAL::printOpenGLParamIndexed("[INFO]: | Max Work Groups Size: %16d", GL_MAX_COMPUTE_WORK_GROUP_SIZE, 0 );
-
222 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d", GL_MAX_COMPUTE_WORK_GROUP_SIZE, 1 );
-
223 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d |\n", GL_MAX_COMPUTE_WORK_GROUP_SIZE, 2 );
-
224
-
225 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Invocations Per Work Group: %18d |\n", GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS );
-
226 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max Total Storage Size: %22d bytes |\n", GL_MAX_COMPUTE_SHARED_MEMORY_SIZE );
-
227 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Shader Storage Blocks: %15d |\n", GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS );
-
228 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Shader Storage Blocks: %9d |\n", GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS );
-
229 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Shader Storage Blocks: %6d |\n", GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS );
-
230 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Shader Storage Blocks: %13d |\n", GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS );
-
231 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Shader Storage Blocks: %13d |\n", GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS );
-
232 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Shader Storage Blocks: %14d |\n", GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS );
-
233 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Shader Storage Blocks: %13d |\n", GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS );
-
234 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Shader Output Resources: %11d |\n", GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES );
-
235 }
-
236
-
237 GLint numExtensions = 0;
-
238 glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
-
239 fprintf( stdout, "[INFO]: >--------------------------------------------------------<\n" );
-
240 fprintf( stdout, "[INFO]: | %3d OpenGL Extensions |\n", numExtensions );
-
241 fprintf( stdout, "[INFO]: >--------------------------------------------------------<\n" );
-
242 for (int i = 0; i < numExtensions; i++) {
-
243 fprintf( stdout, "[INFO]: | Extension #%2d: %37s |\n", (i+1), glGetStringi(GL_EXTENSIONS, i) );
-
244 }
+
123 if( (major >= 2 && minor >= 0) || major > 2 ) {
+
124 CSCI441_INTERNAL::printOpenGLParamHeader( 2, 0 );
+
125 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Color Attachments: %26d |\n", GL_MAX_COLOR_ATTACHMENTS );
+
126 CSCI441_INTERNAL::printOpenGLParam2f("[INFO]: | Point Size Range: %24.2f %8.2f |\n", GL_POINT_SIZE_RANGE );
+
127 }
+
128
+
129 if( (major >= 2 && minor >= 1) || major > 2 ) {
+
130 CSCI441_INTERNAL::printOpenGLParamHeader( 2, 1 );
+
131 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Attributes: %26d |\n", GL_MAX_VERTEX_ATTRIBS );
+
132 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Uniforms: %28d |\n", GL_MAX_VERTEX_UNIFORM_COMPONENTS );
+
133 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Textures: %28d |\n", GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS );
+
134 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Outputs: %29d |\n", GL_MAX_VERTEX_OUTPUT_COMPONENTS );
+
135 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Inputs: %28d |\n", GL_MAX_FRAGMENT_INPUT_COMPONENTS );
+
136 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Uniforms: %26d |\n", GL_MAX_FRAGMENT_UNIFORM_COMPONENTS );
+
137 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Textures: %26d |\n", GL_MAX_TEXTURE_IMAGE_UNITS );
+
138 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Draw Buffers: %31d |\n", GL_MAX_DRAW_BUFFERS );
+
139 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Textures Combined: %26d |\n", GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS );
+
140 }
+
141
+
142 if( (major >= 3 && minor >= 0) || major > 3 ) {
+
143 CSCI441_INTERNAL::printOpenGLParamHeader( 3, 0 );
+
144 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Feedback Buffers: %17d |\n", GL_MAX_TRANSFORM_FEEDBACK_BUFFERS );
+
145 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Separate Attributes: %14d |\n", GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS );
+
146 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Separate Components: %14d |\n", GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS );
+
147 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Transform Interleaved Buffers: %14d |\n", GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS );
+
148 }
+
149
+
150 if( (major >= 3 && minor >= 1) || major > 3 ) {
+
151 CSCI441_INTERNAL::printOpenGLParamHeader( 3, 1 );
+
152 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Uniform Blocks: %20d |\n", GL_MAX_FRAGMENT_UNIFORM_BLOCKS );
+
153 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Uniform Blocks: %22d |\n", GL_MAX_VERTEX_UNIFORM_BLOCKS );
+
154 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max Uniform Blocks Size: %20d bytes |\n", GL_MAX_UNIFORM_BLOCK_SIZE );
+
155 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Uniform Blocks: %20d |\n", GL_MAX_COMBINED_UNIFORM_BLOCKS );
+
156 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Uniform Bindings: %27d |\n", GL_MAX_UNIFORM_BUFFER_BINDINGS );
+
157 }
+
158
+
159 if( (major >= 3 && minor >= 2) || major > 3 ) {
+
160 CSCI441_INTERNAL::printOpenGLParamHeader( 3, 2 );
+
161 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Uniforms: %26d |\n", GL_MAX_GEOMETRY_UNIFORM_COMPONENTS );
+
162 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Uniform Blocks: %20d |\n", GL_MAX_GEOMETRY_UNIFORM_BLOCKS );
+
163 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Textures: %26d |\n", GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS );
+
164 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Inputs: %28d |\n", GL_MAX_GEOMETRY_INPUT_COMPONENTS );
+
165 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Output Vertices: %19d |\n", GL_MAX_GEOMETRY_OUTPUT_VERTICES );
+
166 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Total Output Components: %11d |\n", GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS );
+
167 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Outputs: %27d |\n", GL_MAX_GEOMETRY_OUTPUT_COMPONENTS );
+
168 }
+
169
+
170 if( (major >= 4 && minor >= 0) || major > 4 ) {
+
171 CSCI441_INTERNAL::printOpenGLParamHeader( 4, 0 );
+
172 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Patch Vertices: %29d |\n", GL_MAX_PATCH_VERTICES );
+
173 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tessellation Level: %25d |\n", GL_MAX_TESS_GEN_LEVEL );
+
174 CSCI441_INTERNAL::printOpenGLParam4("[INFO]: | Default Tessellation Outer Levels: %7d %2d %2d %2d |\n", GL_PATCH_DEFAULT_OUTER_LEVEL );
+
175 CSCI441_INTERNAL::printOpenGLParam2("[INFO]: | Default Tessellation Inner Levels: %13d %2d |\n", GL_PATCH_DEFAULT_INNER_LEVEL );
+
176 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Inputs: %24d |\n", GL_MAX_GEOMETRY_INPUT_COMPONENTS );
+
177 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Uniforms: %22d |\n", GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS );
+
178 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Uniform Blocks: %16d |\n", GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS );
+
179 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Textures: %22d |\n", GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS );
+
180 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Outputs: %23d |\n", GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS );
+
181 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Inputs: %21d |\n", GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS );
+
182 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Uniforms: %19d |\n", GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS );
+
183 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Uniform Blocks: %13d |\n", GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS );
+
184 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Textures: %19d |\n", GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS );
+
185 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Outputs: %20d |\n", GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS );
+
186 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Invocations: %23d |\n", GL_MAX_GEOMETRY_SHADER_INVOCATIONS );
+
187 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Streams: %29d |\n", GL_MAX_VERTEX_STREAMS );
+
188 }
+
189
+
190 if( (major >= 4 && minor >= 2) || major > 4 ) {
+
191 CSCI441_INTERNAL::printOpenGLParamHeader( 4, 2 );
+
192 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Atomic Counters: %21d |\n", GL_MAX_VERTEX_ATOMIC_COUNTERS );
+
193 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Atomic Counters: %15d |\n", GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS );
+
194 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Atomic Counters: %12d |\n", GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS );
+
195 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Atomic Counters: %19d |\n", GL_MAX_GEOMETRY_ATOMIC_COUNTERS );
+
196 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Atomic Counters: %19d |\n", GL_MAX_FRAGMENT_ATOMIC_COUNTERS );
+
197 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Atomic Counters: %19d |\n", GL_MAX_COMBINED_ATOMIC_COUNTERS );
+
198 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Atomic Counter Buffers: %14d |\n", GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS );
+
199 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Atomic Counter Buffers: %8d |\n", GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS );
+
200 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Atomic Counter Buffers: %5d |\n", GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS );
+
201 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Atomic Counter Buffers: %12d |\n", GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS );
+
202 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Atomic Counter Buffers: %12d |\n", GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS );
+
203 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Atomic Counter Buffers: %12d |\n", GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS );
+
204 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Atomic Counter Buffer Bindings: %13d |\n", GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS );
+
205 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Image Uniforms: %22d |\n", GL_MAX_VERTEX_IMAGE_UNIFORMS );
+
206 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Image Uniforms: %16d |\n", GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS );
+
207 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Image Uniforms: %13d |\n", GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS );
+
208 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Image Uniforms: %20d |\n", GL_MAX_GEOMETRY_IMAGE_UNIFORMS );
+
209 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Image Uniforms: %20d |\n", GL_MAX_FRAGMENT_IMAGE_UNIFORMS );
+
210 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Image Uniforms: %20d |\n", GL_MAX_IMAGE_UNITS );
+
211 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Shader Storage Buffer Bindings: %13d |\n", GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS );
+
212 }
+
213
+
214 if( (major >= 4 && minor >= 3) || major > 4 ) {
+
215 CSCI441_INTERNAL::printOpenGLParamHeader( 4, 3 );
+
216 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Uniforms: %27d |\n", GL_MAX_COMPUTE_UNIFORM_COMPONENTS );
+
217 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Uniform Blocks: %21d |\n", GL_MAX_COMPUTE_UNIFORM_BLOCKS );
+
218 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Textures: %27d |\n", GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS );
+
219 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Image Uniforms: %21d |\n", GL_MAX_COMPUTE_IMAGE_UNIFORMS );
+
220 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Atomic Counters: %20d |\n", GL_MAX_COMPUTE_ATOMIC_COUNTERS );
+
221 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Atomic Counter Buffers: %13d |\n", GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS );
+
222
+
223 CSCI441_INTERNAL::printOpenGLParamIndexed("[INFO]: | Max # Work Groups Per Dispatch: %6d", GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0 );
+
224 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d", GL_MAX_COMPUTE_WORK_GROUP_COUNT, 1 );
+
225 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d |\n", GL_MAX_COMPUTE_WORK_GROUP_COUNT, 2 );
+
226
+
227 CSCI441_INTERNAL::printOpenGLParamIndexed("[INFO]: | Max Work Groups Size: %16d", GL_MAX_COMPUTE_WORK_GROUP_SIZE, 0 );
+
228 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d", GL_MAX_COMPUTE_WORK_GROUP_SIZE, 1 );
+
229 CSCI441_INTERNAL::printOpenGLParamIndexed(" %6d |\n", GL_MAX_COMPUTE_WORK_GROUP_SIZE, 2 );
+
230
+
231 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Invocations Per Work Group: %18d |\n", GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS );
+
232 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max Total Storage Size: %22d bytes |\n", GL_MAX_COMPUTE_SHARED_MEMORY_SIZE );
+
233 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Vertex Shader Storage Blocks: %15d |\n", GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS );
+
234 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Control Shader Storage Blocks: %9d |\n", GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS );
+
235 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Tess Evaluation Shader Storage Blocks: %6d |\n", GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS );
+
236 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Geometry Shader Storage Blocks: %13d |\n", GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS );
+
237 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Fragment Shader Storage Blocks: %13d |\n", GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS );
+
238 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Compute Shader Storage Blocks: %14d |\n", GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS );
+
239 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Shader Storage Blocks: %13d |\n", GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS );
+
240 CSCI441_INTERNAL::printOpenGLParam( "[INFO]: | Max # Combined Shader Output Resources: %11d |\n", GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES );
+
241 }
+
242
+
243 fprintf( stdout, "[INFO]: \\--------------------------------------------------------/\n\n");
+
244}
245
-
246 fprintf( stdout, "[INFO]: \\--------------------------------------------------------/\n\n");
-
247}
-
248
-
249
-
250//**********************************************************************************
-
251//**********************************************************************************
-
252// Internal function implementations
-
253
-
254inline void CSCI441_INTERNAL::printOpenGLParamHeader( const int MAJOR, const int MINOR ) {
-
255 fprintf( stdout, "[INFO]: >--------------------------------------------------------<\n" );
-
256 fprintf( stdout, "[INFO]: | OpenGL %d.%d Settings |\n", MAJOR, MINOR );
-
257 fprintf( stdout, "[INFO]: |--------------------------------------------------------|\n" );
-
258}
-
259
-
260inline void CSCI441_INTERNAL::printOpenGLParamIndexed(const char * const FORMAT, const GLenum name, const GLuint index ) {
-
261 GLint value = 0;
-
262 glGetIntegeri_v( name, index, &value );
-
263 fprintf(stdout, FORMAT, value );
-
264}
-
265
-
266inline void CSCI441_INTERNAL::printOpenGLParam(const char * const FORMAT, const GLenum name ) {
-
267 GLint value = 0;
-
268 glGetIntegerv( name, &value );
-
269 fprintf(stdout, FORMAT, value );
-
270}
-
271
-
272inline void CSCI441_INTERNAL::printOpenGLParam2(const char * const FORMAT, const GLenum name ) {
-
273 GLint values[2] = {0,0};
-
274 glGetIntegerv( name, values );
-
275 fprintf(stdout, FORMAT, values[0], values[1] );
-
276}
-
277
-
278inline void CSCI441_INTERNAL::printOpenGLParam2f(const char * const FORMAT, const GLenum name ) {
-
279 GLfloat values[2] = {0,0};
-
280 glGetFloatv( name, values );
-
281 fprintf(stdout, FORMAT, values[0], values[1] );
-
282}
-
283
-
284[[maybe_unused]]
-
285inline void CSCI441_INTERNAL::printOpenGLParam3(const char * const FORMAT, const GLenum name ) {
-
286 GLint values[3] = {0,0,0};
-
287 glGetIntegerv( name, values );
-
288 fprintf(stdout, FORMAT, values[0], values[1], values[2] );
+
246[[maybe_unused]]
+
247inline void CSCI441::OpenGLUtils::printOpenGLExtensions() {
+
248 GLint numExtensions = 0;
+
249 glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+
250
+
251 fprintf( stdout, "[INFO]: Number of Extensions: %4d\n", numExtensions );
+
252 for (int i = 0; i < numExtensions; i++) {
+
253 fprintf( stdout, "[INFO]: Extension #%3d: %s \n", (i+1), glGetStringi(GL_EXTENSIONS, i) );
+
254 }
+
255}
+
256
+
257//**********************************************************************************
+
258//**********************************************************************************
+
259// Internal function implementations
+
260
+
261inline void CSCI441_INTERNAL::printOpenGLParamHeader( const int MAJOR, const int MINOR ) {
+
262 fprintf( stdout, "[INFO]: >--------------------------------------------------------<\n" );
+
263 fprintf( stdout, "[INFO]: | OpenGL %d.%d Settings |\n", MAJOR, MINOR );
+
264 fprintf( stdout, "[INFO]: |--------------------------------------------------------|\n" );
+
265}
+
266
+
267inline void CSCI441_INTERNAL::printOpenGLParamIndexed(const char * const FORMAT, const GLenum name, const GLuint index ) {
+
268 GLint value = 0;
+
269 glGetIntegeri_v( name, index, &value );
+
270 fprintf(stdout, FORMAT, value );
+
271}
+
272
+
273inline void CSCI441_INTERNAL::printOpenGLParam(const char * const FORMAT, const GLenum name ) {
+
274 GLint value = 0;
+
275 glGetIntegerv( name, &value );
+
276 fprintf(stdout, FORMAT, value );
+
277}
+
278
+
279inline void CSCI441_INTERNAL::printOpenGLParam2(const char * const FORMAT, const GLenum name ) {
+
280 GLint values[2] = {0,0};
+
281 glGetIntegerv( name, values );
+
282 fprintf(stdout, FORMAT, values[0], values[1] );
+
283}
+
284
+
285inline void CSCI441_INTERNAL::printOpenGLParam2f(const char * const FORMAT, const GLenum name ) {
+
286 GLfloat values[2] = {0,0};
+
287 glGetFloatv( name, values );
+
288 fprintf(stdout, FORMAT, values[0], values[1] );
289}
290
-
291inline void CSCI441_INTERNAL::printOpenGLParam4(const char * const FORMAT, const GLenum name ) {
-
292 GLint values[4] = {0,0,0,0};
-
293 glGetIntegerv( name, values );
-
294 fprintf(stdout, FORMAT, values[0], values[1], values[2], values[3] );
-
295}
-
296
-
297#endif // CSCI441_OPENGL_UTILS_H
-
CSCI441::OpenGLUtils::printOpenGLInfo
void printOpenGLInfo()
Prints information about our OpenGL context.
Definition: OpenGLUtils.hpp:104
+
291[[maybe_unused]]
+
292inline void CSCI441_INTERNAL::printOpenGLParam3(const char * const FORMAT, const GLenum name ) {
+
293 GLint values[3] = {0,0,0};
+
294 glGetIntegerv( name, values );
+
295 fprintf(stdout, FORMAT, values[0], values[1], values[2] );
+
296}
+
297
+
298inline void CSCI441_INTERNAL::printOpenGLParam4(const char * const FORMAT, const GLenum name ) {
+
299 GLint values[4] = {0,0,0,0};
+
300 glGetIntegerv( name, values );
+
301 fprintf(stdout, FORMAT, values[0], values[1], values[2], values[3] );
+
302}
+
303
+
304#endif // CSCI441_OPENGL_UTILS_H
+
CSCI441::OpenGLUtils::printOpenGLInfo
void printOpenGLInfo()
Prints information about our OpenGL context.
Definition: OpenGLUtils.hpp:108
+
CSCI441::OpenGLUtils::printOpenGLExtensions
void printOpenGLExtensions()
Prints the list of available extensions.
Definition: OpenGLUtils.hpp:247
CSCI441
CSCI441 Helper Functions for OpenGL.
Definition: ArcballCam.hpp:17
OpenGLUtils
contains OpenGL Utility functions
diff --git a/docs/_orthographic_camera_8hpp_source.html b/docs/_orthographic_camera_8hpp_source.html index 89e7c2ec..2468353a 100644 --- a/docs/_orthographic_camera_8hpp_source.html +++ b/docs/_orthographic_camera_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -82,7 +82,7 @@
7
11 class OrthographicCamera : public CSCI441::Camera {
12 public:
-
22 [[maybe_unused]] explicit OrthographicCamera(GLfloat minX = -1.0f, GLfloat maxX = 1.0f, GLfloat minY = -1.0f, GLfloat maxY = 1.0f, GLfloat minZ = -1.0f, GLfloat maxZ = 1.0f);
+
22 explicit OrthographicCamera(GLfloat minX = -1.0f, GLfloat maxX = 1.0f, GLfloat minY = -1.0f, GLfloat maxY = 1.0f, GLfloat minZ = -1.0f, GLfloat maxZ = 1.0f);
23
24 private:
25 void _updateProjectionMatrix();
@@ -97,27 +97,26 @@
34
35}
36
-
37[[maybe_unused]]
-
38inline CSCI441::OrthographicCamera::OrthographicCamera(
-
39 GLfloat minX,
-
40 GLfloat maxX,
-
41 GLfloat minY,
-
42 GLfloat maxY,
-
43 GLfloat minZ,
-
44 GLfloat maxZ
-
45) : _minX(minX), _maxX(maxX), _minY(minY), _maxY(maxY), _minZ(minZ), _maxZ(maxZ) {
-
46 _updateProjectionMatrix();
-
47}
-
48
-
49void CSCI441::OrthographicCamera::_updateProjectionMatrix() {
-
50 mProjectionMatrix = glm::ortho( _minX, _maxX, _minY, _maxY, _minZ, _maxZ );
-
51}
-
52
-
53#endif//CSCI441_ORTHOGRAPHIC_CAMERA_HPP
+
37inline CSCI441::OrthographicCamera::OrthographicCamera(
+
38 GLfloat minX,
+
39 GLfloat maxX,
+
40 GLfloat minY,
+
41 GLfloat maxY,
+
42 GLfloat minZ,
+
43 GLfloat maxZ
+
44) : _minX(minX), _maxX(maxX), _minY(minY), _maxY(maxY), _minZ(minZ), _maxZ(maxZ) {
+
45 _updateProjectionMatrix();
+
46}
+
47
+
48inline void CSCI441::OrthographicCamera::_updateProjectionMatrix() {
+
49 mProjectionMatrix = glm::ortho( _minX, _maxX, _minY, _maxY, _minZ, _maxZ );
+
50}
+
51
+
52#endif//CSCI441_ORTHOGRAPHIC_CAMERA_HPP
Camera.hpp
Abstract Camera class to be placed (position and orientation) within our scene.
CSCI441::Camera
Abstract Class to represent a synthetic camera. The following methods must be overridden:
Definition: Camera.hpp:37
CSCI441::OrthographicCamera
Abstract Class to represent an orthographic camera. Stores box clip planes.
Definition: OrthographicCamera.hpp:11
-
CSCI441::OrthographicCamera::OrthographicCamera
OrthographicCamera(GLfloat minX=-1.0f, GLfloat maxX=1.0f, GLfloat minY=-1.0f, GLfloat maxY=1.0f, GLfloat minZ=-1.0f, GLfloat maxZ=1.0f)
initializes the OrthographicCamera
Definition: OrthographicCamera.hpp:38
+
CSCI441::OrthographicCamera::OrthographicCamera
OrthographicCamera(GLfloat minX=-1.0f, GLfloat maxX=1.0f, GLfloat minY=-1.0f, GLfloat maxY=1.0f, GLfloat minZ=-1.0f, GLfloat maxZ=1.0f)
initializes the OrthographicCamera
Definition: OrthographicCamera.hpp:37
CSCI441
CSCI441 Helper Functions for OpenGL.
Definition: ArcballCam.hpp:17
diff --git a/docs/_perspective_camera_8hpp_source.html b/docs/_perspective_camera_8hpp_source.html index 84054891..49512369 100644 --- a/docs/_perspective_camera_8hpp_source.html +++ b/docs/_perspective_camera_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_shader_program_8hpp.html b/docs/_shader_program_8hpp.html index d202efb6..a0084e94 100644 --- a/docs/_shader_program_8hpp.html +++ b/docs/_shader_program_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_shader_program_8hpp_source.html b/docs/_shader_program_8hpp_source.html index 7b62cbf7..10316d9f 100644 --- a/docs/_shader_program_8hpp_source.html +++ b/docs/_shader_program_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_shader_program_pipeline_8hpp.html b/docs/_shader_program_pipeline_8hpp.html index e8932c54..cb821b2b 100644 --- a/docs/_shader_program_pipeline_8hpp.html +++ b/docs/_shader_program_pipeline_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_shader_program_pipeline_8hpp_source.html b/docs/_shader_program_pipeline_8hpp_source.html index f167ef08..cb6f8c94 100644 --- a/docs/_shader_program_pipeline_8hpp_source.html +++ b/docs/_shader_program_pipeline_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_shader_utils_8hpp.html b/docs/_shader_utils_8hpp.html index 42bb99b6..24ef6164 100644 --- a/docs/_shader_utils_8hpp.html +++ b/docs/_shader_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_shader_utils_8hpp_source.html b/docs/_shader_utils_8hpp_source.html index 89b13023..9c01a9e2 100644 --- a/docs/_shader_utils_8hpp_source.html +++ b/docs/_shader_utils_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -569,13 +569,13 @@
506 sprintf(long_name, "%s[%i]", name, j);
507 int location = glGetUniformLocation(programHandle, long_name);
508 if(location != -1) {
-
509 if (sDEBUG) printf("[INtFO]: | %2i) type: %-15s name: %-13s loc: %2i |\n", i, GLSL_type_to_string(type), long_name, location);
+
509 if (sDEBUG) printf("[INFO]: | %2i) type: %-15s name: %-13s loc: %2i |\n", i, GLSL_type_to_string(type), long_name, location);
510 }
511 }
512 } else {
513 int location = glGetUniformLocation(programHandle, name);
514 if(location != -1) {
-
515 if (sDEBUG) printf("[INsFO]: | %2i) type: %-15s name: %-13s loc: %2i |\n",i, GLSL_type_to_string(type), name, location);
+
515 if (sDEBUG) printf("[INFO]: | %2i) type: %-15s name: %-13s loc: %2i |\n",i, GLSL_type_to_string(type), name, location);
516 }
517 }
518 }
diff --git a/docs/_simple_shader_8hpp.html b/docs/_simple_shader_8hpp.html index 8641ffa2..ae41e3b1 100644 --- a/docs/_simple_shader_8hpp.html +++ b/docs/_simple_shader_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_simple_shader_8hpp_source.html b/docs/_simple_shader_8hpp_source.html index f0dcd514..3be73fb2 100644 --- a/docs/_simple_shader_8hpp_source.html +++ b/docs/_simple_shader_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_texture_utils_8hpp.html b/docs/_texture_utils_8hpp.html index c3cc4bea..4fec91a8 100644 --- a/docs/_texture_utils_8hpp.html +++ b/docs/_texture_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_texture_utils_8hpp_source.html b/docs/_texture_utils_8hpp_source.html index 64bc34d1..8594068c 100644 --- a/docs/_texture_utils_8hpp_source.html +++ b/docs/_texture_utils_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_uniform_buffer_object_8hpp.html b/docs/_uniform_buffer_object_8hpp.html index 63db2c9e..d36fa31d 100644 --- a/docs/_uniform_buffer_object_8hpp.html +++ b/docs/_uniform_buffer_object_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_uniform_buffer_object_8hpp_source.html b/docs/_uniform_buffer_object_8hpp_source.html index ee1f4a7f..2692ff94 100644 --- a/docs/_uniform_buffer_object_8hpp_source.html +++ b/docs/_uniform_buffer_object_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/annotated.html b/docs/annotated.html index 6d503457..b3868ff9 100644 --- a/docs/annotated.html +++ b/docs/annotated.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_arcball_cam-members.html b/docs/class_c_s_c_i441_1_1_arcball_cam-members.html index ae30326d..7e88e8e0 100644 --- a/docs/class_c_s_c_i441_1_1_arcball_cam-members.html +++ b/docs/class_c_s_c_i441_1_1_arcball_cam-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_arcball_cam.html b/docs/class_c_s_c_i441_1_1_arcball_cam.html index 0774c9c2..706c8875 100644 --- a/docs/class_c_s_c_i441_1_1_arcball_cam.html +++ b/docs/class_c_s_c_i441_1_1_arcball_cam.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_camera-members.html b/docs/class_c_s_c_i441_1_1_camera-members.html index f38ed43b..4af4d216 100644 --- a/docs/class_c_s_c_i441_1_1_camera-members.html +++ b/docs/class_c_s_c_i441_1_1_camera-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_camera.html b/docs/class_c_s_c_i441_1_1_camera.html index 58625f8a..382bb105 100644 --- a/docs/class_c_s_c_i441_1_1_camera.html +++ b/docs/class_c_s_c_i441_1_1_camera.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_compute_shader_program-members.html b/docs/class_c_s_c_i441_1_1_compute_shader_program-members.html index 5ed3254e..a5665dce 100644 --- a/docs/class_c_s_c_i441_1_1_compute_shader_program-members.html +++ b/docs/class_c_s_c_i441_1_1_compute_shader_program-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_compute_shader_program.html b/docs/class_c_s_c_i441_1_1_compute_shader_program.html index d9fd0040..de0ee19f 100644 --- a/docs/class_c_s_c_i441_1_1_compute_shader_program.html +++ b/docs/class_c_s_c_i441_1_1_compute_shader_program.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_fixed_cam-members.html b/docs/class_c_s_c_i441_1_1_fixed_cam-members.html index 0b0f63a0..754fc7e1 100644 --- a/docs/class_c_s_c_i441_1_1_fixed_cam-members.html +++ b/docs/class_c_s_c_i441_1_1_fixed_cam-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_fixed_cam.html b/docs/class_c_s_c_i441_1_1_fixed_cam.html index b23e46fc..aaf3d3ac 100644 --- a/docs/class_c_s_c_i441_1_1_fixed_cam.html +++ b/docs/class_c_s_c_i441_1_1_fixed_cam.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_free_cam-members.html b/docs/class_c_s_c_i441_1_1_free_cam-members.html index 55c7d79c..ab9cfb99 100644 --- a/docs/class_c_s_c_i441_1_1_free_cam-members.html +++ b/docs/class_c_s_c_i441_1_1_free_cam-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_free_cam.html b/docs/class_c_s_c_i441_1_1_free_cam.html index 6dfe233f..c4f5d185 100644 --- a/docs/class_c_s_c_i441_1_1_free_cam.html +++ b/docs/class_c_s_c_i441_1_1_free_cam.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_h_u_d_camera-members.html b/docs/class_c_s_c_i441_1_1_h_u_d_camera-members.html index b7b5bb88..299dcc2d 100644 --- a/docs/class_c_s_c_i441_1_1_h_u_d_camera-members.html +++ b/docs/class_c_s_c_i441_1_1_h_u_d_camera-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_h_u_d_camera.html b/docs/class_c_s_c_i441_1_1_h_u_d_camera.html index 4ba84595..05193f4f 100644 --- a/docs/class_c_s_c_i441_1_1_h_u_d_camera.html +++ b/docs/class_c_s_c_i441_1_1_h_u_d_camera.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_m_d5_camera-members.html b/docs/class_c_s_c_i441_1_1_m_d5_camera-members.html index 7f49c8a6..ac414d5a 100644 --- a/docs/class_c_s_c_i441_1_1_m_d5_camera-members.html +++ b/docs/class_c_s_c_i441_1_1_m_d5_camera-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_m_d5_camera.html b/docs/class_c_s_c_i441_1_1_m_d5_camera.html index 64e8ac60..728710e8 100644 --- a/docs/class_c_s_c_i441_1_1_m_d5_camera.html +++ b/docs/class_c_s_c_i441_1_1_m_d5_camera.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_m_d5_model-members.html b/docs/class_c_s_c_i441_1_1_m_d5_model-members.html index 61d5c46c..a1332f0c 100644 --- a/docs/class_c_s_c_i441_1_1_m_d5_model-members.html +++ b/docs/class_c_s_c_i441_1_1_m_d5_model-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_m_d5_model.html b/docs/class_c_s_c_i441_1_1_m_d5_model.html index 17b37de0..edb6b62b 100644 --- a/docs/class_c_s_c_i441_1_1_m_d5_model.html +++ b/docs/class_c_s_c_i441_1_1_m_d5_model.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_model_loader-members.html b/docs/class_c_s_c_i441_1_1_model_loader-members.html index 8c771aec..def80a17 100644 --- a/docs/class_c_s_c_i441_1_1_model_loader-members.html +++ b/docs/class_c_s_c_i441_1_1_model_loader-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_model_loader.html b/docs/class_c_s_c_i441_1_1_model_loader.html index b8143351..220bd9e4 100644 --- a/docs/class_c_s_c_i441_1_1_model_loader.html +++ b/docs/class_c_s_c_i441_1_1_model_loader.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine-members.html b/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine-members.html index 21d477a7..0c663143 100644 --- a/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine-members.html +++ b/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine.html b/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine.html index f6412d64..e79e8cc5 100644 --- a/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine.html +++ b/docs/class_c_s_c_i441_1_1_open_g_l3_d_engine.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_open_g_l_engine-members.html b/docs/class_c_s_c_i441_1_1_open_g_l_engine-members.html index 3521803c..1941a3a1 100644 --- a/docs/class_c_s_c_i441_1_1_open_g_l_engine-members.html +++ b/docs/class_c_s_c_i441_1_1_open_g_l_engine-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_open_g_l_engine.html b/docs/class_c_s_c_i441_1_1_open_g_l_engine.html index c151aa91..417d43dc 100644 --- a/docs/class_c_s_c_i441_1_1_open_g_l_engine.html +++ b/docs/class_c_s_c_i441_1_1_open_g_l_engine.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_orthographic_camera-members.html b/docs/class_c_s_c_i441_1_1_orthographic_camera-members.html index 4cc8997d..0b0d33e2 100644 --- a/docs/class_c_s_c_i441_1_1_orthographic_camera-members.html +++ b/docs/class_c_s_c_i441_1_1_orthographic_camera-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_orthographic_camera.html b/docs/class_c_s_c_i441_1_1_orthographic_camera.html index 18cd9bd4..8665885e 100644 --- a/docs/class_c_s_c_i441_1_1_orthographic_camera.html +++ b/docs/class_c_s_c_i441_1_1_orthographic_camera.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_perspective_camera-members.html b/docs/class_c_s_c_i441_1_1_perspective_camera-members.html index 76fbcd81..6851d214 100644 --- a/docs/class_c_s_c_i441_1_1_perspective_camera-members.html +++ b/docs/class_c_s_c_i441_1_1_perspective_camera-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_perspective_camera.html b/docs/class_c_s_c_i441_1_1_perspective_camera.html index ca5eb945..fad78840 100644 --- a/docs/class_c_s_c_i441_1_1_perspective_camera.html +++ b/docs/class_c_s_c_i441_1_1_perspective_camera.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_shader_program-members.html b/docs/class_c_s_c_i441_1_1_shader_program-members.html index a8262638..8ee6271e 100644 --- a/docs/class_c_s_c_i441_1_1_shader_program-members.html +++ b/docs/class_c_s_c_i441_1_1_shader_program-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_shader_program.html b/docs/class_c_s_c_i441_1_1_shader_program.html index 21ad815b..33ccd798 100644 --- a/docs/class_c_s_c_i441_1_1_shader_program.html +++ b/docs/class_c_s_c_i441_1_1_shader_program.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_shader_program_pipeline-members.html b/docs/class_c_s_c_i441_1_1_shader_program_pipeline-members.html index 54a2c189..8b47b84b 100644 --- a/docs/class_c_s_c_i441_1_1_shader_program_pipeline-members.html +++ b/docs/class_c_s_c_i441_1_1_shader_program_pipeline-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_shader_program_pipeline.html b/docs/class_c_s_c_i441_1_1_shader_program_pipeline.html index b217cc5c..46d511c1 100644 --- a/docs/class_c_s_c_i441_1_1_shader_program_pipeline.html +++ b/docs/class_c_s_c_i441_1_1_shader_program_pipeline.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_uniform_buffer_object-members.html b/docs/class_c_s_c_i441_1_1_uniform_buffer_object-members.html index d550221f..49e02781 100644 --- a/docs/class_c_s_c_i441_1_1_uniform_buffer_object-members.html +++ b/docs/class_c_s_c_i441_1_1_uniform_buffer_object-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/class_c_s_c_i441_1_1_uniform_buffer_object.html b/docs/class_c_s_c_i441_1_1_uniform_buffer_object.html index 596f895c..d724a7ca 100644 --- a/docs/class_c_s_c_i441_1_1_uniform_buffer_object.html +++ b/docs/class_c_s_c_i441_1_1_uniform_buffer_object.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/classes.html b/docs/classes.html index b3b666ad..4afb101b 100644 --- a/docs/classes.html +++ b/docs/classes.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/files.html b/docs/files.html index 125905a7..c3abcb7f 100644 --- a/docs/files.html +++ b/docs/files.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions.html b/docs/functions.html index 4e0aaa9c..a0667936 100644 --- a/docs/functions.html +++ b/docs/functions.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_b.html b/docs/functions_b.html index 1ef958ff..06c0ab99 100644 --- a/docs/functions_b.html +++ b/docs/functions_b.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_c.html b/docs/functions_c.html index c90379ff..12341fda 100644 --- a/docs/functions_c.html +++ b/docs/functions_c.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_d.html b/docs/functions_d.html index e187d5b0..dfe9cc1b 100644 --- a/docs/functions_d.html +++ b/docs/functions_d.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_e.html b/docs/functions_e.html index 94cb3023..6fd7e2a7 100644 --- a/docs/functions_e.html +++ b/docs/functions_e.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_enum.html b/docs/functions_enum.html index 439173e1..87753714 100644 --- a/docs/functions_enum.html +++ b/docs/functions_enum.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_eval.html b/docs/functions_eval.html index e9a303e5..a48338c8 100644 --- a/docs/functions_eval.html +++ b/docs/functions_eval.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_f.html b/docs/functions_f.html index b591ef4b..b384ed30 100644 --- a/docs/functions_f.html +++ b/docs/functions_f.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func.html b/docs/functions_func.html index 744a8e70..4cc44a36 100644 --- a/docs/functions_func.html +++ b/docs/functions_func.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_b.html b/docs/functions_func_b.html index 319b4139..a1a4ed80 100644 --- a/docs/functions_func_b.html +++ b/docs/functions_func_b.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_c.html b/docs/functions_func_c.html index 3e7aa52c..2f88c4b5 100644 --- a/docs/functions_func_c.html +++ b/docs/functions_func_c.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_d.html b/docs/functions_func_d.html index 8f722e59..fb55515a 100644 --- a/docs/functions_func_d.html +++ b/docs/functions_func_d.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_e.html b/docs/functions_func_e.html index 4d9e6d8a..26e100aa 100644 --- a/docs/functions_func_e.html +++ b/docs/functions_func_e.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_f.html b/docs/functions_func_f.html index 69dae2b5..a9513aae 100644 --- a/docs/functions_func_f.html +++ b/docs/functions_func_f.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_g.html b/docs/functions_func_g.html index d8ad52e6..97609e87 100644 --- a/docs/functions_func_g.html +++ b/docs/functions_func_g.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_h.html b/docs/functions_func_h.html index c19ba79d..2c0391c4 100644 --- a/docs/functions_func_h.html +++ b/docs/functions_func_h.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_i.html b/docs/functions_func_i.html index 458cc9b7..fc1e15d2 100644 --- a/docs/functions_func_i.html +++ b/docs/functions_func_i.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_l.html b/docs/functions_func_l.html index 471bb0c8..a3eae18a 100644 --- a/docs/functions_func_l.html +++ b/docs/functions_func_l.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_m.html b/docs/functions_func_m.html index 3f3e546f..d008b6ce 100644 --- a/docs/functions_func_m.html +++ b/docs/functions_func_m.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_o.html b/docs/functions_func_o.html index 5d6689d9..25c892a4 100644 --- a/docs/functions_func_o.html +++ b/docs/functions_func_o.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_p.html b/docs/functions_func_p.html index ea0a299f..1fd5dbe7 100644 --- a/docs/functions_func_p.html +++ b/docs/functions_func_p.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_r.html b/docs/functions_func_r.html index d2339147..3ed9f692 100644 --- a/docs/functions_func_r.html +++ b/docs/functions_func_r.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_s.html b/docs/functions_func_s.html index 29a47526..b4aa0b00 100644 --- a/docs/functions_func_s.html +++ b/docs/functions_func_s.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_t.html b/docs/functions_func_t.html index fe3b3d20..e751b52e 100644 --- a/docs/functions_func_t.html +++ b/docs/functions_func_t.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_u.html b/docs/functions_func_u.html index 6643ba72..7143b920 100644 --- a/docs/functions_func_u.html +++ b/docs/functions_func_u.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_v.html b/docs/functions_func_v.html index 8018513f..a7dfc325 100644 --- a/docs/functions_func_v.html +++ b/docs/functions_func_v.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_w.html b/docs/functions_func_w.html index f1545792..23d8aecd 100644 --- a/docs/functions_func_w.html +++ b/docs/functions_func_w.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_func_~.html b/docs/functions_func_~.html index c7165d92..a7deaebe 100644 --- a/docs/functions_func_~.html +++ b/docs/functions_func_~.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_g.html b/docs/functions_g.html index c25f23ed..77229f41 100644 --- a/docs/functions_g.html +++ b/docs/functions_g.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_h.html b/docs/functions_h.html index 8dcbc90f..4e3f5e20 100644 --- a/docs/functions_h.html +++ b/docs/functions_h.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_i.html b/docs/functions_i.html index 5ff01429..f1872d4d 100644 --- a/docs/functions_i.html +++ b/docs/functions_i.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_j.html b/docs/functions_j.html index 2d47033e..daaa37bc 100644 --- a/docs/functions_j.html +++ b/docs/functions_j.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_l.html b/docs/functions_l.html index 6201768e..235dd2d3 100644 --- a/docs/functions_l.html +++ b/docs/functions_l.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_m.html b/docs/functions_m.html index d42d08d3..3e9a8bec 100644 --- a/docs/functions_m.html +++ b/docs/functions_m.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_n.html b/docs/functions_n.html index 7fe3576d..c71a72b8 100644 --- a/docs/functions_n.html +++ b/docs/functions_n.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_o.html b/docs/functions_o.html index 7a68d8ee..5a22dc8b 100644 --- a/docs/functions_o.html +++ b/docs/functions_o.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_p.html b/docs/functions_p.html index 07c7f3e7..2eb3f6b2 100644 --- a/docs/functions_p.html +++ b/docs/functions_p.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_r.html b/docs/functions_r.html index 9388aacf..f48d4ca9 100644 --- a/docs/functions_r.html +++ b/docs/functions_r.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_s.html b/docs/functions_s.html index c17d6e59..ed846884 100644 --- a/docs/functions_s.html +++ b/docs/functions_s.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_t.html b/docs/functions_t.html index b569bccf..6f795574 100644 --- a/docs/functions_t.html +++ b/docs/functions_t.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_u.html b/docs/functions_u.html index 39abc1fe..0253ed0c 100644 --- a/docs/functions_u.html +++ b/docs/functions_u.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_v.html b/docs/functions_v.html index 731dab68..77583e16 100644 --- a/docs/functions_v.html +++ b/docs/functions_v.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_vars.html b/docs/functions_vars.html index f36c3b0a..09edfe00 100644 --- a/docs/functions_vars.html +++ b/docs/functions_vars.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_w.html b/docs/functions_w.html index 39477bce..616ae421 100644 --- a/docs/functions_w.html +++ b/docs/functions_w.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/functions_~.html b/docs/functions_~.html index d74458c5..9ff658af 100644 --- a/docs/functions_~.html +++ b/docs/functions_~.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/hierarchy.html b/docs/hierarchy.html index ef758e07..1d56e3a9 100644 --- a/docs/hierarchy.html +++ b/docs/hierarchy.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/index.html b/docs/index.html index bbb57e38..4321be90 100644 --- a/docs/index.html +++ b/docs/index.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/materials_8hpp.html b/docs/materials_8hpp.html index 8d97cdae..1d00af2a 100644 --- a/docs/materials_8hpp.html +++ b/docs/materials_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/materials_8hpp_source.html b/docs/materials_8hpp_source.html index d561b9d6..ed9f184f 100644 --- a/docs/materials_8hpp_source.html +++ b/docs/materials_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/md__c_h_a_n_g_e_l_o_g.html b/docs/md__c_h_a_n_g_e_l_o_g.html index 972c496b..82f73ec2 100644 --- a/docs/md__c_h_a_n_g_e_l_o_g.html +++ b/docs/md__c_h_a_n_g_e_l_o_g.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -74,6 +74,17 @@

+v 5.4.0 - 26 Aug 2024

+
    +
  • Updated glm dependency to v1.0.1
    • +
  • Added half sphere and dome to HUD example
    • +
  • Fixed shader uniform debug output typos
    • +
  • OpenGLUtils: Does not print full list of extensions with OpenGL statistics, created a separate function that can be called for full listing
    • +
  • MD5Camera: fixed bug where inverseQ normalization was being discarded and not set
    • +
  • MD5Model: added GLM_ENABLE_EXPERIMENTAL for quaternion header to match GLM v1.0.1
    • +
  • OrthographicCamera: fixed bug where _updateProjectionMatrix was not declared inline
    • +
+

v 5.3.0 - 16 Aug 2024

  • Removed [[nodiscard]] from ModelLoader::draw() to silence warnings. Currently method always returns true so the return value isn't applicable.
    • @@ -81,7 +92,7 @@
  • Added abstract PerspectiveCamera class to house aspect ratio, field of view, near/far clip planes. When any is updated, the perspective projection matrix is recomputed
  • Added abstract OrthographicCamera class to house left, right, bottom, top, near, far clip planes
-

+

v 5.2.0 - 15 Aug 2024

  • OpenGLEngine tracks the state of the Caps Lock and Num Lock keys during key callbacks
    • @@ -94,78 +105,78 @@

-

+

v 5.1.0 - 10 May 2024

-

+

v 5.0.0 - 09 May 2024

  • ModelLoader no longer prints "ignoring usemtl" line when parsing file
  • Supports OpenGL function loading via glad2 or GLEW (the default is glad2)
  • Updated GLFW dependency from 3.3.8 to 3.4
-

+

v 4.13.4 - 16 Nov 2023

  • ShaderUtils::compileShader() returns 0 to properly signal an error
-

+

v 4.13.3 - 04 Nov 2023

-

+

v 4.13.2 - 03 Nov 2023

  • Fixed winding order for generateCubeVAOIndexed() for near, right, top faces
-

+

v 4.13.1 - 01 Nov 2023

  • Fixed memory bug with generateCubeVAOIndexed() VBO
-

+

v 4.13.0 - 18 Oct 2023

  • Fixed memory bug with generateCubeVAOIndexed() texture coordinates
-

+

v 4.12.2 - 06 Oct 2023

  • Cleaned up warnings
  • Minor bug fixes
  • Internal data representation changes
-

+

v 4.12.1 - 21 Sep 2023

  • Fixed bug with MD5Model loader not reading shader strings correctly
  • Removed warnings
-

+

v 4.12.0 - 21 Sep 2023

  • Computed teapot normals based on partial derivatives
-

+

v 4.11.0 - 21 Sep 2023

  • Added HUDCamera
-

+

v 4.10.2 - 21 Sep 2023

  • Including Makefile
-

+

v 4.10.1 - 21 Sep 2023

  • Fixing documentation links
-

+

v 4.10.0 - 21 Sep 2023

  • Added example programs to demonstrate SimpleShader2 and SimpleShader3 + 3D Objects
    • @@ -173,12 +184,12 @@

  • Replacing cmath dependency with glm references (PI specifically)
  • Warnings removed

-

+

v 4.9.1 - 20 Sep 2023

  • Fixed doxygen version number
-

+

v 4.9.0 - 20 Sep 2023

  • Fixed aspect ratio calculation in OpenGL3DEngine
    • @@ -186,30 +197,30 @@

  • Removed internal references to glUniform*() and replaced with glProgramUniform*() to not change bound program state
  • Cleaned up documentation

-

+

v 4.8.0 - 14 Sep 2023

  • OpenGL3DEngine can handle events that have an effect on the arcball camera movement
-

+

v 4.7.0 - 07 Sep 2023

  • Big3 implemented on classes as appropriate
  • Classes and methods open/close as appropriate
-

+

v 4.6.1 - 06 Sep 2023

  • Cannot copy MD5 Models
-

+

v 4.6.0 - 06 Sep 2023

  • Created MD5Model class to load, display, and animate md5mesh + md5anim files
  • Deleted copy constructor and copy assignment operator for ShaderProgram and ComputeShaderProgram to prevent shader program objects from being copied and then deallocated on the GPU
  • TextureUtils::loadAndRegisterTexture() now has a trailing parameter to specify if the image should be flipped when loaded or not (defaults to flip = true)
-

+

v 4.5.0 - 31 Aug 2023

  • Camera stores projection matrix along with view matrix
      @@ -221,92 +232,92 @@

-

+

v 4.4.0 - 29 Aug 2023

  • ShaderProgram::getProgramStages() returns GLbitfield of shader stages
-

+

v 4.3.0 - 25 Aug 2023

  • Improved and consistent web documentation using a consistent style for all public facing classes and members, methods, and namespaces
  • Minor performance improvements
-

+

v 4.2.0 - 25 Aug 2023

  • setupGLEW() and cleanupGLEW() made private members of OpenGLEngine
  • Improving web documentation using a consistent style
-

+

v 4.1.1 - 24 Aug 2023

  • Cleaned up order of includes
  • Fixed publishing to GitHub pages
-

+

v 4.1.0 - 24 Aug 2023

  • Improving web documentation using a consistent style
-

+

v 4.0.0 - 21 Aug 2023

  • Refactored protected class member naming scheme from _xyz to mXyz
  • Improving web documentation
-

+

v 3.12.1 - 18 Aug 2023

  • Improving web documentation
-

+

v 3.12.0 - 18 Aug 2023

  • Consistently use only single precision and GLfloat typedef for OS X Metal compatibility
-

+

v 3.11.0 - 20 Apr 2023

  • Fixed renaming bug in ModelLoader _AUTO_GEN_NORMALS and properly initialize to false
  • Removed memory leaks in object generation of cylinder, disk, sphere, and torus
-

+

v 3.10.2 - 26 Oct 2022

  • Cleaned up Camera class warnings
  • Replaced OpenGL3DEngine internal arcball implementation with ArcballCam object
-

+

v 3.10.1 - 09 Sep 2022

  • Camera::_clampCameraPhi() explicitly checking against floats instead of double
-

+

v 3.10.0 - 06 Aug 2022

  • Added capability for ShaderProgram to write to/load from binary - if supported by driver
  • ModelLoader no longer internal applies using namespace std; and qualifies all STL types
-

+

v 3.9.0 - 05 Nov 2021

  • ModelLoader can query number of vertices and indices within model
  • TextureUtils load method will roll back to ppm loader if stb_image fails to load ppm
  • Reversed top fan winding order for spheres
-

+

v 3.8.0 - 07 Oct 2021

  • Resolved Issue #2 for OBJ files with negative indices. The negative indices weren't unique and needed to offset before caching
-

+

v 3.7.1 - 07 Oct 2021

  • Fixed get polygon mode bug where it returns two values
  • Objects and Teapot only enable attribute locations if they are not -1. Prevents an invalid enum error
-

+

v 3.7.0 - 06 Oct 2021

  • Improved encapsulation of Arcball radius modification
    • @@ -316,39 +327,39 @@

  • Corrected normals for indexed cube
  • Changed object and teapot internal variables from static to inline to support multi-compilation and single use across multiple contexts

-

+

v 3.6.0 - 15 Sep 2021

  • Created a concrete ArcBall Cam implementation
-

+

v 3.5.0 - 13 Sep 2021

  • Added full getter suite to Camera class
-

+

v 3.4.1 - 10 Sep 2021

  • Fixed bug within SimpleShader when the SimpleShader was used split across multiple class objects
-

+

v 3.4.0 - 08 Sep 2021

  • Created a concrete Fixed Camera implementation that can be positioned but doesn't move
  • Fixed FreeCam being included across multiple object files
-

+

v 3.3.0 - 06 Sep 2021

  • Created an abstract Camera class to store parameters and to make camera objects
  • Created a concrete FreeCam implementation
-

+

v 3.2.1 - 31 Aug 2021

  • Reworked SimpleShader::popTransformation() to always re-multiply the model matrix and not use the inverse calculation to avoid precision errors
-

+

v 3.2.0 - 30 Aug 2021

  • Cleaning up code style
    • @@ -358,12 +369,12 @@

  • Improved efficiency of setting VBO attribute locations for teapot
  • Sidestepped the precision error in SimpleShader2 (and therefore SimpleShader3) when popping and multiplying by the inverse by adding a resetTransformationMatrix() method which clears the stack and sets the model matrix to the identity

-

+

v 3.1.0 - 21 May 2021

  • Removed all ShaderProgram::setUniform(). Use ShaderProgram::setProgramUniform() instead.
-

+

v 3.0.0 - 21 May 2021

  • Reworked ModelLoader.hpp to first set attribute locations then specify the shader handle. This allows for the model to be used with separable programs and shader pipelines.
    • @@ -376,7 +387,7 @@

  • Cleaned up console output for ShaderPrograms
  • Various fixes to ShaderProgramPipelines

-

+

v 2.10.0 - 23 Feb 2021

  • Added wrapper class for ComputeShaderProgram
    • @@ -384,71 +395,71 @@

  • Added support to ShaderProgram to return Atomic Counter bindings
  • Updated ShaderProgram info output to include SSBO and ABO info

-

+

v 2.8.1 - 28 Jan 2021

  • Added wrappers to ShaderProgram to set a uniform by name or location
-

+

v 2.8.0 - 28 Jan 2021

  • Created Shader Program Pipeline class to wrap Pipeline Objects. Interfaces with the ShaderProgram class.
-

+

v 2.7.2 - 10 Dec 2020

  • Added getters to vertex data for ModelLoader class
-

+

v 2.7.0 - 13 Nov 2020

  • Added texture coordinates to Teapot
-

+

v 2.6.0 - 27 Oct 2020

  • Added predefined Material properties for reuse
-

+

v 2.3.0 - 12 Oct 2020

  • Allow multi-compilation for objects.hpp with shaders. Now depends upon C++17
-

+

v 2.2.0 - 12 Oct 2020

-

+

v 2.1.0 - 02 Oct 2020

  • Fixed memory leak in objects.hpp cylinder, sphere, disk, torus caching
  • Added method for objects.hpp to delete the used VAOs/VBOs from GPU memory
  • Delete compiled shaders from GPU after Shader Program is linked to free up memory sooner
-

+

v.2.0.2 - 25 Sep 2020

  • Removed invalid enum error when querying max number of lights in OpenGL 3+
-

+

v2.0.0 - 25 Sep 2020

  • Only single version of library files to work with OpenGL 4.1
  • Removed dependency upon SOIL and replaced with stb_image
  • Fixed bug of spheres not being spheres due to precision error
-

+

v1.8.3 - 04 Dec 2017

  • Marked modelLoader3.hpp function implementations as inline to prevent redefinition errors
-

+

v1.8 - 16 Nov 2017

  • Added support for MTL files for Phong Shading and diffuse maps
-

+

v1.7 - 16 Nov 2017

  • Added loadBMP() support to TextureUtils.hpp
    • @@ -460,20 +471,20 @@

  • If OFF file does not contain normal information, can autogenerate vertex normals
  • If OBJ file does not contain normal information, can autogenerate vertex normals

-

+

v1.6 - 15 Nov 2017

  • Added FramebufferUtils3.hpp to print Framebuffer info
  • Fixed off by 1 error for normals/texcoords in modelLoader3.hpp
  • Fixed overflow error for modelLoader3.hpp when reading in models with more than 65535 vertices
-

+

v1.5.1 - 10 Nov 2017

  • Fixed redefinition errors in teapot3.hpp and objects3.hpp
  • Fixed bug in ShaderUtils3.hpp to check if OpenGL is version 4.0+ before querying subroutine uniforms
-

+

v1.5 - 06 Nov 2017

  • Added loadTGA method to TextureUtils.hpp
    • @@ -481,22 +492,22 @@

  • Converted OpenGLUtils from static non-implementable class to namespace
  • Added commenting to ShaderProgram3.hpp

-

+

v1.4.1 - 05 Nov 2017

  • Fixed bug in objects3.hpp of internally passing torus parameters in incorrect order
-

+

v1.4 - 03 Nov 2017

  • Created ShaderUtils3.hpp and ShaderProgram3.hpp to make working with Shaders easier
-

+

v.1.3.1 - 28 Oct 2017

  • Matched internal data types to prevent c++11 narrowing warnings on lab machines
-

+

v1.3 - 26 Oct 2017

  • Modified texture coordinates for cylinder to linear step from 0 to 1 in s instead of following cosine
    • @@ -509,7 +520,7 @@

  • Notes for teapot - the teapot cannot be textured, and it is a pure teapot with no bottom
  • For a textured teapot, look into using an object model

-

+

v1.2 - 25 Sep 2017

  • Fixed error in draw*Disk not completing final slice step
    • @@ -517,23 +528,23 @@

  • Added MaterialStruct structure to group together Phong properties
  • Fixed error in drawSolidDisk() not allowing inner radius to be zero

-

+

v1.1.1 - 22 Sep 2017

  • Removed GL_MAX_COLOR_ATTACHMENTS to comply with lab machines
-

+

v1.1 - 21 Sep 2017

  • Added OpenGLUtils class to store commonly used helper functions
-

+

v1.0.1 - 19 Sep 2017

  • Added documentation
  • Added inline definition to functions to prevent duplicate linking errors
-

+

v1.0 - 01 Sep 2017

  • Initial release of all OpenGL 3D objects
    • diff --git a/docs/md__r_e_a_d_m_e.html b/docs/md__r_e_a_d_m_e.html index a0fc5b93..f71cf368 100644 --- a/docs/md__r_e_a_d_m_e.html +++ b/docs/md__r_e_a_d_m_e.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 5.3.0 +
    CSCI441 OpenGL Library 5.4.0
    CS@Mines CSCI441 Computer Graphics Course Library
    @@ -83,7 +83,7 @@
  • glm v0.9.9

The OpenGL and GLFW libraries must be previously built and installed on your machine. The corresponding header files are included with this distribution for proper compilation, but proper linking is left to the user to ensure success.

-

+

Example Programs:

To build, run

make examples

diff --git a/docs/model_material_8hpp.html b/docs/model_material_8hpp.html index c4c583fc..4438a634 100644 --- a/docs/model_material_8hpp.html +++ b/docs/model_material_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/model_material_8hpp_source.html b/docs/model_material_8hpp_source.html index 3d3b9f9c..f94e0ba6 100644 --- a/docs/model_material_8hpp_source.html +++ b/docs/model_material_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespace_c_s_c_i441.html b/docs/namespace_c_s_c_i441.html index 6bdec4ae..2d297d7b 100644 --- a/docs/namespace_c_s_c_i441.html +++ b/docs/namespace_c_s_c_i441.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespace_framebuffer_utils.html b/docs/namespace_framebuffer_utils.html index a4c1f14e..43a2710a 100644 --- a/docs/namespace_framebuffer_utils.html +++ b/docs/namespace_framebuffer_utils.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespace_materials.html b/docs/namespace_materials.html index 7b38b12b..1e62d682 100644 --- a/docs/namespace_materials.html +++ b/docs/namespace_materials.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespace_open_g_l_utils.html b/docs/namespace_open_g_l_utils.html index 9cc452bc..92f91367 100644 --- a/docs/namespace_open_g_l_utils.html +++ b/docs/namespace_open_g_l_utils.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespace_simple_shader2.html b/docs/namespace_simple_shader2.html index 7c878016..ec74612a 100644 --- a/docs/namespace_simple_shader2.html +++ b/docs/namespace_simple_shader2.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespace_simple_shader3.html b/docs/namespace_simple_shader3.html index 1ebfb47f..f9dbce2f 100644 --- a/docs/namespace_simple_shader3.html +++ b/docs/namespace_simple_shader3.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespace_texture_utils.html b/docs/namespace_texture_utils.html index a856b176..dfd0be7e 100644 --- a/docs/namespace_texture_utils.html +++ b/docs/namespace_texture_utils.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespacemembers.html b/docs/namespacemembers.html index 58505bbb..a9ba667e 100644 --- a/docs/namespacemembers.html +++ b/docs/namespacemembers.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespacemembers_func.html b/docs/namespacemembers_func.html index 06619758..b263c74c 100644 --- a/docs/namespacemembers_func.html +++ b/docs/namespacemembers_func.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/namespaces.html b/docs/namespaces.html index ae0e78c3..9d3003ac 100644 --- a/docs/namespaces.html +++ b/docs/namespaces.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/objects_8hpp.html b/docs/objects_8hpp.html index d3326589..1a43f4f8 100644 --- a/docs/objects_8hpp.html +++ b/docs/objects_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/objects_8hpp_source.html b/docs/objects_8hpp_source.html index 23e73145..99c6e4ab 100644 --- a/docs/objects_8hpp_source.html +++ b/docs/objects_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/pages.html b/docs/pages.html index b98aa364..8b1f9c60 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/search/all_e.js b/docs/search/all_e.js index c19620b1..490bc8bf 100644 --- a/docs/search/all_e.js +++ b/docs/search/all_e.js @@ -8,7 +8,8 @@ var searchData= ['position_5',['position',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint.html#a79403b1de185693640a5fc4af74fb597',1,'CSCI441::MD5Model::MD5Joint::position()'],['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight.html#afb72b62d89c11de72397bed28c7fa26f',1,'CSCI441::MD5Model::MD5Weight::position()'],['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint.html#a77be930957109439ba2362d4f814b40e',1,'CSCI441::MD5Model::MD5BaseFrameJoint::position()']]], ['printframebufferinfo_6',['printFramebufferInfo',['../_framebuffer_utils_8hpp.html#ac91f0a713f8ee190cf7ff3533202bf16',1,'CSCI441::FramebufferUtils']]], ['printframebufferstatusmessage_7',['printFramebufferStatusMessage',['../_framebuffer_utils_8hpp.html#af59c0c0026505f22dc443ded9edb3c95',1,'CSCI441::FramebufferUtils::printFramebufferStatusMessage(GLenum target, GLuint fbo)'],['../_framebuffer_utils_8hpp.html#a0c119aa9fb1c32d45c622c053aa96e7b',1,'CSCI441::FramebufferUtils::printFramebufferStatusMessage(GLenum target)']]], - ['printopenglinfo_8',['printOpenGLInfo',['../_open_g_l_utils_8hpp.html#a23e011241f0e95738bafa0b0404eb679',1,'CSCI441::OpenGLUtils']]], - ['printpipelineinfo_9',['printPipelineInfo',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#ae34421930e16d361b6b1328f1cc90370',1,'CSCI441::ShaderProgramPipeline']]], - ['pushtransformation_10',['pushTransformation',['../_simple_shader_8hpp.html#abb58f7b581ce644eb15f6387dacd65bc',1,'CSCI441::SimpleShader2::pushTransformation()'],['../_simple_shader_8hpp.html#a4026a10965a7459061f53fe47771628f',1,'CSCI441::SimpleShader3::pushTransformation()']]] + ['printopenglextensions_8',['printOpenGLExtensions',['../_open_g_l_utils_8hpp.html#a854077564452ce02c385eba5f33f4d3c',1,'CSCI441::OpenGLUtils']]], + ['printopenglinfo_9',['printOpenGLInfo',['../_open_g_l_utils_8hpp.html#a23e011241f0e95738bafa0b0404eb679',1,'CSCI441::OpenGLUtils']]], + ['printpipelineinfo_10',['printPipelineInfo',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#ae34421930e16d361b6b1328f1cc90370',1,'CSCI441::ShaderProgramPipeline']]], + ['pushtransformation_11',['pushTransformation',['../_simple_shader_8hpp.html#abb58f7b581ce644eb15f6387dacd65bc',1,'CSCI441::SimpleShader2::pushTransformation()'],['../_simple_shader_8hpp.html#a4026a10965a7459061f53fe47771628f',1,'CSCI441::SimpleShader3::pushTransformation()']]] ]; diff --git a/docs/search/functions_c.js b/docs/search/functions_c.js index e9dec327..39fadd3d 100644 --- a/docs/search/functions_c.js +++ b/docs/search/functions_c.js @@ -4,7 +4,8 @@ var searchData= ['poptransformation_1',['popTransformation',['../_simple_shader_8hpp.html#af267c3466bb782da0a78f4da803a113e',1,'CSCI441::SimpleShader2::popTransformation()'],['../_simple_shader_8hpp.html#a5c59d60ca4271ff58e36773d4d81ae8c',1,'CSCI441::SimpleShader3::popTransformation()']]], ['printframebufferinfo_2',['printFramebufferInfo',['../_framebuffer_utils_8hpp.html#ac91f0a713f8ee190cf7ff3533202bf16',1,'CSCI441::FramebufferUtils']]], ['printframebufferstatusmessage_3',['printFramebufferStatusMessage',['../_framebuffer_utils_8hpp.html#af59c0c0026505f22dc443ded9edb3c95',1,'CSCI441::FramebufferUtils::printFramebufferStatusMessage(GLenum target, GLuint fbo)'],['../_framebuffer_utils_8hpp.html#a0c119aa9fb1c32d45c622c053aa96e7b',1,'CSCI441::FramebufferUtils::printFramebufferStatusMessage(GLenum target)']]], - ['printopenglinfo_4',['printOpenGLInfo',['../_open_g_l_utils_8hpp.html#a23e011241f0e95738bafa0b0404eb679',1,'CSCI441::OpenGLUtils']]], - ['printpipelineinfo_5',['printPipelineInfo',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#ae34421930e16d361b6b1328f1cc90370',1,'CSCI441::ShaderProgramPipeline']]], - ['pushtransformation_6',['pushTransformation',['../_simple_shader_8hpp.html#abb58f7b581ce644eb15f6387dacd65bc',1,'CSCI441::SimpleShader2::pushTransformation()'],['../_simple_shader_8hpp.html#a4026a10965a7459061f53fe47771628f',1,'CSCI441::SimpleShader3::pushTransformation()']]] + ['printopenglextensions_4',['printOpenGLExtensions',['../_open_g_l_utils_8hpp.html#a854077564452ce02c385eba5f33f4d3c',1,'CSCI441::OpenGLUtils']]], + ['printopenglinfo_5',['printOpenGLInfo',['../_open_g_l_utils_8hpp.html#a23e011241f0e95738bafa0b0404eb679',1,'CSCI441::OpenGLUtils']]], + ['printpipelineinfo_6',['printPipelineInfo',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#ae34421930e16d361b6b1328f1cc90370',1,'CSCI441::ShaderProgramPipeline']]], + ['pushtransformation_7',['pushTransformation',['../_simple_shader_8hpp.html#abb58f7b581ce644eb15f6387dacd65bc',1,'CSCI441::SimpleShader2::pushTransformation()'],['../_simple_shader_8hpp.html#a4026a10965a7459061f53fe47771628f',1,'CSCI441::SimpleShader3::pushTransformation()']]] ]; diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation-members.html index b8c03b7d..ea1fb5b8 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation.html index f1f5597f..03bb21cd 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state-members.html index 393540cc..2890927d 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state.html index b7ddcd2a..db8b1096 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation_state.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint-members.html index dc6f66b2..7719f3f3 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint.html index 5c1171ff..ea16abe6 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_base_frame_joint.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box-members.html index fcb626f6..a230d884 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box.html index 14d72219..400005e1 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_bounding_box.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint-members.html index 3f778dc4..bde29e8c 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint.html index 6e104a4c..18179c86 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info-members.html index d45a6b9c..674c09d5 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info.html index 598b1d51..8c70f90b 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh-members.html index d4e79a6c..88a2594b 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html index b332e0e4..c36f82e0 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture-members.html index 3c15705a..ca8c0ee1 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture.html index 25d833a3..e9d06d28 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_texture.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle-members.html index 9bc5c633..831a9431 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle.html index cde2b637..e112c4d5 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_triangle.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex-members.html index e0b88f91..c252dd4b 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex.html index 0ba68a29..c6ae21be 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight-members.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight-members.html index d378a879..94f3ed7f 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight-members.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight.html b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight.html index f8a78274..ce0cac99 100644 --- a/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight.html +++ b/docs/struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_weight.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_materials_1_1_material-members.html b/docs/struct_c_s_c_i441_1_1_materials_1_1_material-members.html index 61f44b4b..d085cc41 100644 --- a/docs/struct_c_s_c_i441_1_1_materials_1_1_material-members.html +++ b/docs/struct_c_s_c_i441_1_1_materials_1_1_material-members.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/struct_c_s_c_i441_1_1_materials_1_1_material.html b/docs/struct_c_s_c_i441_1_1_materials_1_1_material.html index 80cdd168..51757d93 100644 --- a/docs/struct_c_s_c_i441_1_1_materials_1_1_material.html +++ b/docs/struct_c_s_c_i441_1_1_materials_1_1_material.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/teapot_8hpp.html b/docs/teapot_8hpp.html index 8478eeb7..8397327f 100644 --- a/docs/teapot_8hpp.html +++ b/docs/teapot_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/teapot_8hpp_source.html b/docs/teapot_8hpp_source.html index a4fc5015..ff99ca68 100644 --- a/docs/teapot_8hpp_source.html +++ b/docs/teapot_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 5.3.0 +
CSCI441 OpenGL Library 5.4.0
CS@Mines CSCI441 Computer Graphics Course Library