Skip to content

Commit

Permalink
update dist builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@obiot
obiot committed Aug 9, 2022
1 parent 709d217 commit 1760db9
Show file tree
Hide file tree
Showing 4 changed files with 201 additions and 131 deletions.
137 changes: 93 additions & 44 deletions dist/melonjs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2456,9 +2456,17 @@
};

// convert a give color component to it hexadecimal value
var toHex = function (component) {
function toHex(component) {
return "0123456789ABCDEF".charAt((component - (component % 16)) >> 4) + "0123456789ABCDEF".charAt(component % 16);
};
}
function hue2rgb(p, q, t) {
if (t < 0) { t += 1; }
if (t > 1) { t -= 1; }
if (t < 1/6) { return p + (q - p) * 6 * t; }
if (t < 1/2) { return q; }
if (t < 2/3) { return p + (q - p) * (2/3 - t) * 6; }
return p;
}

var rgbaRx = /^rgba?\((\d+), ?(\d+), ?(\d+)(, ?([\d\.]+))?\)$/;
var hex3Rx = /^#([\da-fA-F])([\da-fA-F])([\da-fA-F])$/;
Expand Down Expand Up @@ -2658,7 +2666,6 @@
/**
* Color Red Component [0 .. 255]
* @type {number}
* @memberof Color
*/
prototypeAccessors$4.r.get = function () {
return ~~(this.glArray[0] * 255);
Expand All @@ -2672,7 +2679,6 @@
/**
* Color Green Component [0 .. 255]
* @type {number}
* @memberof Color
*/
prototypeAccessors$4.g.get = function () {
return ~~(this.glArray[1] * 255);
Expand All @@ -2686,7 +2692,6 @@
/**
* Color Blue Component [0 .. 255]
* @type {number}
* @memberof Color
*/
prototypeAccessors$4.b.get = function () {
return ~~(this.glArray[2] * 255);
Expand All @@ -2698,7 +2703,6 @@
/**
* Color Alpha Component [0.0 .. 1.0]
* @type {number}
* @memberof Color
*/
prototypeAccessors$4.alpha.get = function () {
return this.glArray[3];
Expand All @@ -2711,8 +2715,6 @@

/**
* Set this color to the specified value.
* @name setColor
* @memberof Color
* @param {number} r red component [0 .. 255]
* @param {number} g green component [0 .. 255]
* @param {number} b blue component [0 .. 255]
Expand All @@ -2729,10 +2731,59 @@
return this;
};

/**
* set this color to the specified HSV value
* @param {number} h hue (a value from 0 to 1)
* @param {number} s saturation (a value from 0 to 1)
* @param {number} v value (a value from 0 to 1)
* @returns {Color} Reference to this object for method chaining
*/
Color.prototype.setHSV = function setHSV (h, s, v) {
var r, g, b;

var i = Math.floor(h * 6);
var f = h * 6 - i;
var p = v * (1 - s);
var q = v * (1 - f * s);
var t = v * (1 - (1 - f) * s);

switch (i % 6) {
case 0: r = v, g = t, b = p; break;
case 1: r = q, g = v, b = p; break;
case 2: r = p, g = v, b = t; break;
case 3: r = p, g = q, b = v; break;
case 4: r = t, g = p, b = v; break;
case 5: r = v, g = p, b = q; break;
}
return this.setColor(r * 255, g * 255, b * 255);
};

/**
* set this color to the specified HSL value
* @param {number} h hue (a value from 0 to 1)
* @param {number} s saturation (a value from 0 to 1)
* @param {number} l lightness (a value from 0 to 1)
* @returns {Color} Reference to this object for method chaining
*/
Color.prototype.setHSL = function setHSL (h, s, l) {
var r, g, b;

if (s === 0) {
r = g = b = l; // achromatic
} else {
var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
var p = 2 * l - q;

r = hue2rgb(p, q, h + 1/3);
g = hue2rgb(p, q, h);
b = hue2rgb(p, q, h - 1/3);
}

return this.setColor(r * 255, g * 255, b * 255);
};

/**
* Create a new copy of this color object.
* @name clone
* @memberof Color
* @returns {Color} Reference to the newly cloned object
*/
Color.prototype.clone = function clone () {
Expand All @@ -2741,8 +2792,6 @@

/**
* Copy a color object or CSS color into this one.
* @name copy
* @memberof Color
* @param {Color|string} color
* @returns {Color} Reference to this object for method chaining
*/
Expand All @@ -2757,8 +2806,6 @@

/**
* Blend this color with the given one using addition.
* @name add
* @memberof Color
* @param {Color} color
* @returns {Color} Reference to this object for method chaining
*/
Expand All @@ -2773,8 +2820,6 @@

/**
* Darken this color value by 0..1
* @name darken
* @memberof Color
* @param {number} scale
* @returns {Color} Reference to this object for method chaining
*/
Expand All @@ -2789,8 +2834,6 @@

/**
* Linearly interpolate between this color and the given one.
* @name lerp
* @memberof Color
* @param {Color} color
* @param {number} alpha with alpha = 0 being this color, and alpha = 1 being the given one.
* @returns {Color} Reference to this object for method chaining
Expand All @@ -2806,8 +2849,6 @@

/**
* Lighten this color value by 0..1
* @name lighten
* @memberof Color
* @param {number} scale
* @returns {Color} Reference to this object for method chaining
*/
Expand All @@ -2822,8 +2863,6 @@

/**
* Generate random r,g,b values for this color object
* @name random
* @memberof Color
* @param {number} [min=0] minimum value for the random range
* @param {number} [max=255] maxmium value for the random range
* @returns {Color} Reference to this object for method chaining
Expand All @@ -2850,8 +2889,6 @@
/**
* Return true if the r,g,b,a values of this color are equal with the
* given one.
* @name equals
* @memberof Color
* @param {Color} color
* @returns {boolean}
*/
Expand All @@ -2867,8 +2904,6 @@
/**
* Parse a CSS color string and set this color to the corresponding
* r,g,b values
* @name parseCSS
* @memberof Color
* @param {string} cssColor
* @returns {Color} Reference to this object for method chaining
*/
Expand All @@ -2884,8 +2919,6 @@

/**
* Parse an RGB or RGBA CSS color string
* @name parseRGB
* @memberof Color
* @param {string} rgbColor
* @returns {Color} Reference to this object for method chaining
*/
Expand All @@ -2903,8 +2936,6 @@
/**
* Parse a Hex color ("#RGB", "#RGBA" or "#RRGGBB", "#RRGGBBAA" format) and set this color to
* the corresponding r,g,b,a values
* @name parseHex
* @memberof Color
* @param {string} hexColor
* @param {boolean} [argb = false] true if format is #ARGB, or #AARRGGBB (as opposed to #RGBA or #RGGBBAA)
* @returns {Color} Reference to this object for method chaining
Expand Down Expand Up @@ -2964,8 +2995,6 @@

/**
* Pack this color into a Uint32 ARGB representation
* @name toUint32
* @memberof Color
* @param {number} [alpha=1.0] alpha value [0.0 .. 1.0]
* @returns {number}
*/
Expand All @@ -2982,8 +3011,6 @@

/**
* return an array representation of this object
* @name toArray
* @memberof Color
* @returns {Float32Array}
*/
Color.prototype.toArray = function toArray () {
Expand All @@ -2992,9 +3019,7 @@


/**
* Get the color in "#RRGGBB" format
* @name toHex
* @memberof Color
* return the color in "#RRGGBB" format
* @returns {string}
*/
Color.prototype.toHex = function toHex$1 () {
Expand All @@ -3006,8 +3031,6 @@

/**
* Get the color in "#RRGGBBAA" format
* @name toHex8
* @memberof Color
* @returns {string}
*/
Color.prototype.toHex8 = function toHex8 (alpha) {
Expand All @@ -3021,8 +3044,6 @@

/**
* Get the color in "rgb(R,G,B)" format
* @name toRGB
* @memberof Color
* @returns {string}
*/
Color.prototype.toRGB = function toRGB () {
Expand All @@ -3038,8 +3059,6 @@

/**
* Get the color in "rgba(R,G,B,A)" format
* @name toRGBA
* @memberof Color
* @param {number} [alpha=1.0] alpha value [0.0 .. 1.0]
* @returns {string}
*/
Expand Down Expand Up @@ -35760,7 +35779,7 @@
this.width = Math.floor(settings.width);
this.height = Math.floor(settings.height);

// nine slice sprite specific local variables
// nine slice sprite specific internal variables
this.nss_width = this.width;
this.nss_height = this.height;

Expand All @@ -35772,6 +35791,34 @@
NineSliceSprite.prototype = Object.create( Sprite && Sprite.prototype );
NineSliceSprite.prototype.constructor = NineSliceSprite;

var prototypeAccessors = { width: { configurable: true },height: { configurable: true } };

/**
* width of the NineSliceSprite
* @public
* @type {number}
* @name width
*/
prototypeAccessors.width.get = function () {
return Sprite.prototype.width;
};
prototypeAccessors.width.set = function (value) {
Sprite.prototype.width = this.nss_width = value;
};

/**
* height of the NineSliceSprite
* @public
* @type {number}
* @name height
*/
prototypeAccessors.height.get = function () {
return Sprite.prototype.height;
};
prototypeAccessors.height.set = function (value) {
Sprite.prototype.height = this.nss_height = value;
};

/**
* @ignore
*/
Expand Down Expand Up @@ -35926,6 +35973,8 @@
);
};

Object.defineProperties( NineSliceSprite.prototype, prototypeAccessors );

return NineSliceSprite;
}(Sprite));

Expand Down
4 changes: 2 additions & 2 deletions dist/melonjs.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 1760db9

Please sign in to comment.