From 188aab4196c1d9de0c1bf33be1114e7a0e11fd19 Mon Sep 17 00:00:00 2001 From: aap Date: Thu, 30 May 2019 21:24:47 +0200 Subject: implemented some higher level functions; added lots of stubs; switched top and bottom in CRect --- src/math/Rect.h | 20 +++++++++----------- src/math/Vector.h | 5 +++++ 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'src/math') diff --git a/src/math/Rect.h b/src/math/Rect.h index 212645fa..d0824987 100644 --- a/src/math/Rect.h +++ b/src/math/Rect.h @@ -1,31 +1,29 @@ #pragma once -#pragma once - class CRect { public: float left; // x min - float top; // y max + float bottom; // y max float right; // x max - float bottom; // y min + float top; // y min CRect(void){ left = 1000000.0f; - bottom = 1000000.0f; + top = 1000000.0f; right = -1000000.0f; - top = -1000000.0f; + bottom = -1000000.0f; } - CRect(float l, float b, float r, float t){ + CRect(float l, float t, float r, float b){ left = l; - bottom = b; - right = r; top = t; + right = r; + bottom = b; } void ContainPoint(CVector const &v){ if(v.x < left) left = v.x; if(v.x > right) right = v.x; - if(v.y < bottom) bottom = v.y; - if(v.y > top) top = v.y; + if(v.y < top) top = v.y; + if(v.y > bottom) bottom = v.y; } }; diff --git a/src/math/Vector.h b/src/math/Vector.h index 3dba07ca..d89ca375 100644 --- a/src/math/Vector.h +++ b/src/math/Vector.h @@ -101,6 +101,11 @@ inline CVector operator*(const CVector &left, float right) return CVector(left.x * right, left.y * right, left.z * right); } +inline CVector operator*(float left, const CVector &right) +{ + return CVector(left * right.x, left * right.y, left * right.z); +} + inline CVector operator/(const CVector &left, float right) { return CVector(left.x / right, left.y / right, left.z / right); -- cgit v1.2.3