From c075764d47b4c20df363137462cb4356dd5eefdc Mon Sep 17 00:00:00 2001 From: philipp schoenberger Date: Wed, 19 Aug 2015 11:12:41 +0200 Subject: [PATCH] fix max and min function for vec --- lwrserv/include/vec.h | 4 ++-- lwrserv/program.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lwrserv/include/vec.h b/lwrserv/include/vec.h index 7ea833c..0cf5917 100644 --- a/lwrserv/include/vec.h +++ b/lwrserv/include/vec.h @@ -231,7 +231,7 @@ public: // this * this for (int i=0; i m_atData[i]) + if (retval < m_atData[i]) retval = m_atData[i]; return retval; } @@ -241,7 +241,7 @@ public: // this * this for (int i=0; i m_atData[i]) retval = m_atData[i]; return retval; } diff --git a/lwrserv/program.cpp b/lwrserv/program.cpp index e508cc4..abc7387 100644 --- a/lwrserv/program.cpp +++ b/lwrserv/program.cpp @@ -42,7 +42,6 @@ float* abctomat(float a, float b, float c) rz(2,2) = 1.0f; rz(3,3) = 1.0f; - Mat4f result; Mat4f temp; temp = rz * ry;