Skip to content

Commit 23e8141

Browse files
committed
Can convert Objects into Colors
1 parent 0c5df6d commit 23e8141

3 files changed

Lines changed: 36 additions & 14 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
var Color = require('./Color');
2+
3+
var ObjectToColor = function (input)
4+
{
5+
return new Color(input.r, input.g, input.b, input.a);
6+
};
7+
8+
module.exports = ObjectToColor;

v3/src/graphics/color/ValueToColor.js

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
1-
var RGBStringToColor = require('./RGBStringToColor');
21
var HexStringToColor = require('./HexStringToColor');
32
var IntegerToColor = require('./IntegerToColor');
3+
var ObjectToColor = require('./ObjectToColor');
4+
var RGBStringToColor = require('./RGBStringToColor');
45

56
var ValueToColor = function (input)
67
{
7-
if (typeof input === 'string')
8-
{
9-
if (input.substr(0, 3).toLowerCase() === 'rgb')
10-
{
11-
return RGBStringToColor(input);
12-
}
13-
else
14-
{
15-
return HexStringToColor(input);
16-
}
17-
}
18-
else if (typeof input === 'number')
8+
var t = typeof input;
9+
10+
switch (t)
1911
{
20-
return IntegerToColor(input);
12+
case 'string':
13+
14+
if (input.substr(0, 3).toLowerCase() === 'rgb')
15+
{
16+
return RGBStringToColor(input);
17+
}
18+
else
19+
{
20+
return HexStringToColor(input);
21+
}
22+
23+
break;
24+
25+
case 'number':
26+
27+
return IntegerToColor(input);
28+
break;
29+
30+
case 'object':
31+
32+
return ObjectToColor(input);
33+
break;
2134
}
2235
};
2336

v3/src/graphics/color/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Color.HueToComponent = require('./HueToComponent');
1515
Color.IntegerToColor = require('./IntegerToColor');
1616
Color.IntegerToRGB = require('./IntegerToRGB');
1717
Color.Interpolate = require('./Interpolate');
18+
Color.ObjectToColor = require('./ObjectToColor');
1819
Color.RandomRGB = require('./RandomRGB');
1920
Color.RGBStringToColor = require('./RGBStringToColor');
2021
Color.RGBToHSV = require('./RGBToHSV');

0 commit comments

Comments
 (0)