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

Merged behaviour from ContourMask into AlphaMask.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1181 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-30 17:15:22 +00:00
parent db09cdb5bc
commit acb3493b59
10 changed files with 89 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/value/color.cpp
+2 -5
View File
@@ -45,10 +45,7 @@ void ColorValueViewer::draw(RotatedDC& dc) {
// is there a mask?
loadMask(dc);
if (alpha_mask) {
Image img(alpha_mask->size.x, alpha_mask->size.y);
fill_image(img, value().value());
alpha_mask->setAlpha(img);
dc.DrawImage(img, RealPoint(0,0), style().combine);
dc.DrawImage(alpha_mask->colorImage(value().value()), RealPoint(0,0), style().combine);
} else {
// do we need clipping?
bool clip = style().left_width < style().width && style().right_width < style().width &&
@@ -97,7 +94,7 @@ void ColorValueViewer::onStyleChange(int changes) {
void ColorValueViewer::loadMask(const Rotation& rot) const {
if (style().mask_filename().empty()) return; // no mask
int w = (int) rot.trX(rot.getWidth()), h = (int) rot.trY(rot.getHeight());
if (alpha_mask && alpha_mask->size == wxSize(w,h)) return; // mask loaded and right size
if (alpha_mask && alpha_mask->hasSize(wxSize(w,h))) return; // mask loaded and right size
// (re) load the mask
Image image;
InputStreamP image_file = getStylePackage().openIn(style().mask_filename);
src/render/value/image.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ void ImageValueViewer::onStyleChange(int changes) {
void ImageValueViewer::loadMask(const Rotation& rot) const {
if (style().mask_filename().empty()) return; // no mask
int w = (int) rot.trX(style().width), h = (int) rot.trY(style().height);
if (alpha_mask && alpha_mask->size == wxSize(w,h)) return; // mask loaded and right size
if (alpha_mask && alpha_mask->hasSize(wxSize(w,h))) return; // mask loaded and right size
// (re) load the mask
Image image;
InputStreamP image_file = getStylePackage().openIn(style().mask_filename);
src/render/value/text.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
IMPLEMENT_VALUE_VIEWER(Text);
bool TextValueViewer::prepare(RotatedDC& dc) {
if (!style().mask_filename.empty() && !style().mask.ok()) {
if (!style().mask_filename.empty() && !style().mask.isLoaded()) {
// load contour mask
Image image;
InputStreamP image_file = getStylePackage().openIn(style().mask_filename);