big batch of progress

[chaz/yoink] / src / rectangle.cc

diff --git a/src/rectangle.cc b/src/rectangle.cc
deleted file mode 100644 (file)
index 0f9bb9f..0000000
--- a/src/rectangle.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#include <algorithm>
-
-#include "rectangle.hh"
-
-
-namespace dc {
-
-
-bool rectangle::containsRect(const rectangle& r) const
-{
-       point   o = r.origin;
-       point   s = r.size;
-       if (origin.x <= o.x && origin.y <= o.y)
-       {
-               scalar a = origin.x + size.x;
-               scalar b = origin.y + size.y;
-               scalar c = o.x + s.x;
-               scalar d = o.y + s.y;
-               return o.x <= a && o.y <= b && origin.x <= c &&
-                          origin.y <= d && c <= a && d <= b;
-       }
-       return false;
-}
-
-bool rectangle::intersectsRect(const rectangle& r) const
-{
-       // TODO - Perhaps this could be optimized if it proves to be a bottleneck.
-       rectangle rect = intersectionWith(r);
-       return rect.isValid();
-}
-
-rectangle rectangle::unionWith(const rectangle& r) const
-{
-       point   o = r.origin;
-       point   s = r.size;
-       scalar  a = std::min(origin.x, o.x);
-       scalar  b = std::min(origin.y, o.y);
-       return rectangle(point(a, b),
-                                        point(std::max(origin.x + size.x, o.x + s.x) - a,
-                                                        std::max(origin.y + size.y, o.y + s.y) - b));
-}
-
-rectangle rectangle::intersectionWith(const rectangle& r) const
-{
-       point   o = r.origin;
-       point   s = r.size;
-       scalar  a = std::max(origin.x, o.x);
-       scalar  b = std::max(origin.y, o.y);
-       return rectangle(point(a, b),
-                                        point(std::min(origin.x + size.x, o.x + s.x) - a,
-                                                        std::min(origin.y + size.y, o.y + s.y) - b));
-}
-
-
-} // namespace dc
-