Fix #1521 adding raster.smoothing property

This commit is contained in:
sasensi 2018-09-30 18:46:02 +02:00
parent 6cbf5292da
commit 07ae09a76a
3 changed files with 126 additions and 0 deletions

File diff suppressed because one or more lines are too long

View file

@ -98,6 +98,11 @@ var Raster = Item.extend(/** @lends Raster# */{
this._size = new Size(); this._size = new Size();
this._loaded = false; this._loaded = false;
} }
// set smoothing default value
if (this._smoothing === undefined)
{
this._smoothing = true;
}
}, },
_equals: function(item) { _equals: function(item) {
@ -419,6 +424,29 @@ var Raster = Item.extend(/** @lends Raster# */{
image.crossOrigin = crossOrigin; image.crossOrigin = crossOrigin;
}, },
/**
* Specifies if the raster should be smoothed when scaled up
* or if pixels should be visible.
*
* @bean
* @type Boolean
* @default true
*
* @example {@paperscript}
* var raster = new Raster({
* source: 'http://assets.paperjs.org/images/marilyn.jpg',
* smoothing: false
* });
* raster.scale(5);
*/
getSmoothing: function() {
return this._smoothing;
},
setSmoothing: function(smoothing) {
this._smoothing = smoothing;
},
// DOCS: document Raster#getElement // DOCS: document Raster#getElement
getElement: function() { getElement: function() {
// Only return the internal element if the content is actually ready. // Only return the internal element if the content is actually ready.
@ -732,6 +760,12 @@ var Raster = Item.extend(/** @lends Raster# */{
// Handle opacity for Rasters separately from the rest, since // Handle opacity for Rasters separately from the rest, since
// Rasters never draw a stroke. See Item#draw(). // Rasters never draw a stroke. See Item#draw().
ctx.globalAlpha = this._opacity; ctx.globalAlpha = this._opacity;
// Set context smoothing value according to raster property.
// There is no need to restore original value after drawing thanks
// to the call to ctx.restore() in Item#draw() after this method call.
this._setContextSmoothing(ctx, this._smoothing);
ctx.drawImage(element, ctx.drawImage(element,
-this._size.width / 2, -this._size.height / 2); -this._size.width / 2, -this._size.height / 2);
} }
@ -739,5 +773,27 @@ var Raster = Item.extend(/** @lends Raster# */{
_canComposite: function() { _canComposite: function() {
return true; return true;
},
/**
* Set given context smoothing property.
* Handle vendor prefixing to improve browser compatibility.
* @param {CanvasRenderingContext2D} ctx
* @param {Boolean} value
* @private
*/
_setContextSmoothing: function(ctx, value) {
var keys = [
'imageSmoothingEnabled',
'mozImageSmoothingEnabled',
'webkitImageSmoothingEnabled',
'msImageSmoothingEnabled'
];
for (var i=0; i<keys.length; i++) {
if (keys[i] in ctx) {
ctx[keys[i]] = value;
return;
}
}
} }
}); });

View file

@ -179,3 +179,32 @@ test('Raster#getAverageColor(path) with compound path', function() {
equals(raster.getAverageColor(compoundPath), new Color(1, 0, 0), null, equals(raster.getAverageColor(compoundPath), new Color(1, 0, 0), null,
{ tolerance: 1e-3 }); { tolerance: 1e-3 });
}); });
test('Raster#smoothing default value is true', function() {
var raster = new Raster();
equals(raster.smoothing, true);
});
test('Raster#getSmoothing / setSmoothing', function() {
var raster = new Raster({smoothing: false});
equals(raster.smoothing, false);
raster.smoothing = true;
equals(raster.smoothing, true);
});
test('Raster#setSmoothing doesn\'t impact canvas context', function(assert) {
var done = assert.async();
var raster = new Raster('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABlJREFUeNpi+s/AwPCfgYmR4f9/hv8AAQYAHiAFAS8Lwy8AAAAASUVORK5CYII=');
var view = raster.view;
var context = view._context;
raster.onLoad = function() {
var originalValue = context.imageSmoothingEnabled;
raster.smoothing = false;
view.update();
equals(context.imageSmoothingEnabled, originalValue);
done();
};
});