FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canvas: clip region rounding and catch negative size.

Browse Source
This commit is contained in:
Thomas Geymayer 2013-07-19 23:37:04 +02:00
parent b15c6d887d
commit a9fc84d568
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
simgear/canvas/elements/CanvasElement.cxx
View File

@ -21,6 +21,7 @@
#include <simgear/canvas/CanvasEventListener.hxx>
#include <simgear/canvas/CanvasEventVisitor.hxx>
#include <simgear/canvas/MouseEvent.hxx>
#include <simgear/math/SGMisc.hxx>
#include <simgear/misc/strutils.hxx>
#include <simgear/scene/material/parseBlendFunc.hxx>
@ -413,7 +414,7 @@ namespace canvas
const std::string sep(", \t\npx");
int comp = 0;
int values[4];
float values[4];
for(size_t pos = RECT.size(); comp < 4; ++comp)
{
@ -435,6 +436,15 @@ namespace canvas
return;
}
float width = values[1] - values[3],
height = values[2] - values[0];
if( width < 0 || height < 0 )
{
SG_LOG(SG_GENERAL, SG_WARN, "Canvas: negative clip size: " << clip);
return;
}
float scale_x = 1,
scale_y = 1;
@ -451,10 +461,10 @@ namespace canvas
osg::Scissor* scissor = new osg::Scissor();
// <top>, <right>, <bottom>, <left>
scissor->x() = scale_x * values[3];
scissor->y() = scale_y * values[0];
scissor->width() = scale_x * (values[1] - values[3]);
scissor->height() = scale_y * (values[2] - values[0]);
scissor->x() = SGMiscf::roundToInt(scale_x * values[3]);
scissor->y() = SGMiscf::roundToInt(scale_y * values[0]);
scissor->width() = SGMiscf::roundToInt(scale_x * width);
scissor->height() = SGMiscf::roundToInt(scale_y * height);
if( canvas )
// Canvas has y axis upside down