From 02241126ee1de4633b5f8ba864abb95e9afa061b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 19 Jan 2011 12:31:19 +0000 Subject: [PATCH 1/2] Clarify dummy.cpp --- glm/core/dummy.cpp | 98 +++++----------------------------------------- 1 file changed, 10 insertions(+), 88 deletions(-) diff --git a/glm/core/dummy.cpp b/glm/core/dummy.cpp index db48a2d6..c5b4caf8 100644 --- a/glm/core/dummy.cpp +++ b/glm/core/dummy.cpp @@ -1,95 +1,17 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Created : 2011-01-19 +// Updated : 2011-01-19 +// Licence : This source is under MIT License +// File : glm/setup.hpp +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Dummy file, GLM is a header only library + #include "../glm.hpp" #include "../ext.hpp" int main() { - //glm::mat2x3 m1(1.0f); - //glm::vec3 v1(1.0f); - //glm::vec2 w1 = m1 * v1; - { - glm::mat2x3 m(1.0f); - glm::vec2 u(1.0f); - glm::vec3 v(1.0f); - float x = 1.0f; - glm::vec3 a = m * u; - glm::vec2 b = v * m; - glm::mat2x3 n = x / m; - glm::mat2x3 o = m / x; - glm::mat2x3 p = x * m; - glm::mat2x3 q = m * x; - - glm::mat2x3::col_type v1 = m[3] - } - - { - glm::mat2x4 m(1.0f); - glm::vec2 u(1.0f); - glm::vec4 v(1.0f); - float x = 1.0f; - glm::vec4 a = m * u; - glm::vec2 b = v * m; - glm::mat2x4 n = x / m; - glm::mat2x4 o = m / x; - glm::mat2x4 p = x * m; - glm::mat2x4 q = m * x; - } - - { - glm::mat3x2 m(1.0f); - glm::vec3 u(1.0f); - glm::vec2 v(1.0f); - float x = 1.0f; - glm::vec2 a = m * u; - glm::vec3 b = v * m; - glm::mat3x2 n = x / m; - glm::mat3x2 o = m / x; - glm::mat3x2 p = x * m; - glm::mat3x2 q = m * x; - } - - { - glm::mat3x4 m(1.0f); - glm::vec3 u(1.0f); - glm::vec4 v(1.0f); - float x = 1.0f; - glm::vec4 a = m * u; - glm::vec3 b = v * m; - glm::mat3x4 n = x / m; - glm::mat3x4 o = m / x; - glm::mat3x4 p = x * m; - glm::mat3x4 q = m * x; - } - - { - glm::mat4x2 m(1.0f); - glm::vec4 u(1.0f); - glm::vec2 v(1.0f); - float x = 1.0f; - glm::vec2 a = m * u; - glm::vec4 b = v * m; - glm::mat4x2 n = x / m; - glm::mat4x2 o = m / x; - glm::mat4x2 p = x * m; - glm::mat4x2 q = m * x; - } - - { - glm::mat4x3 m(1.0f); - glm::vec4 u(1.0f); - glm::vec3 v(1.0f); - float x = 1.0f; - glm::vec3 a = m * u; - glm::vec4 b = v * m; - glm::mat4x3 n = x / m; - glm::mat4x3 o = m / x; - glm::mat4x3 p = x * m; - glm::mat4x3 q = m * x; - } - - //{ - // glm::mat3x4 m(1.0f); - // glm::vec3 v(1.0f); - // glm::vec4 w = m * v; - //} } From 2fd280a6f84caecbd701a21e29a20889dbbee4a6 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 19 Jan 2011 12:31:45 +0000 Subject: [PATCH 2/2] Fixed build --- glm/core/type_vec4.inl | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/glm/core/type_vec4.inl b/glm/core/type_vec4.inl index 28e5f356..32782ea2 100644 --- a/glm/core/type_vec4.inl +++ b/glm/core/type_vec4.inl @@ -1152,19 +1152,6 @@ namespace glm ~v.w); } - template - inline tvec4 operator~ - ( - tvec4 const & v - ) - { - return tvec4( - ~v.x, - ~v.y, - ~v.z, - ~v.w); - } - ////////////////////////////////////// // tref definition