Changeset 121 for trunk/nv/position.hh

Timestamp:

06/15/13 17:47:57 (12 years ago)

Author:

epyon

Message:

• Nova builds with -Weverything/-Wall/-pedantic/etc on: on MSVC 2012 on GCC 4.6.3 on clang 3.2
• ... without a single fucking warning.

File:

• trunk/nv/position.hh (modified) (5 diffs)

trunk/nv/position.hh

@@ -14 +14 @@
 #define NV_POSITION_HH
 
-#include <glm/glm.hpp>
 #include <nv/common.hh>
+#include <nv/math.hh>
 #include <utility>
 
 namespace nv
 {
-        typedef glm::ivec2 position;
-        typedef glm::ivec2 dimension;
+        typedef ivec2 position;
+        typedef ivec2 dimension;
 
         struct rectangle
@@ -46 +46 @@
                  *Creates a new rectangle given an upper-left and lower-right position.
                  *
-                 *@param ul The position of the upper-left corner of the rectangle.
-                 *@param lr The position of the lower-right corner of the rectangle.
-                 */
-                rectangle( position ul, position lr ) : ul(ul), lr(lr) {}
+                 *@param aul The position of the upper-left corner of the rectangle.
+                 *@param alr The position of the lower-right corner of the rectangle.
+                 */
+                rectangle( position aul, position alr ) : ul(aul), lr(alr) {}
                 
                 /**
                  *Creates a new rectangle given an upper-left position, width, and height.
                  *
-                 *@param ul The position of the upper-left corner of the rectangle.
+                 *@param aul The position of the upper-left corner of the rectangle.
                  *@param width The width of the rectangle.
                  *@param height The height of the rectangle.
                  */
-                rectangle( position ul, value_type width, value_type height ) : ul(ul), lr(ul + position(width,height)) {}
+                rectangle( position aul, value_type width, value_type height ) : ul(aul), lr(aul + position(width,height)) {}
         
         /**
@@ -269 +269 @@
                 {
                         if (r.contains(*this)) return false;
-                        ul = glm::max( ul, r.ul );
-                        lr = glm::min( lr, r.lr );
-                        ul = glm::min( ul, lr );
+                        ul = nv::max( ul, r.ul );
+                        lr = nv::min( lr, r.lr );
+                        ul = nv::min( ul, lr );
                         return true;
                 }
@@ -284 +284 @@
                 {
                         if ( r.get_width() < get_width() || r.get_height() < get_height() ) return false;
-                        (*this) += glm::min( r.ul - ul, position() );
-                        (*this) -= glm::min( lr - r.lr, position() );
+                        (*this) += nv::min( r.ul - ul, position() );
+                        (*this) -= nv::min( lr - r.lr, position() );
                         return true;
                 }
@@ -305 +305 @@
                 void include_point( position p )
                 {
-                        lr = glm::max( lr, p );
-                        ul = glm::min( ul, p );
+                        lr = nv::max( lr, p );
+                        ul = nv::min( ul, p );
                 }