diff options
author | Xanadu <none@none> | 2010-07-20 02:49:28 +0200 |
---|---|---|
committer | Xanadu <none@none> | 2010-07-20 02:49:28 +0200 |
commit | 79622802f397258ee0f34327ba3ae6977ca3e7ff (patch) | |
tree | 1868946c234ab9ee256a6b7766a15713eae94235 /dep/src/g3dlite/Rect2D.cpp | |
parent | 7dd2dc91816ab8b3bc3b99a1b1c99c7ea314d5a8 (diff) | |
parent | f906976837502fa5aa81b982b901d1509f5aa0c4 (diff) |
Merge. Revision history for source files should be all back now.
--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
Diffstat (limited to 'dep/src/g3dlite/Rect2D.cpp')
-rw-r--r-- | dep/src/g3dlite/Rect2D.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/dep/src/g3dlite/Rect2D.cpp b/dep/src/g3dlite/Rect2D.cpp deleted file mode 100644 index e4148315a58..00000000000 --- a/dep/src/g3dlite/Rect2D.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - @file Rect2D.cpp - - @maintainer Morgan McGuire, http://graphics.cs.williams.edu - - @created 2003-11-13 - @created 2009-11-16 - - Copyright 2000-2009, Morgan McGuire. - All rights reserved. - */ - -#include "G3D/platform.h" -#include "G3D/Rect2D.h" -#include "G3D/Any.h" -#include "G3D/stringutils.h" - -namespace G3D { - -/** \param any Must either Rect2D::xywh(#, #, #, #) or Rect2D::xyxy(#, #, #, #)*/ -Rect2D::Rect2D(const Any& any) { - any.verifyName("Rect2D"); - any.verifyType(Any::ARRAY); - any.verifySize(4); - if (toUpper(any.name()) == "RECT2D::XYWH") { - *this = Rect2D::xywh(any[0], any[1], any[2], any[3]); - } else { - any.verifyName("Rect2D::xyxy"); - *this = Rect2D::xyxy(any[0], any[1], any[2], any[3]); - } -} - - -/** Converts the Rect2D to an Any. */ -Rect2D::operator Any() const { - Any any(Any::ARRAY, "Rect2D::xywh"); - any.append(x0(), y0(), width(), height()); - return any; -} - -} |