manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

double specialization of some Color4 methods were missing

This commit is contained in:
Giorgio Marcias 2016-12-06 14:50:50 +01:00
parent 57f596e971
commit 5735102cb7
1 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
vcg/space/color4.h
View File

@ -281,6 +281,15 @@ inline void Color4<float>::Import(const Color4<unsigned char> &b)
(*this)[3]=b[3]/255.0f;
}
template <> template <>
inline void Color4<double>::Import(const Color4<unsigned char> &b)
{
(*this)[0]=b[0]/255.0;
(*this)[1]=b[1]/255.0;
(*this)[2]=b[2]/255.0;
(*this)[3]=b[3]/255.0;
}
template <> template <>
inline void Color4<unsigned char>::Import(const Color4<float> &b)
{
@ -299,6 +308,15 @@ inline void Color4<unsigned char>::Import(const Point4<float> &b)
(*this)[3]=(unsigned char)(b[3]*255.0f);
}
template <> template <>
inline void Color4<unsigned char>::Import(const Point4<double> &b)
{
(*this)[0]=(unsigned char)(b[0]*255.0);
(*this)[1]=(unsigned char)(b[1]*255.0);
(*this)[2]=(unsigned char)(b[2]*255.0);
(*this)[3]=(unsigned char)(b[3]*255.0);
}
template <> template <>
inline Color4<unsigned char> Color4<unsigned char>::Construct( const Color4<float> & b )
{
@ -319,6 +337,16 @@ inline Color4<float> Color4<float>::Construct( const Color4<unsigned char> & b )
(float)(b[3])/255.0f);
}
template <> template <>
inline Color4<double> Color4<double>::Construct( const Color4<unsigned char> & b )
{
return Color4<double>(
(double)(b[0])/255.0,
(double)(b[1])/255.0,
(double)(b[2])/255.0,
(double)(b[3])/255.0);
}
template<>
inline Color4<unsigned char>::Color4(Color4<unsigned char>::ColorConstant cc)
{
@ -331,6 +359,12 @@ inline Color4<float>::Color4(Color4<float>::ColorConstant cc)
Import(Color4<unsigned char>((Color4<unsigned char>::ColorConstant)cc));
}
template<>
inline Color4<double>::Color4(Color4<double>::ColorConstant cc)
{
Import(Color4<unsigned char>((Color4<unsigned char>::ColorConstant)cc));
}
template<>
inline Color4<unsigned char>::Color4(unsigned int cc)
{
@ -343,6 +377,12 @@ inline Color4<float>::Color4(unsigned int cc)
Import(Color4<unsigned char>(cc));
}
template<>
inline Color4<double>::Color4(unsigned int cc)
{
Import(Color4<unsigned char>(cc));
}
inline Color4<float> Clamp(Color4<float> &c)
{
c[0]=math::Clamp(c[0],0.0f,1.0f);
@ -352,6 +392,15 @@ inline Color4<float> Clamp(Color4<float> &c)
return c;
}
inline Color4<double> Clamp(Color4<double> &c)
{
c[0]=math::Clamp(c[0],0.0,1.0);
c[1]=math::Clamp(c[1],0.0,1.0);
c[2]=math::Clamp(c[2],0.0,1.0);
c[3]=math::Clamp(c[3],0.0,1.0);
return c;
}
template<>
inline Color4<unsigned char> Color4<unsigned char>::operator + ( const Color4<unsigned char> & p) const
{