amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: containsPoint for color and image value viewers. They used the wrong Rotation.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1029 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-07-23 12:39:07 +00:00
parent 13a37f4734
commit c476de0fa2
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gfx/mask_image.cpp
+1
View File
@@ -45,6 +45,7 @@ bool AlphaMask::isTransparent(int x, int y) const {
return alpha[x + y * size.x] < 20;
}
/// Do the points form a (counter??)clockwise angle?
bool convex(const wxPoint& p, const wxPoint& q, const wxPoint& r) {
return p.y*q.x - p.x*q.y - p.y*r.x + q.y*r.x + p.x*r.y - q.x*r.y > 0;
}
src/render/value/color.cpp
+10 -9
View File
@@ -48,7 +48,7 @@ void ColorValueViewer::draw(RotatedDC& dc) {
Image img(alpha_mask->size.x, alpha_mask->size.y);
fill_image(img, value().value());
alpha_mask->setAlpha(img);
dc.DrawImage(img, style().getPos());
dc.DrawImage(img, RealPoint(0,0));
} else {
// do we need clipping?
bool clip = style().left_width < style().width && style().right_width < style().width &&
@@ -74,16 +74,17 @@ bool ColorValueViewer::containsPoint(const RealPoint& p) const {
// distance to each side
double left = p.x, right = style().width - p.x - 1;
double top = p.y, bottom = style().height - p.y - 1;
if (left < 0 || right < 0 || top < 0 || bottom < 0 || // outside bounding box
(left >= style().left_width && right >= style().right_width && // outside horizontal border
top >= style().top_width && bottom >= style().bottom_width)) { // outside vertical border
return false;
}
if (left < 0 || right < 0 || top < 0 || bottom < 0) return false; // outside bounding box
// check against mask
if (!style().mask_filename().empty()) {
loadMask(viewer.getRotation());
return !alpha_mask || !alpha_mask->isTransparent((int)left, (int)top);
if (!style().mask_filename().empty()) loadMask(getRotation());
if (alpha_mask) {
return !alpha_mask->isTransparent((int)left, (int)top);
} else {
// check against border
if (left >= style().left_width && right >= style().right_width && // outside horizontal border
top >= style().top_width && bottom >= style().bottom_width) { // outside vertical border
return false;
}
return true;
}
}
src/render/value/image.cpp
+2 -3
View File
@@ -98,9 +98,8 @@ bool ImageValueViewer::containsPoint(const RealPoint& p) const {
if (!ValueViewer::containsPoint(p)) return false;
// check against mask
if (!style().mask_filename().empty()) {
loadMask(viewer.getRotation());
Rotation rot = viewer.getRotation();
return !alpha_mask || !alpha_mask->isTransparent((int)rot.trX(p.x), (int)rot.trY(p.y));
loadMask(getRotation());
return !alpha_mask || !alpha_mask->isTransparent((int)p.x, (int)p.y);
} else {
return true;
}