Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2129: Adding explicit for 'Color4B(const Color4F &color4F);' and 'explicit Color4F(const Color3B &color3B)'.

This commit is contained in:
James Chen 2013-07-08 15:16:22 +08:00
parent 4a0fe35d5a
commit 16ec50e86b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/include/ccTypes.h
View File

@ -86,7 +86,7 @@ struct Color4B
Color4B(): r(0.f), g(0.f), b(0.f), a(0.f) {} Color4B(): r(0.f), g(0.f), b(0.f), a(0.f) {}
// This function should use Color4F, so implement it in .cpp file. // This function should use Color4F, so implement it in .cpp file.
Color4B(const Color4F &color4F); explicit Color4B(const Color4F &color4F);
GLubyte r; GLubyte r;
GLubyte g; GLubyte g;
@ -107,14 +107,14 @@ struct Color4F
a(_a) a(_a)
{} {}
Color4F(const Color3B &color3B) explicit Color4F(const Color3B &color3B)
:r(color3B.r) :r(color3B.r)
,g(color3B.g) ,g(color3B.g)
,b(color3B.b) ,b(color3B.b)
,a(1.f) ,a(1.f)
{} {}
Color4F(const Color4B &color4B) explicit Color4F(const Color4B &color4B)
:r(color4B.r / 255.0f), :r(color4B.r / 255.0f),
g(color4B.g / 255.0f), g(color4B.g / 255.0f),
b(color4B.b / 255.0f), b(color4B.b / 255.0f),