diff --git a/doc/src/dummy.cpp b/doc/src/dummy.cpp index 7188c829..226a7c76 100644 --- a/doc/src/dummy.cpp +++ b/doc/src/dummy.cpp @@ -1,4 +1,5 @@ #include "../../glm/glm.hpp" // glm::vec3, glm::vec4, glm::ivec4, glm::mat4 +#include struct triangle { @@ -17,12 +18,29 @@ void computeNormal(triangle & Triangle) #include "../../glm/gtc/matrix_projection.hpp" // glm::perspective #include "../../glm/gtc/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale #include "../../glm/gtc/type_ptr.hpp" // glm::value_ptr +#include "../../glm/gtc/quaternion.hpp" // glm::quat +#include "../../glm/gtx/comparison.hpp" // == != +//#include "../../glm/ext.hpp" glm::vec4 const ClearColor = glm::vec4(glm::vec3(0.0f), 1.0f); glm::ivec4 const Viewport = glm::ivec4(0, 0, 640, 480); void glUniformMatrix4fv(int location, int count, bool transpose, const float * value); +void ticket0023() +{ + std::vector vals; + vals.push_back(1); + vals.push_back(2); + vals.push_back(3); + std::vector::iterator it1, it2; + it1 = vals.begin(); + it2 = vals.end(); + it1 != it2; // <-- Here + glm::vec3 c; + glm::quat q; +} + int main() { //triangle Triangle; @@ -38,5 +56,7 @@ int main() glm::mat4 Model = glm::scale(glm::mat4(1.0f), glm::vec3(0.5f)); glm::mat4 MVP = Projection * View * Model; - glUniformMatrix4fv(LocationMVP, 1, GL_FALSE, glm::value_ptr(MVP)); + //glUniformMatrix4fv(LocationMVP, 1, GL_FALSE, glm::value_ptr(MVP)); + + ticket0023(); } diff --git a/glm/gtx/comparison.hpp b/glm/gtx/comparison.hpp index 8d12d5f6..a035e936 100644 --- a/glm/gtx/comparison.hpp +++ b/glm/gtx/comparison.hpp @@ -28,13 +28,45 @@ namespace glm //! Define == operator for vectors //! From GLM_GTX_comparison extension. - template - bool operator== (vecType const & x, vecType const & y); + template + bool operator== ( + detail::tvec2 const & x, + detail::tvec2 const & y); + + //! Define == operator for vectors + //! From GLM_GTX_comparison extension. + template + bool operator== ( + detail::tvec3 const & x, + detail::tvec3 const & y); + + //! Define == operator for vectors + //! From GLM_GTX_comparison extension. + template + bool operator== ( + detail::tvec4 const & x, + detail::tvec4 const & y); //! Define != operator for vectors //! From GLM_GTX_comparison extension. - template - bool operator!= (vecType const & x, vecType const & y); + template + bool operator!= ( + detail::tvec2 const & x, + detail::tvec2 const & y); + + //! Define != operator for vectors + //! From GLM_GTX_comparison extension. + template + bool operator!= ( + detail::tvec3 const & x, + detail::tvec3 const & y); + + //! Define != operator for vectors + //! From GLM_GTX_comparison extension. + template + bool operator!= ( + detail::tvec4 const & x, + detail::tvec4 const & y); }//namespace comparison }//namespace gtx