diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-04-09 18:09:28 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-13 22:40:52 +0100 |
| commit | 3ec8616aa76390280c7b51696b731a85e070de0f (patch) | |
| tree | a1f399d1022a39bc2cc03d735b0450756928b0e3 /src/menu/clipping_helper.cpp | |
| parent | 2435e76db6611d9797f607daff321bb6d2bd2322 (diff) | |
| download | usdx-3ec8616aa76390280c7b51696b731a85e070de0f.tar.gz usdx-3ec8616aa76390280c7b51696b731a85e070de0f.tar.xz usdx-3ec8616aa76390280c7b51696b731a85e070de0f.zip | |
utils/rectangle: removed external constructors and added helper
constructors that generate a rectangle from GLint[4] or FTBBox are now
helper functions to remove the external dependencies from the helper class
Diffstat (limited to 'src/menu/clipping_helper.cpp')
| -rw-r--r-- | src/menu/clipping_helper.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/menu/clipping_helper.cpp b/src/menu/clipping_helper.cpp index e12823cc..3f6bc4cd 100644 --- a/src/menu/clipping_helper.cpp +++ b/src/menu/clipping_helper.cpp @@ -31,6 +31,12 @@ namespace usdx log4cpp::Category& ClippingHelper::log = log4cpp::Category::getInstance("usdx.menu.clipping_helper"); + Rectangle<int> ClippingHelper::makeRect(GLint box[4]) + { + return Rectangle<int>(Point<int>(box[0], box[1]), + Point<int>(box[0] + box[2], box[1] + box[3])); + } + ClippingHelper::ClippingHelper(const Rectangle<int> &rect) { was_enabled = glIsEnabled(GL_SCISSOR_TEST); @@ -40,7 +46,7 @@ namespace usdx if (was_enabled) { glGetIntegerv(GL_SCISSOR_BOX, scissor_box); - new_scissor_box = rect.intersect(Rectangle<int>(scissor_box)); + new_scissor_box = new_scissor_box.intersect(makeRect(scissor_box)); } log << log4cpp::Priority::DEBUG << "Clipping (" |