From 1c80d75b4905b56a4c2c76a313c7d3e2e09bcd8b Mon Sep 17 00:00:00 2001 From: jpaone Date: Wed, 18 Oct 2023 09:13:47 -0600 Subject: [PATCH] Fixed memory bug with generateCubeVAOIndexed() texture coordinates --- CHANGELOG.md | 3 + csci441.dox.config | 2 +- docs/_arcball_cam_8hpp.html | 2 +- docs/_arcball_cam_8hpp_source.html | 2 +- docs/_c_s_c_i441_8hpp.html | 2 +- docs/_c_s_c_i441_8hpp_source.html | 2 +- docs/_camera_8hpp.html | 2 +- docs/_camera_8hpp_source.html | 2 +- docs/_compute_shader_program_8hpp.html | 2 +- docs/_compute_shader_program_8hpp_source.html | 2 +- docs/_fixed_cam_8hpp.html | 2 +- docs/_fixed_cam_8hpp_source.html | 2 +- docs/_framebuffer_utils_8hpp.html | 2 +- docs/_framebuffer_utils_8hpp_source.html | 2 +- docs/_free_cam_8hpp.html | 2 +- docs/_free_cam_8hpp_source.html | 2 +- docs/_h_u_d_camera_8hpp.html | 2 +- docs/_h_u_d_camera_8hpp_source.html | 2 +- docs/_m_d5_camera_8hpp.html | 2 +- docs/_m_d5_camera_8hpp_source.html | 2 +- docs/_m_d5_model_8hpp.html | 2 +- docs/_m_d5_model_8hpp_source.html | 2 +- docs/_model_loader_8hpp.html | 2 +- docs/_model_loader_8hpp_source.html | 2 +- docs/_open_g_l3_d_engine_8hpp.html | 2 +- docs/_open_g_l3_d_engine_8hpp_source.html | 2 +- docs/_open_g_l_engine_8hpp.html | 2 +- docs/_open_g_l_engine_8hpp_source.html | 2 +- docs/_open_g_l_utils_8hpp.html | 2 +- docs/_open_g_l_utils_8hpp_source.html | 2 +- docs/_shader_program_8hpp.html | 2 +- docs/_shader_program_8hpp_source.html | 2 +- docs/_shader_program_pipeline_8hpp.html | 2 +- .../_shader_program_pipeline_8hpp_source.html | 167 ++++++++++-------- docs/_shader_utils_8hpp.html | 2 +- docs/_shader_utils_8hpp_source.html | 2 +- docs/_simple_shader_8hpp.html | 2 +- docs/_simple_shader_8hpp_source.html | 2 +- docs/_texture_utils_8hpp.html | 2 +- docs/_texture_utils_8hpp_source.html | 2 +- docs/_uniform_buffer_object_8hpp.html | 2 +- docs/_uniform_buffer_object_8hpp_source.html | 2 +- docs/annotated.html | 2 +- ...ss_c_s_c_i441_1_1_arcball_cam-members.html | 2 +- docs/class_c_s_c_i441_1_1_arcball_cam.html | 2 +- docs/class_c_s_c_i441_1_1_camera-members.html | 2 +- docs/class_c_s_c_i441_1_1_camera.html | 2 +- ...41_1_1_compute_shader_program-members.html | 2 +- ...c_s_c_i441_1_1_compute_shader_program.html | 2 +- ...lass_c_s_c_i441_1_1_fixed_cam-members.html | 2 +- docs/class_c_s_c_i441_1_1_fixed_cam.html | 2 +- ...class_c_s_c_i441_1_1_free_cam-members.html | 2 +- docs/class_c_s_c_i441_1_1_free_cam.html | 2 +- ...s_c_s_c_i441_1_1_h_u_d_camera-members.html | 2 +- docs/class_c_s_c_i441_1_1_h_u_d_camera.html | 2 +- ...ss_c_s_c_i441_1_1_m_d5_camera-members.html | 2 +- docs/class_c_s_c_i441_1_1_m_d5_camera.html | 2 +- ...ass_c_s_c_i441_1_1_m_d5_model-members.html | 2 +- docs/class_c_s_c_i441_1_1_m_d5_model.html | 2 +- ...s_c_s_c_i441_1_1_model_loader-members.html | 2 +- docs/class_c_s_c_i441_1_1_model_loader.html | 2 +- ...c_i441_1_1_open_g_l3_d_engine-members.html | 2 +- ...ass_c_s_c_i441_1_1_open_g_l3_d_engine.html | 2 +- ..._s_c_i441_1_1_open_g_l_engine-members.html | 2 +- .../class_c_s_c_i441_1_1_open_g_l_engine.html | 2 +- ...c_s_c_i441_1_1_shader_program-members.html | 2 +- docs/class_c_s_c_i441_1_1_shader_program.html | 2 +- ...1_1_1_shader_program_pipeline-members.html | 5 +- ..._s_c_i441_1_1_shader_program_pipeline.html | 30 +++- ...441_1_1_uniform_buffer_object-members.html | 2 +- ..._c_s_c_i441_1_1_uniform_buffer_object.html | 2 +- docs/classes.html | 2 +- docs/files.html | 2 +- docs/functions.html | 2 +- docs/functions_b.html | 2 +- docs/functions_c.html | 2 +- docs/functions_d.html | 2 +- docs/functions_e.html | 2 +- docs/functions_enum.html | 2 +- docs/functions_eval.html | 2 +- docs/functions_f.html | 2 +- docs/functions_func.html | 2 +- docs/functions_func_b.html | 2 +- docs/functions_func_c.html | 2 +- docs/functions_func_d.html | 2 +- docs/functions_func_e.html | 2 +- docs/functions_func_f.html | 2 +- docs/functions_func_g.html | 2 +- docs/functions_func_h.html | 2 +- docs/functions_func_i.html | 2 +- docs/functions_func_l.html | 2 +- docs/functions_func_m.html | 2 +- docs/functions_func_o.html | 2 +- docs/functions_func_p.html | 2 +- docs/functions_func_r.html | 2 +- docs/functions_func_s.html | 2 +- docs/functions_func_t.html | 2 +- docs/functions_func_u.html | 2 +- docs/functions_func_v.html | 84 +++++++++ docs/functions_func_w.html | 2 +- docs/functions_func_~.html | 2 +- docs/functions_g.html | 2 +- docs/functions_h.html | 2 +- docs/functions_i.html | 2 +- docs/functions_j.html | 2 +- docs/functions_l.html | 2 +- docs/functions_m.html | 2 +- docs/functions_n.html | 2 +- docs/functions_o.html | 2 +- docs/functions_p.html | 2 +- docs/functions_r.html | 2 +- docs/functions_s.html | 2 +- docs/functions_t.html | 2 +- docs/functions_u.html | 2 +- docs/functions_v.html | 3 +- docs/functions_vars.html | 2 +- docs/functions_w.html | 2 +- docs/functions_~.html | 2 +- docs/hierarchy.html | 2 +- docs/index.html | 2 +- docs/materials_8hpp.html | 2 +- docs/materials_8hpp_source.html | 2 +- docs/md__c_h_a_n_g_e_l_o_g.html | 135 +++++++------- docs/md__r_e_a_d_m_e.html | 4 +- docs/menudata.js | 1 + docs/model_material_8hpp.html | 2 +- docs/model_material_8hpp_source.html | 2 +- docs/namespace_c_s_c_i441.html | 2 +- docs/namespace_framebuffer_utils.html | 2 +- docs/namespace_materials.html | 2 +- docs/namespace_open_g_l_utils.html | 2 +- docs/namespace_simple_shader2.html | 2 +- docs/namespace_simple_shader3.html | 2 +- docs/namespace_texture_utils.html | 2 +- docs/namespacemembers.html | 2 +- docs/namespacemembers_func.html | 2 +- docs/namespaces.html | 2 +- docs/objects_8hpp.html | 2 +- docs/objects_8hpp_source.html | 4 +- docs/pages.html | 2 +- docs/search/all_10.js | 4 +- docs/search/all_13.js | 3 +- docs/search/all_3.js | 4 +- docs/search/functions_11.js | 2 +- docs/search/functions_12.js | 11 +- docs/search/functions_13.js | 13 ++ docs/search/searchdata.js | 2 +- ...m_d5_model_1_1_m_d5_animation-members.html | 2 +- ...441_1_1_m_d5_model_1_1_m_d5_animation.html | 2 +- ...odel_1_1_m_d5_animation_state-members.html | 2 +- ...1_m_d5_model_1_1_m_d5_animation_state.html | 2 +- ...del_1_1_m_d5_base_frame_joint-members.html | 2 +- ..._m_d5_model_1_1_m_d5_base_frame_joint.html | 2 +- ...5_model_1_1_m_d5_bounding_box-members.html | 2 +- ..._1_1_m_d5_model_1_1_m_d5_bounding_box.html | 2 +- ...1_1_m_d5_model_1_1_m_d5_joint-members.html | 2 +- ..._c_i441_1_1_m_d5_model_1_1_m_d5_joint.html | 2 +- ..._d5_model_1_1_m_d5_joint_info-members.html | 2 +- ...41_1_1_m_d5_model_1_1_m_d5_joint_info.html | 2 +- ..._1_1_m_d5_model_1_1_m_d5_mesh-members.html | 2 +- ...s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html | 2 +- ...1_m_d5_model_1_1_m_d5_texture-members.html | 2 +- ..._i441_1_1_m_d5_model_1_1_m_d5_texture.html | 2 +- ..._m_d5_model_1_1_m_d5_triangle-members.html | 2 +- ...i441_1_1_m_d5_model_1_1_m_d5_triangle.html | 2 +- ..._1_m_d5_model_1_1_m_d5_vertex-members.html | 2 +- ...c_i441_1_1_m_d5_model_1_1_m_d5_vertex.html | 2 +- ..._1_m_d5_model_1_1_m_d5_weight-members.html | 2 +- ...c_i441_1_1_m_d5_model_1_1_m_d5_weight.html | 2 +- ...41_1_1_materials_1_1_material-members.html | 2 +- ...c_s_c_i441_1_1_materials_1_1_material.html | 2 +- docs/teapot_8hpp.html | 2 +- docs/teapot_8hpp_source.html | 2 +- objects.hpp | 2 +- 174 files changed, 464 insertions(+), 325 deletions(-) create mode 100644 docs/functions_func_v.html create mode 100644 docs/search/functions_13.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a35510c..b0dd89c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Revision History +## 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 diff --git a/csci441.dox.config b/csci441.dox.config index 15d6232f..c19ded3a 100644 --- a/csci441.dox.config +++ b/csci441.dox.config @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "CSCI441 OpenGL Library" -PROJECT_NUMBER = 4.12.2 +PROJECT_NUMBER = 4.13.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 14c6f40f..6facd098 100644 --- a/docs/_arcball_cam_8hpp.html +++ b/docs/_arcball_cam_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 041a9317..6c5d7c55 100644 --- a/docs/_arcball_cam_8hpp_source.html +++ b/docs/_arcball_cam_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 d5ce4561..1ef6a436 100644 --- a/docs/_c_s_c_i441_8hpp.html +++ b/docs/_c_s_c_i441_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_c_s_c_i441_8hpp_source.html b/docs/_c_s_c_i441_8hpp_source.html index 0b2e0c3c..a812a9e5 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 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_camera_8hpp.html b/docs/_camera_8hpp.html index 956b01c6..9ee76cb1 100644 --- a/docs/_camera_8hpp.html +++ b/docs/_camera_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_camera_8hpp_source.html b/docs/_camera_8hpp_source.html index beb54965..e2514512 100644 --- a/docs/_camera_8hpp_source.html +++ b/docs/_camera_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 d6d65fdb..6e29fee0 100644 --- a/docs/_compute_shader_program_8hpp.html +++ b/docs/_compute_shader_program_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 275467db..3e893d32 100644 --- a/docs/_compute_shader_program_8hpp_source.html +++ b/docs/_compute_shader_program_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_fixed_cam_8hpp.html b/docs/_fixed_cam_8hpp.html index 9891e270..66e33810 100644 --- a/docs/_fixed_cam_8hpp.html +++ b/docs/_fixed_cam_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 74f43b52..b84f8db0 100644 --- a/docs/_fixed_cam_8hpp_source.html +++ b/docs/_fixed_cam_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_framebuffer_utils_8hpp.html b/docs/_framebuffer_utils_8hpp.html index 5e0c3d16..f009becb 100644 --- a/docs/_framebuffer_utils_8hpp.html +++ b/docs/_framebuffer_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 a7d65570..efd0e315 100644 --- a/docs/_framebuffer_utils_8hpp_source.html +++ b/docs/_framebuffer_utils_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_free_cam_8hpp.html b/docs/_free_cam_8hpp.html index 8d6bf875..fefc3e9d 100644 --- a/docs/_free_cam_8hpp.html +++ b/docs/_free_cam_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 f40236ab..67eefdcd 100644 --- a/docs/_free_cam_8hpp_source.html +++ b/docs/_free_cam_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 67276b87..d90fd39e 100644 --- a/docs/_h_u_d_camera_8hpp.html +++ b/docs/_h_u_d_camera_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 ab60904a..09f423ae 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 60f7e67d..540fe467 100644 --- a/docs/_m_d5_camera_8hpp.html +++ b/docs/_m_d5_camera_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 5cee85a5..fcf2ccf8 100644 --- a/docs/_m_d5_camera_8hpp_source.html +++ b/docs/_m_d5_camera_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_m_d5_model_8hpp.html b/docs/_m_d5_model_8hpp.html index d8958147..67760551 100644 --- a/docs/_m_d5_model_8hpp.html +++ b/docs/_m_d5_model_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_m_d5_model_8hpp_source.html b/docs/_m_d5_model_8hpp_source.html index b9a30305..94d80f75 100644 --- a/docs/_m_d5_model_8hpp_source.html +++ b/docs/_m_d5_model_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_model_loader_8hpp.html b/docs/_model_loader_8hpp.html index 22bdcbd8..27231b8b 100644 --- a/docs/_model_loader_8hpp.html +++ b/docs/_model_loader_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 e5976ce3..e9b8075e 100644 --- a/docs/_model_loader_8hpp_source.html +++ b/docs/_model_loader_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 2600454d..d970f978 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 363c5bcb..8caaea0a 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 f16e0785..ef064791 100644 --- a/docs/_open_g_l_engine_8hpp.html +++ b/docs/_open_g_l_engine_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 eaa75180..8316ac13 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 b76bec37..898a3057 100644 --- a/docs/_open_g_l_utils_8hpp.html +++ b/docs/_open_g_l_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_open_g_l_utils_8hpp_source.html b/docs/_open_g_l_utils_8hpp_source.html index 3787e074..0301a52b 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 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_shader_program_8hpp.html b/docs/_shader_program_8hpp.html index 69107bcd..6e46d12a 100644 --- a/docs/_shader_program_8hpp.html +++ b/docs/_shader_program_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 d6663d7f..e08b30b0 100644 --- a/docs/_shader_program_8hpp_source.html +++ b/docs/_shader_program_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 ef4e1375..eb7ce065 100644 --- a/docs/_shader_program_pipeline_8hpp.html +++ b/docs/_shader_program_pipeline_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 36d56498..fb375ba8 100644 --- a/docs/_shader_program_pipeline_8hpp_source.html +++ b/docs/_shader_program_pipeline_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -103,94 +103,105 @@
79
83 [[maybe_unused]] void printPipelineInfo() const;
84
-
85 private:
-
86 static bool sDEBUG;
-
87
-
88 GLuint _pipelineHandle{};
-
89 };
-
90}
-
91
+
89 [[maybe_unused]] [[nodiscard]] bool validatePipeline() const;
+
90
+
91 private:
+
92 static bool sDEBUG;
93
-
94inline bool CSCI441::ShaderProgramPipeline::sDEBUG = true;
-
95
-
96[[maybe_unused]]
-
97inline void CSCI441::ShaderProgramPipeline::enableDebugMessages() {
-
98 sDEBUG = true;
-
99}
-
100
-
101[[maybe_unused]]
-
102inline void CSCI441::ShaderProgramPipeline::disableDebugMessages() {
-
103 sDEBUG = false;
-
104}
-
105
-
106inline CSCI441::ShaderProgramPipeline::ShaderProgramPipeline() {
-
107 glGenProgramPipelines(1,& _pipelineHandle);
-
108}
-
109
-
110inline CSCI441::ShaderProgramPipeline::~ShaderProgramPipeline() {
-
111 glDeleteProgramPipelines(1, &_pipelineHandle);
-
112}
-
113
-
114[[maybe_unused]]
-
115inline void CSCI441::ShaderProgramPipeline::useProgramStages( const GLbitfield programStages, const ShaderProgram * const shaderProgram ) const {
-
116 glUseProgramStages( _pipelineHandle, programStages, shaderProgram->getShaderProgramHandle() );
-
117}
-
118
-
119[[maybe_unused]]
-
120inline void CSCI441::ShaderProgramPipeline::useProgramStages( const ShaderProgram * const shaderProgram ) const {
-
121 glUseProgramStages( _pipelineHandle, shaderProgram->getProgramStages(), shaderProgram->getShaderProgramHandle() );
-
122}
-
123
-
124[[maybe_unused]]
-
125inline void CSCI441::ShaderProgramPipeline::bindPipeline() const {
-
126 glUseProgram(0); // unuse any existing program that may have previously been used. programs override pipelines
-
127 glBindProgramPipeline( _pipelineHandle );
+
94 GLuint _pipelineHandle;
+
95 };
+
96}
+
97
+
99
+
100inline bool CSCI441::ShaderProgramPipeline::sDEBUG = true;
+
101
+
102[[maybe_unused]]
+
103inline void CSCI441::ShaderProgramPipeline::enableDebugMessages() {
+
104 sDEBUG = true;
+
105}
+
106
+
107[[maybe_unused]]
+
108inline void CSCI441::ShaderProgramPipeline::disableDebugMessages() {
+
109 sDEBUG = false;
+
110}
+
111
+
112inline CSCI441::ShaderProgramPipeline::ShaderProgramPipeline() : _pipelineHandle(0) {
+
113 glGenProgramPipelines(1,& _pipelineHandle);
+
114}
+
115
+
116inline CSCI441::ShaderProgramPipeline::~ShaderProgramPipeline() {
+
117 glDeleteProgramPipelines(1, &_pipelineHandle);
+
118}
+
119
+
120[[maybe_unused]]
+
121inline void CSCI441::ShaderProgramPipeline::useProgramStages( const GLbitfield programStages, const ShaderProgram * const shaderProgram ) const {
+
122 glUseProgramStages( _pipelineHandle, programStages, shaderProgram->getShaderProgramHandle() );
+
123}
+
124
+
125[[maybe_unused]]
+
126inline void CSCI441::ShaderProgramPipeline::useProgramStages( const ShaderProgram * const shaderProgram ) const {
+
127 glUseProgramStages( _pipelineHandle, shaderProgram->getProgramStages(), shaderProgram->getShaderProgramHandle() );
128}
129
130[[maybe_unused]]
-
131inline void CSCI441::ShaderProgramPipeline::printPipelineInfo() const {
-
132 if( sDEBUG ) {
-
133 printf( "\n[INFO]: /--------------------------------------------------------\\\n");
-
134 printf( "[INFO]: | Program Pipeline: |\n");
-
135 printf( "[INFO]: | Pipeline Handle: %4u %32c\n", _pipelineHandle, '|' );
-
136
-
137 CSCI441_INTERNAL::ShaderUtils::printProgramPipelineLog(_pipelineHandle);
-
138
-
139 printf( "[INFO]: >--------------------------------------------------------<\n");
-
140
-
141 GLint vs, tcs, tes, gs, fs;
-
142 glGetProgramPipelineiv( _pipelineHandle, GL_VERTEX_SHADER, &vs );
-
143 glGetProgramPipelineiv( _pipelineHandle, GL_TESS_CONTROL_SHADER, &tcs );
-
144 glGetProgramPipelineiv( _pipelineHandle, GL_TESS_EVALUATION_SHADER, &tes );
-
145 glGetProgramPipelineiv( _pipelineHandle, GL_GEOMETRY_SHADER, &gs );
-
146 glGetProgramPipelineiv( _pipelineHandle, GL_FRAGMENT_SHADER, &fs );
-
147
-
148 if( vs != 0 ) printf( "[INFO]: | Vertex Shader Program Handle: %2d |\n", vs );
-
149 if( tcs != 0 ) printf( "[INFO]: | Tess Ctrl Shader Program Handle: %2d |\n", tcs );
-
150 if( tes != 0 ) printf( "[INFO]: | Tess Eval Shader Program Handle: %2d |\n", tes );
-
151 if( gs != 0 ) printf( "[INFO]: | Geometry Shader Program Handle: %2d |\n", gs );
-
152 if( fs != 0 ) printf( "[INFO]: | Fragment Shader Program Handle: %2d |\n", fs );
-
153
-
154 printf( "[INFO]: \\--------------------------------------------------------/\n");
-
155 printf( "\n");
-
156 }
-
157}
-
158
-
159#endif// CSCI441_SHADER_PROGRAM_PIPELINE_HPP
+
131inline void CSCI441::ShaderProgramPipeline::bindPipeline() const {
+
132 glUseProgram(0); // un-use any existing program that may have previously been used. programs override pipelines
+
133 glBindProgramPipeline( _pipelineHandle );
+
134}
+
135
+
136[[maybe_unused]]
+
137inline void CSCI441::ShaderProgramPipeline::printPipelineInfo() const {
+
138 if( sDEBUG ) {
+
139 printf( "\n[INFO]: /--------------------------------------------------------\\\n");
+
140 printf( "[INFO]: | Program Pipeline: |\n");
+
141 printf( "[INFO]: | Pipeline Handle: %4u %32c\n", _pipelineHandle, '|' );
+
142
+
143 CSCI441_INTERNAL::ShaderUtils::printProgramPipelineLog(_pipelineHandle);
+
144
+
145 printf( "[INFO]: >--------------------------------------------------------<\n");
+
146
+
147 GLint vs, tcs, tes, gs, fs;
+
148 glGetProgramPipelineiv( _pipelineHandle, GL_VERTEX_SHADER, &vs );
+
149 glGetProgramPipelineiv( _pipelineHandle, GL_TESS_CONTROL_SHADER, &tcs );
+
150 glGetProgramPipelineiv( _pipelineHandle, GL_TESS_EVALUATION_SHADER, &tes );
+
151 glGetProgramPipelineiv( _pipelineHandle, GL_GEOMETRY_SHADER, &gs );
+
152 glGetProgramPipelineiv( _pipelineHandle, GL_FRAGMENT_SHADER, &fs );
+
153
+
154 if( vs != 0 ) printf( "[INFO]: | Vertex Shader Program Handle: %2d |\n", vs );
+
155 if( tcs != 0 ) printf( "[INFO]: | Tess Ctrl Shader Program Handle: %2d |\n", tcs );
+
156 if( tes != 0 ) printf( "[INFO]: | Tess Eval Shader Program Handle: %2d |\n", tes );
+
157 if( gs != 0 ) printf( "[INFO]: | Geometry Shader Program Handle: %2d |\n", gs );
+
158 if( fs != 0 ) printf( "[INFO]: | Fragment Shader Program Handle: %2d |\n", fs );
+
159
+
160 printf( "[INFO]: \\--------------------------------------------------------/\n");
+
161 printf( "\n");
+
162 }
+
163}
+
164
+
165[[maybe_unused]]
+
166inline bool CSCI441::ShaderProgramPipeline::validatePipeline() const {
+
167 glValidateProgramPipeline(_pipelineHandle);
+
168 GLint validateStatus;
+
169 glGetProgramPipelineiv(_pipelineHandle, GL_VALIDATE_STATUS, &validateStatus);
+
170 return (validateStatus == GL_TRUE);
+
171}
+
172
+
173#endif// CSCI441_SHADER_PROGRAM_PIPELINE_HPP
ShaderProgram.hpp
Class to work with OpenGL 4.0+ Shaders.
CSCI441::ShaderProgram
Handles registration and compilation of Shaders.
Definition: ShaderProgram.hpp:34
CSCI441::ShaderProgram::getProgramStages
virtual GLbitfield getProgramStages() const final
returns a single value corresponding to which shader stages are present in this shader program
Definition: ShaderProgram.hpp:1987
CSCI441::ShaderProgram::getShaderProgramHandle
virtual GLuint getShaderProgramHandle() const final
Returns the handle for this shader program.
Definition: ShaderProgram.hpp:1405
CSCI441::ShaderProgramPipeline
Handles registration and compilation of Shader Program Pipelines.
Definition: ShaderProgramPipeline.hpp:26
CSCI441::ShaderProgramPipeline::ShaderProgramPipeline
ShaderProgramPipeline(const ShaderProgramPipeline &)=delete
do not allow shader program pipelines to be copied
-
CSCI441::ShaderProgramPipeline::useProgramStages
void useProgramStages(GLbitfield programStages, const ShaderProgram *shaderProgram) const
adds shader program stages to pipeline
Definition: ShaderProgramPipeline.hpp:115
-
CSCI441::ShaderProgramPipeline::ShaderProgramPipeline
ShaderProgramPipeline()
creates a shader program pipeline by generating a shader program pipeline handle
Definition: ShaderProgramPipeline.hpp:106
-
CSCI441::ShaderProgramPipeline::enableDebugMessages
static void enableDebugMessages()
Enables debug messages from Shader Program functions.
Definition: ShaderProgramPipeline.hpp:97
-
CSCI441::ShaderProgramPipeline::bindPipeline
void bindPipeline() const
bind shader program pipeline
Definition: ShaderProgramPipeline.hpp:125
+
CSCI441::ShaderProgramPipeline::useProgramStages
void useProgramStages(GLbitfield programStages, const ShaderProgram *shaderProgram) const
adds shader program stages to pipeline
Definition: ShaderProgramPipeline.hpp:121
+
CSCI441::ShaderProgramPipeline::ShaderProgramPipeline
ShaderProgramPipeline()
creates a shader program pipeline by generating a shader program pipeline handle
Definition: ShaderProgramPipeline.hpp:112
+
CSCI441::ShaderProgramPipeline::enableDebugMessages
static void enableDebugMessages()
Enables debug messages from Shader Program functions.
Definition: ShaderProgramPipeline.hpp:103
+
CSCI441::ShaderProgramPipeline::validatePipeline
bool validatePipeline() const
Definition: ShaderProgramPipeline.hpp:166
+
CSCI441::ShaderProgramPipeline::bindPipeline
void bindPipeline() const
bind shader program pipeline
Definition: ShaderProgramPipeline.hpp:131
CSCI441::ShaderProgramPipeline::operator=
ShaderProgramPipeline & operator=(const ShaderProgramPipeline &)=delete
do not allow shader program pipelines to be copied
-
CSCI441::ShaderProgramPipeline::~ShaderProgramPipeline
~ShaderProgramPipeline()
deletes a shader program pipeline by deleting the shader program pipeline handle
Definition: ShaderProgramPipeline.hpp:110
-
CSCI441::ShaderProgramPipeline::disableDebugMessages
static void disableDebugMessages()
Disables debug messages from Shader Program functions.
Definition: ShaderProgramPipeline.hpp:102
-
CSCI441::ShaderProgramPipeline::printPipelineInfo
void printPipelineInfo() const
prints shader program pipeline information to console
Definition: ShaderProgramPipeline.hpp:131
+
CSCI441::ShaderProgramPipeline::~ShaderProgramPipeline
~ShaderProgramPipeline()
deletes a shader program pipeline by deleting the shader program pipeline handle
Definition: ShaderProgramPipeline.hpp:116
+
CSCI441::ShaderProgramPipeline::disableDebugMessages
static void disableDebugMessages()
Disables debug messages from Shader Program functions.
Definition: ShaderProgramPipeline.hpp:108
+
CSCI441::ShaderProgramPipeline::printPipelineInfo
void printPipelineInfo() const
prints shader program pipeline information to console
Definition: ShaderProgramPipeline.hpp:137
CSCI441
CSCI441 Helper Functions for OpenGL.
Definition: ArcballCam.hpp:17
diff --git a/docs/_shader_utils_8hpp.html b/docs/_shader_utils_8hpp.html index d48107e1..354e482d 100644 --- a/docs/_shader_utils_8hpp.html +++ b/docs/_shader_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 6b93c845..bec255cc 100644 --- a/docs/_shader_utils_8hpp_source.html +++ b/docs/_shader_utils_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_simple_shader_8hpp.html b/docs/_simple_shader_8hpp.html index fccb54be..5384f369 100644 --- a/docs/_simple_shader_8hpp.html +++ b/docs/_simple_shader_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 a5f16f55..541769b0 100644 --- a/docs/_simple_shader_8hpp_source.html +++ b/docs/_simple_shader_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/_texture_utils_8hpp.html b/docs/_texture_utils_8hpp.html index 9036bab3..ee42d126 100644 --- a/docs/_texture_utils_8hpp.html +++ b/docs/_texture_utils_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 f4d322a1..1462d549 100644 --- a/docs/_texture_utils_8hpp_source.html +++ b/docs/_texture_utils_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 ef6d00a2..f32a3864 100644 --- a/docs/_uniform_buffer_object_8hpp.html +++ b/docs/_uniform_buffer_object_8hpp.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 c2e4e9ad..d3d5261f 100644 --- a/docs/_uniform_buffer_object_8hpp_source.html +++ b/docs/_uniform_buffer_object_8hpp_source.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
diff --git a/docs/annotated.html b/docs/annotated.html index 1501ab5b..ee5c57df 100644 --- a/docs/annotated.html +++ b/docs/annotated.html @@ -21,7 +21,7 @@ -
CSCI441 OpenGL Library 4.12.2 +
CSCI441 OpenGL Library 4.13.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 3067c847..7c3dfeb7 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 231f9138..683be351 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 6e4b7e5d..256444c1 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 606b7767..f8009957 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 c1740fab..43fc24e3 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 d3b67fde..7f3e3f45 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 44ffbd23..b060191e 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 1dad5a10..be13ad2d 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 931607c1..793cb0d9 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 42cab634..98720fb5 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 a63d9f65..f9da3af6 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 e103ee4a..bc34b67d 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 aa9ae3b3..cc62f5e7 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 c2aab8b8..7256d525 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 a3acf67a..b60e9080 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 035b3e73..565f89e2 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 225314a6..b509b1d0 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 6896219b..7d6c76ea 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 6ee62c5d..e77c7464 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 79e6bc64..8cb3b72c 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 be8804ad..aff353a3 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 e08b9bf6..29934666 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 ea62fa7b..d6778b69 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 c5f0a663..c7f9aa2c 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 4.12.2 +
CSCI441 OpenGL Library 4.13.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 c026cbab..58caa1db 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 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -89,7 +89,8 @@ ShaderProgramPipeline(const ShaderProgramPipeline &)=deleteCSCI441::ShaderProgramPipeline useProgramStages(GLbitfield programStages, const ShaderProgram *shaderProgram) constCSCI441::ShaderProgramPipelineinline useProgramStages(const ShaderProgram *shaderProgram) constCSCI441::ShaderProgramPipelineinline - ~ShaderProgramPipeline()CSCI441::ShaderProgramPipelineinline + validatePipeline() constCSCI441::ShaderProgramPipelineinline + ~ShaderProgramPipeline()CSCI441::ShaderProgramPipelineinline
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 55916062..b73919f8 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 4.12.2 +
CSCI441 OpenGL Library 4.13.0
CS@Mines CSCI441 Computer Graphics Course Library
@@ -118,6 +118,8 @@ void printPipelineInfo () const  prints shader program pipeline information to console
  +bool validatePipeline () const +  @@ -294,6 +296,32 @@

Note
ShaderProgram must be separable
+ + + +

◆ validatePipeline()

+ +
+
+

Static Public Member Functions

+ + + + +
+ + + + + + + +
bool CSCI441::ShaderProgramPipeline::validatePipeline () const
+ 		+inline
+
+

checks if shader program pipeline is in valid state to run

Returns
true if valid
+
The documentation for this class was generated from the following file:
    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 727841c4..f2896d97 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 1c8b0667..4696a10f 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/classes.html b/docs/classes.html index 746093ab..ca9c38cc 100644 --- a/docs/classes.html +++ b/docs/classes.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/files.html b/docs/files.html index af641f0e..ac97cde4 100644 --- a/docs/files.html +++ b/docs/files.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions.html b/docs/functions.html index 2a6d35c6..89f94237 100644 --- a/docs/functions.html +++ b/docs/functions.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_b.html b/docs/functions_b.html index cfa7056b..7ed175d8 100644 --- a/docs/functions_b.html +++ b/docs/functions_b.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_c.html b/docs/functions_c.html index 0817f608..60704f53 100644 --- a/docs/functions_c.html +++ b/docs/functions_c.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_d.html b/docs/functions_d.html index 68a125f9..ece6065f 100644 --- a/docs/functions_d.html +++ b/docs/functions_d.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_e.html b/docs/functions_e.html index c42beb45..9e4af11b 100644 --- a/docs/functions_e.html +++ b/docs/functions_e.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_enum.html b/docs/functions_enum.html index 417bac02..9517fcbc 100644 --- a/docs/functions_enum.html +++ b/docs/functions_enum.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_eval.html b/docs/functions_eval.html index 23d28280..f1f00fea 100644 --- a/docs/functions_eval.html +++ b/docs/functions_eval.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_f.html b/docs/functions_f.html index 09241c5b..a04436b9 100644 --- a/docs/functions_f.html +++ b/docs/functions_f.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func.html b/docs/functions_func.html index 217e3d6a..ab9497c2 100644 --- a/docs/functions_func.html +++ b/docs/functions_func.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_b.html b/docs/functions_func_b.html index a4fa24b8..85cb5d9b 100644 --- a/docs/functions_func_b.html +++ b/docs/functions_func_b.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_c.html b/docs/functions_func_c.html index 469e285c..84e64df9 100644 --- a/docs/functions_func_c.html +++ b/docs/functions_func_c.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_d.html b/docs/functions_func_d.html index 91037c0b..472a83fb 100644 --- a/docs/functions_func_d.html +++ b/docs/functions_func_d.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_e.html b/docs/functions_func_e.html index 40e39ef1..b746a3c6 100644 --- a/docs/functions_func_e.html +++ b/docs/functions_func_e.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_f.html b/docs/functions_func_f.html index ebe322d3..656ba104 100644 --- a/docs/functions_func_f.html +++ b/docs/functions_func_f.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_g.html b/docs/functions_func_g.html index 4c13bd14..154d7214 100644 --- a/docs/functions_func_g.html +++ b/docs/functions_func_g.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_h.html b/docs/functions_func_h.html index f09cc68c..8af17866 100644 --- a/docs/functions_func_h.html +++ b/docs/functions_func_h.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_i.html b/docs/functions_func_i.html index 37143514..92d1cc5a 100644 --- a/docs/functions_func_i.html +++ b/docs/functions_func_i.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_l.html b/docs/functions_func_l.html index 7133132c..d52172d0 100644 --- a/docs/functions_func_l.html +++ b/docs/functions_func_l.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_m.html b/docs/functions_func_m.html index 2caa1fe9..b64ec93b 100644 --- a/docs/functions_func_m.html +++ b/docs/functions_func_m.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_o.html b/docs/functions_func_o.html index 4ec6a06e..44c644a6 100644 --- a/docs/functions_func_o.html +++ b/docs/functions_func_o.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_p.html b/docs/functions_func_p.html index ee60bc19..a6f46d4c 100644 --- a/docs/functions_func_p.html +++ b/docs/functions_func_p.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_r.html b/docs/functions_func_r.html index faae21a3..a9a64ebc 100644 --- a/docs/functions_func_r.html +++ b/docs/functions_func_r.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_s.html b/docs/functions_func_s.html index 354ddf37..d4c1d9a9 100644 --- a/docs/functions_func_s.html +++ b/docs/functions_func_s.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_t.html b/docs/functions_func_t.html index 35751640..5fae70f0 100644 --- a/docs/functions_func_t.html +++ b/docs/functions_func_t.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_u.html b/docs/functions_func_u.html index 4e97995a..0d644efb 100644 --- a/docs/functions_func_u.html +++ b/docs/functions_func_u.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_v.html b/docs/functions_func_v.html new file mode 100644 index 00000000..07217b26 --- /dev/null +++ b/docs/functions_func_v.html @@ -0,0 +1,84 @@ + + + + + + + +CSCI441 OpenGL Library: Class Members - Functions + + + + + + + + + +
    +
    + + + + + + +
    +
    CSCI441 OpenGL Library 4.13.0 +
    +
    CS@Mines CSCI441 Computer Graphics Course Library
    +
    +
    + + + + + + + +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    Loading...
    +
    Searching...
    +
    No Matches
    +
    +
    +
    +
    + +
    +  + +

    - v -

    +
    + +
    +Generated by doxygen 1.9.6 +
    + + diff --git a/docs/functions_func_w.html b/docs/functions_func_w.html index 7eec3f03..1272190a 100644 --- a/docs/functions_func_w.html +++ b/docs/functions_func_w.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_func_~.html b/docs/functions_func_~.html index 721b2cdc..08fbe0ec 100644 --- a/docs/functions_func_~.html +++ b/docs/functions_func_~.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_g.html b/docs/functions_g.html index e2debe33..a5c31fcb 100644 --- a/docs/functions_g.html +++ b/docs/functions_g.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_h.html b/docs/functions_h.html index 67cf8521..6df10582 100644 --- a/docs/functions_h.html +++ b/docs/functions_h.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_i.html b/docs/functions_i.html index 5b471c1a..3a8594d4 100644 --- a/docs/functions_i.html +++ b/docs/functions_i.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_j.html b/docs/functions_j.html index b42c8bf3..3b811107 100644 --- a/docs/functions_j.html +++ b/docs/functions_j.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_l.html b/docs/functions_l.html index 9dd595d0..f59e0013 100644 --- a/docs/functions_l.html +++ b/docs/functions_l.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_m.html b/docs/functions_m.html index 88ad3170..425b298a 100644 --- a/docs/functions_m.html +++ b/docs/functions_m.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_n.html b/docs/functions_n.html index f1f60ca2..049a1aff 100644 --- a/docs/functions_n.html +++ b/docs/functions_n.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_o.html b/docs/functions_o.html index 185f7ded..998322ad 100644 --- a/docs/functions_o.html +++ b/docs/functions_o.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_p.html b/docs/functions_p.html index b5876b34..5176b503 100644 --- a/docs/functions_p.html +++ b/docs/functions_p.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_r.html b/docs/functions_r.html index 5537b997..4f557b36 100644 --- a/docs/functions_r.html +++ b/docs/functions_r.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_s.html b/docs/functions_s.html index aff083f5..14950283 100644 --- a/docs/functions_s.html +++ b/docs/functions_s.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_t.html b/docs/functions_t.html index 2abcde70..b3099e2b 100644 --- a/docs/functions_t.html +++ b/docs/functions_t.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_u.html b/docs/functions_u.html index ef0fdcb6..14388398 100644 --- a/docs/functions_u.html +++ b/docs/functions_u.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_v.html b/docs/functions_v.html index f201c484..63fec0cf 100644 --- a/docs/functions_v.html +++ b/docs/functions_v.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    @@ -73,6 +73,7 @@
    Here is a list of all documented class members with links to the class documentation for each member:

    - v -

    diff --git a/docs/functions_vars.html b/docs/functions_vars.html index 00cd2a91..b97dddbb 100644 --- a/docs/functions_vars.html +++ b/docs/functions_vars.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_w.html b/docs/functions_w.html index d612726f..c1ad665b 100644 --- a/docs/functions_w.html +++ b/docs/functions_w.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/functions_~.html b/docs/functions_~.html index 95ab129e..ded99cd7 100644 --- a/docs/functions_~.html +++ b/docs/functions_~.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/hierarchy.html b/docs/hierarchy.html index c9fe908c..86bf359e 100644 --- a/docs/hierarchy.html +++ b/docs/hierarchy.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/index.html b/docs/index.html index f84784a7..4afc7d23 100644 --- a/docs/index.html +++ b/docs/index.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/materials_8hpp.html b/docs/materials_8hpp.html index 5b91dd08..98428e92 100644 --- a/docs/materials_8hpp.html +++ b/docs/materials_8hpp.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/materials_8hpp_source.html b/docs/materials_8hpp_source.html index 53688d33..746c261d 100644 --- a/docs/materials_8hpp_source.html +++ b/docs/materials_8hpp_source.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 704c409c..45a10698 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    @@ -74,39 +74,44 @@

    +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
      • @@ -114,12 +119,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
      • @@ -127,30 +132,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
        @@ -162,92 +167,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
      • @@ -257,39 +262,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
      • @@ -299,12 +304,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.
      • @@ -317,7 +322,7 @@

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

    -

    +

    v 2.10.0 - 23 Feb 2021

    • Added wrapper class for ComputeShaderProgram
      • @@ -325,71 +330,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
      • @@ -401,20 +406,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
      • @@ -422,22 +427,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
      • @@ -450,7 +455,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
      • @@ -458,23 +463,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 dd4c43dc..157c483d 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 4.12.2 +
      CSCI441 OpenGL Library 4.13.0
      CS@Mines CSCI441 Computer Graphics Course Library
      @@ -82,7 +82,7 @@
    • glm v0.9.9

    The OpenGL, GLFW, and GLEW 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/menudata.js b/docs/menudata.js index 97e8ceab..3b29d57f 100644 --- a/docs/menudata.js +++ b/docs/menudata.js @@ -76,6 +76,7 @@ var menudata={children:[ {text:"s",url:"functions_func_s.html#index_s"}, {text:"t",url:"functions_func_t.html#index_t"}, {text:"u",url:"functions_func_u.html#index_u"}, +{text:"v",url:"functions_func_v.html#index_v"}, {text:"w",url:"functions_func_w.html#index_w"}, {text:"~",url:"functions_func_~.html#index__7E"}]}, {text:"Variables",url:"functions_vars.html",children:[ diff --git a/docs/model_material_8hpp.html b/docs/model_material_8hpp.html index 8325a85f..3974407e 100644 --- a/docs/model_material_8hpp.html +++ b/docs/model_material_8hpp.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 9f8578ea..84e7073e 100644 --- a/docs/model_material_8hpp_source.html +++ b/docs/model_material_8hpp_source.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 54a41c53..6e33088e 100644 --- a/docs/namespace_c_s_c_i441.html +++ b/docs/namespace_c_s_c_i441.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespace_framebuffer_utils.html b/docs/namespace_framebuffer_utils.html index eef543ec..580e6252 100644 --- a/docs/namespace_framebuffer_utils.html +++ b/docs/namespace_framebuffer_utils.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespace_materials.html b/docs/namespace_materials.html index d8407b0f..909c2e79 100644 --- a/docs/namespace_materials.html +++ b/docs/namespace_materials.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 784394c1..a5af6a3f 100644 --- a/docs/namespace_open_g_l_utils.html +++ b/docs/namespace_open_g_l_utils.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespace_simple_shader2.html b/docs/namespace_simple_shader2.html index 24b34db3..8f9725d3 100644 --- a/docs/namespace_simple_shader2.html +++ b/docs/namespace_simple_shader2.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespace_simple_shader3.html b/docs/namespace_simple_shader3.html index 5eba3ea8..81c051cc 100644 --- a/docs/namespace_simple_shader3.html +++ b/docs/namespace_simple_shader3.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespace_texture_utils.html b/docs/namespace_texture_utils.html index 1a5400db..0cd2c312 100644 --- a/docs/namespace_texture_utils.html +++ b/docs/namespace_texture_utils.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespacemembers.html b/docs/namespacemembers.html index 7c2bfde0..2c6c17e1 100644 --- a/docs/namespacemembers.html +++ b/docs/namespacemembers.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespacemembers_func.html b/docs/namespacemembers_func.html index aa994d15..a064b2ad 100644 --- a/docs/namespacemembers_func.html +++ b/docs/namespacemembers_func.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/namespaces.html b/docs/namespaces.html index 9eec74f1..34be6d87 100644 --- a/docs/namespaces.html +++ b/docs/namespaces.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/objects_8hpp.html b/docs/objects_8hpp.html index ce26afca..e47f3591 100644 --- a/docs/objects_8hpp.html +++ b/docs/objects_8hpp.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/objects_8hpp_source.html b/docs/objects_8hpp_source.html index ad3d5039..9f0c6bc6 100644 --- a/docs/objects_8hpp_source.html +++ b/docs/objects_8hpp_source.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    @@ -874,7 +874,7 @@
    1037 glBufferData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES, nullptr, GL_STATIC_DRAW );
    1038 glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(glm::vec3) * NUM_VERTICES, vertices );
    1039 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES, sizeof(glm::vec3) * NUM_VERTICES, normals );
    -
    1040 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES * 2, sizeof(glm::vec3) * NUM_VERTICES, texCoords );
    +
    1040 glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES * 2, sizeof(glm::vec2) * NUM_VERTICES, texCoords );
    1041
    1042 glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, vbods[1] );
    1043 glBufferData( GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW) ;
    diff --git a/docs/pages.html b/docs/pages.html index 051d6bb0..91e26986 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/search/all_10.js b/docs/search/all_10.js index 5c65b6be..9142b855 100644 --- a/docs/search/all_10.js +++ b/docs/search/all_10.js @@ -40,8 +40,8 @@ var searchData= ['simpleshader2_37',['SimpleShader2',['../namespace_simple_shader2.html',1,'']]], ['simpleshader3_38',['SimpleShader3',['../namespace_simple_shader3.html',1,'']]], ['skeletonframes_39',['skeletonFrames',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_animation.html#a1031fee9f76ccc58524a6857e9acb9d9',1,'CSCI441::MD5Model::MD5Animation']]], - ['specular_40',['specular',['../struct_c_s_c_i441_1_1_materials_1_1_material.html#ac1a20c197ba9dd4a9ebbf6f36679f49f',1,'CSCI441::Materials::Material']]], - ['specular_41',['SPECULAR',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html#a1de339786389dba8d236be547720c68ba6648381d85831c8fbb04ab219d2085e6',1,'CSCI441::MD5Model::MD5Mesh']]], + ['specular_40',['SPECULAR',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html#a1de339786389dba8d236be547720c68ba6648381d85831c8fbb04ab219d2085e6',1,'CSCI441::MD5Model::MD5Mesh']]], + ['specular_41',['specular',['../struct_c_s_c_i441_1_1_materials_1_1_material.html#ac1a20c197ba9dd4a9ebbf6f36679f49f',1,'CSCI441::Materials::Material']]], ['start_42',['start',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_vertex.html#aeaafa5177f04ad881d1a94ed0f56f42e',1,'CSCI441::MD5Model::MD5Vertex']]], ['startindex_43',['startIndex',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_joint_info.html#a5a713ee606b3310a67cafc685e119c32',1,'CSCI441::MD5Model::MD5JointInfo']]] ]; diff --git a/docs/search/all_13.js b/docs/search/all_13.js index 9790971d..86943e69 100644 --- a/docs/search/all_13.js +++ b/docs/search/all_13.js @@ -1,4 +1,5 @@ var searchData= [ - ['vertices_0',['vertices',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html#aa158c3a9d7fee48447892195dcedc969',1,'CSCI441::MD5Model::MD5Mesh']]] + ['validatepipeline_0',['validatePipeline',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#a8a67b9bb52b48b1df00315f5bd118fcc',1,'CSCI441::ShaderProgramPipeline']]], + ['vertices_1',['vertices',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html#aa158c3a9d7fee48447892195dcedc969',1,'CSCI441::MD5Model::MD5Mesh']]] ]; diff --git a/docs/search/all_3.js b/docs/search/all_3.js index 5c83a37a..dc7bb3f5 100644 --- a/docs/search/all_3.js +++ b/docs/search/all_3.js @@ -3,8 +3,8 @@ var searchData= ['debug_0',['DEBUG',['../class_c_s_c_i441_1_1_open_g_l_engine.html#a07ffcf7e4e3539b0d674d13b58383a0e',1,'CSCI441::OpenGLEngine']]], ['deleteobjectvaos_1',['deleteObjectVAOs',['../namespace_c_s_c_i441.html#a40af25cf92eb23f7999256aeefb0456a',1,'CSCI441']]], ['deleteobjectvbos_2',['deleteObjectVBOs',['../namespace_c_s_c_i441.html#a391eacbe953d622a7fefa94f27982fe5',1,'CSCI441']]], - ['diffuse_3',['diffuse',['../struct_c_s_c_i441_1_1_materials_1_1_material.html#a8e7e3791a3edd0067deade301645bcf3',1,'CSCI441::Materials::Material']]], - ['diffuse_4',['DIFFUSE',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html#a1de339786389dba8d236be547720c68ba55a7e98f249fcfa91f1036a4250c82d4',1,'CSCI441::MD5Model::MD5Mesh']]], + ['diffuse_3',['DIFFUSE',['../struct_c_s_c_i441_1_1_m_d5_model_1_1_m_d5_mesh.html#a1de339786389dba8d236be547720c68ba55a7e98f249fcfa91f1036a4250c82d4',1,'CSCI441::MD5Model::MD5Mesh']]], + ['diffuse_4',['diffuse',['../struct_c_s_c_i441_1_1_materials_1_1_material.html#a8e7e3791a3edd0067deade301645bcf3',1,'CSCI441::Materials::Material']]], ['disableautogeneratenormals_5',['disableAutoGenerateNormals',['../class_c_s_c_i441_1_1_model_loader.html#aaf1ec38a0f551569ccf1a47af2a561f3',1,'CSCI441::ModelLoader']]], ['disabledebugmessages_6',['disableDebugMessages',['../class_c_s_c_i441_1_1_shader_program.html#a9358a3f05e8432707d8ec89d1cd9d248',1,'CSCI441::ShaderProgram::disableDebugMessages()'],['../class_c_s_c_i441_1_1_shader_program_pipeline.html#acb236c9887e0e500b97f622aeddef960',1,'CSCI441::ShaderProgramPipeline::disableDebugMessages()']]], ['disablelighting_7',['disableLighting',['../_simple_shader_8hpp.html#a86c823d75eac359329967141d6c20261',1,'CSCI441::SimpleShader3']]], diff --git a/docs/search/functions_11.js b/docs/search/functions_11.js index 4e804ff1..62f3599e 100644 --- a/docs/search/functions_11.js +++ b/docs/search/functions_11.js @@ -1,4 +1,4 @@ var searchData= [ - ['writeshaderprogrambinarytofile_0',['writeShaderProgramBinaryToFile',['../class_c_s_c_i441_1_1_shader_program.html#a8e5ea8711e101de4758f892ceb26ff87',1,'CSCI441::ShaderProgram']]] + ['validatepipeline_0',['validatePipeline',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#a8a67b9bb52b48b1df00315f5bd118fcc',1,'CSCI441::ShaderProgramPipeline']]] ]; diff --git a/docs/search/functions_12.js b/docs/search/functions_12.js index 3f8b1b8f..4e804ff1 100644 --- a/docs/search/functions_12.js +++ b/docs/search/functions_12.js @@ -1,13 +1,4 @@ var searchData= [ - ['_7ecamera_0',['~Camera',['../class_c_s_c_i441_1_1_camera.html#a812c4b551be79e31f634eb6b41ae2315',1,'CSCI441::Camera']]], - ['_7ecomputeshaderprogram_1',['~ComputeShaderProgram',['../class_c_s_c_i441_1_1_compute_shader_program.html#aefa91afd4f55f7201f3fc7cc2b73f17b',1,'CSCI441::ComputeShaderProgram']]], - ['_7emd5camera_2',['~MD5Camera',['../class_c_s_c_i441_1_1_m_d5_camera.html#a3b53e84b1a8b80d2f50a49a449f66e2e',1,'CSCI441::MD5Camera']]], - ['_7emd5model_3',['~MD5Model',['../class_c_s_c_i441_1_1_m_d5_model.html#aeaf15af7fb507f9d3ead30e1157fe1de',1,'CSCI441::MD5Model']]], - ['_7emodelloader_4',['~ModelLoader',['../class_c_s_c_i441_1_1_model_loader.html#ab30fbbe152e05c88300f98fa33998102',1,'CSCI441::ModelLoader']]], - ['_7eopengl3dengine_5',['~OpenGL3DEngine',['../class_c_s_c_i441_1_1_open_g_l3_d_engine.html#aa5d547356721aa7d8e6c3a6ac66bcd23',1,'CSCI441::OpenGL3DEngine']]], - ['_7eopenglengine_6',['~OpenGLEngine',['../class_c_s_c_i441_1_1_open_g_l_engine.html#ad9ccaca4981c588c874cb70329cb9cb8',1,'CSCI441::OpenGLEngine']]], - ['_7eshaderprogram_7',['~ShaderProgram',['../class_c_s_c_i441_1_1_shader_program.html#a64b295be7ca8f309dfc085f8c0cf631a',1,'CSCI441::ShaderProgram']]], - ['_7eshaderprogrampipeline_8',['~ShaderProgramPipeline',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#aadebb4f866fa11fd7ab0de033af4b938',1,'CSCI441::ShaderProgramPipeline']]], - ['_7euniformbufferobject_9',['~UniformBufferObject',['../class_c_s_c_i441_1_1_uniform_buffer_object.html#a25509246b1331ac2c1792ee7500e9c01',1,'CSCI441::UniformBufferObject']]] + ['writeshaderprogrambinarytofile_0',['writeShaderProgramBinaryToFile',['../class_c_s_c_i441_1_1_shader_program.html#a8e5ea8711e101de4758f892ceb26ff87',1,'CSCI441::ShaderProgram']]] ]; diff --git a/docs/search/functions_13.js b/docs/search/functions_13.js new file mode 100644 index 00000000..3f8b1b8f --- /dev/null +++ b/docs/search/functions_13.js @@ -0,0 +1,13 @@ +var searchData= +[ + ['_7ecamera_0',['~Camera',['../class_c_s_c_i441_1_1_camera.html#a812c4b551be79e31f634eb6b41ae2315',1,'CSCI441::Camera']]], + ['_7ecomputeshaderprogram_1',['~ComputeShaderProgram',['../class_c_s_c_i441_1_1_compute_shader_program.html#aefa91afd4f55f7201f3fc7cc2b73f17b',1,'CSCI441::ComputeShaderProgram']]], + ['_7emd5camera_2',['~MD5Camera',['../class_c_s_c_i441_1_1_m_d5_camera.html#a3b53e84b1a8b80d2f50a49a449f66e2e',1,'CSCI441::MD5Camera']]], + ['_7emd5model_3',['~MD5Model',['../class_c_s_c_i441_1_1_m_d5_model.html#aeaf15af7fb507f9d3ead30e1157fe1de',1,'CSCI441::MD5Model']]], + ['_7emodelloader_4',['~ModelLoader',['../class_c_s_c_i441_1_1_model_loader.html#ab30fbbe152e05c88300f98fa33998102',1,'CSCI441::ModelLoader']]], + ['_7eopengl3dengine_5',['~OpenGL3DEngine',['../class_c_s_c_i441_1_1_open_g_l3_d_engine.html#aa5d547356721aa7d8e6c3a6ac66bcd23',1,'CSCI441::OpenGL3DEngine']]], + ['_7eopenglengine_6',['~OpenGLEngine',['../class_c_s_c_i441_1_1_open_g_l_engine.html#ad9ccaca4981c588c874cb70329cb9cb8',1,'CSCI441::OpenGLEngine']]], + ['_7eshaderprogram_7',['~ShaderProgram',['../class_c_s_c_i441_1_1_shader_program.html#a64b295be7ca8f309dfc085f8c0cf631a',1,'CSCI441::ShaderProgram']]], + ['_7eshaderprogrampipeline_8',['~ShaderProgramPipeline',['../class_c_s_c_i441_1_1_shader_program_pipeline.html#aadebb4f866fa11fd7ab0de033af4b938',1,'CSCI441::ShaderProgramPipeline']]], + ['_7euniformbufferobject_9',['~UniformBufferObject',['../class_c_s_c_i441_1_1_uniform_buffer_object.html#a25509246b1331ac2c1792ee7500e9c01',1,'CSCI441::UniformBufferObject']]] +]; diff --git a/docs/search/searchdata.js b/docs/search/searchdata.js index 90e8b79f..766bc82f 100644 --- a/docs/search/searchdata.js +++ b/docs/search/searchdata.js @@ -4,7 +4,7 @@ var indexSectionsWithContent = 1: "acfhmosu", 2: "cfmost", 3: "acfhmostu", - 4: "abcdefghilmoprstuw~", + 4: "abcdefghilmoprstuvw~", 5: "abcdefgijlmnoprstvwy", 6: "at", 7: "dhlnrs", 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 38a1027b..b2550cdd 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 d8f233d8..50d05109 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 fe04ba09..9968fea3 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 a8491942..f9685e6c 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 ccd92fa5..b957ee1c 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 db2f46f2..601c1859 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 ef565991..30c7205e 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 3eafa69f..565261a7 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 9565f91e..57f2c1e0 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 69c6b041..4156cad6 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 e54d4580..43b2beb1 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 20e31cf6..b12c4af3 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 8a1325f7..1363ef62 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 c86fe001..1e91493a 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 67f029b1..664d4fa5 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 621abd08..9bace82f 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 cb29bab4..ec16c57e 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 c822b434..e0aae0b4 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 d18b4923..2dfa1a73 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 00e18bf6..0039fb6f 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 b60d23f9..ac4db756 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 b852422f..4fa5f173 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 8adbecba..8c82062d 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.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 835b700e..1acee541 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 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/teapot_8hpp.html b/docs/teapot_8hpp.html index 49a1552a..66e8f2dd 100644 --- a/docs/teapot_8hpp.html +++ b/docs/teapot_8hpp.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/docs/teapot_8hpp_source.html b/docs/teapot_8hpp_source.html index dba23f61..a540bc5c 100644 --- a/docs/teapot_8hpp_source.html +++ b/docs/teapot_8hpp_source.html @@ -21,7 +21,7 @@ -
    CSCI441 OpenGL Library 4.12.2 +
    CSCI441 OpenGL Library 4.13.0
    CS@Mines CSCI441 Computer Graphics Course Library
    diff --git a/objects.hpp b/objects.hpp index dd0d03ca..5044fabd 100755 --- a/objects.hpp +++ b/objects.hpp @@ -1037,7 +1037,7 @@ inline void CSCI441_INTERNAL::generateCubeVAOIndexed( GLfloat sideLength ) { glBufferData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES, nullptr, GL_STATIC_DRAW ); glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(glm::vec3) * NUM_VERTICES, vertices ); glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES, sizeof(glm::vec3) * NUM_VERTICES, normals ); - glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES * 2, sizeof(glm::vec3) * NUM_VERTICES, texCoords ); + glBufferSubData(GL_ARRAY_BUFFER, sizeof(glm::vec3) * NUM_VERTICES * 2, sizeof(glm::vec2) * NUM_VERTICES, texCoords ); glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, vbods[1] ); glBufferData( GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW) ;