Changeset 97 for trunk

Timestamp:

06/03/13 09:08:42 (12 years ago)

Author:

shark

Message:

• rectangle::clamp_to didn't return the bool value it was supposed to -- fixed.
• fixed a logic error with rectangle::include_point.

File:

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

trunk/nv/position.hh

@@ -68 +68 @@
                 bool clamp_to( const rectangle& r )
                 {
+                        if (r.contains(*this)) return false;
                         ul = glm::max( ul, r.ul );
                         lr = glm::min( lr, r.lr );
                         ul = glm::min( ul, lr );
+                        return true;
                 }
 
@@ -90 +92 @@
                 {
                         lr = glm::max( lr, p );
-                        ul = glm::min( lr, p );
+                        ul = glm::min( ul, p );
                 }