scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-06-07 19:14:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Fix inconsistent color scale

Browse source 
The HSV-to-RGB function had been returning values in the range [0,1].
Now it uses [0,255] to be consistent with the other values returned by
_getColor.
This commit is contained in:
Christopher Willis-Ford 2016-05-03 10:01:52 -07:00
parent 6f949596d8
commit 63d4f559e3
1 changed files with 5 additions and 6 deletions

11
src/blocks/wedo2.js
View file

@ -58,7 +58,7 @@ WeDo2Blocks.prototype._clamp = function(val, min, max) {
* @param hueDegrees Hue, in degrees. * @param hueDegrees Hue, in degrees.
* @param saturation Saturation in the range [0,1]. * @param saturation Saturation in the range [0,1].
* @param value Value in the range [0,1]. * @param value Value in the range [0,1].
* @returns {number[]} An array of [r,g,b], each in the range [0,1]. * @returns {number[]} An array of [r,g,b], each in the range [0,255].
* @private * @private
*/ */
WeDo2Blocks.prototype._HSVToRGB = function(hueDegrees, saturation, value) { WeDo2Blocks.prototype._HSVToRGB = function(hueDegrees, saturation, value) {
@ -93,9 +93,9 @@ WeDo2Blocks.prototype._HSVToRGB = function(hueDegrees, saturation, value) {
} }
var m = value - chroma; var m = value - chroma;
rgb[0] += m; rgb[0] = (rgb[0] + m) * 255;
rgb[1] += m; rgb[1] = (rgb[1] + m) * 255;
rgb[2] += m; rgb[2] = (rgb[2] + m) * 255;
return rgb; return rgb;
}; };
@ -169,8 +169,7 @@ WeDo2Blocks.prototype._getColor = function(colorName) {
WeDo2Blocks.prototype.setColor = function(argValues) { WeDo2Blocks.prototype.setColor = function(argValues) {
if (window.native) { if (window.native) {
var rgbColor = this._getColor(argValues[0]); var rgbColor = this._getColor(argValues[0]);
window.native.setLedColor( window.native.setLedColor(rgbColor[0], rgbColor[1], rgbColor[2]);
255 * rgbColor[0], 255 * rgbColor[1], 255 * rgbColor[2]);
} }
}; };