Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 109259db by CGoGN GIT Supervisor

### Merge branch 'master' of /home/vanhoey/CGoGN

parents 09bf6799 9fa126d1
 ... ... @@ -161,11 +161,15 @@ class Matrix // Vector / Matrix multiplication template Vector operator*(const Vector& v, const Matrix& m); Vector operator*(const Vector& v, const Matrix& m) ; // Scalar / Matrix multiplication template Matrix operator*(T s, const Matrix& m); Matrix operator*(T s, const Matrix& m) ; // Vector / Transposed vector multiplication template Matrix transposed_vectors_mult(const Vector& v1, const Vector& v2) ; /**********************************************/ ... ...
 ... ... @@ -405,9 +405,11 @@ bool Matrix::operator==(const Matrix& m) const { template std::ostream& operator<<(std::ostream& out, const Matrix& m) { for(unsigned int i = 0; i < M; ++i) for(unsigned int i = 0; i < M; ++i) { for(unsigned int j = 0; j < N; ++j) out << m(i,j) << " " ; std::cout << std::endl ; } return out ; } ... ... @@ -446,6 +448,15 @@ Matrix operator*(T s, const Matrix& m) return res ; } template Matrix transposed_vectors_mult(const Vector& v1, const Vector& v2) { Matrix res ; for(unsigned int i = 0; i < M; ++i) for(unsigned int j = 0; j < N; ++j) res(i,j) = v1[i] * v2[j] ; return res ; } } // namespace Geom } // namespace CGoGN
 ... ... @@ -71,6 +71,16 @@ public: // methods */ ~ColourConverter() {} ; /** * getR * @return original value (in its original space) */ VEC3 getOriginal() ; /** * getR * @return enc value of provided colour */ VEC3 getColour(enum ColourEncoding enc) ; /** * getR * @return RGB value of provided colour ... ...
 ... ... @@ -65,6 +65,36 @@ ColourConverter::ColourConverter(VEC3 col, enum ColourEncoding enc) : } } template Geom::Vector<3,REAL> ColourConverter::getColour(enum ColourEncoding enc) { switch (enc) { case (C_RGB) : return getRGB() ; break ; case (C_XYZ) : return getXYZ() ; break ; case (C_Luv) : return getLuv() ; break ; case (C_Lab) : return getLab() ; break ; default : assert(!"Should never arrive here : ColourConverter::getColour default case") ; return getOriginal() ; } } template Geom::Vector<3,REAL> ColourConverter::getOriginal() { return getColour(this->originalEnc) ; } template Geom::Vector<3,REAL> ColourConverter::getRGB() { if (RGB == NULL) ... ... @@ -150,7 +180,7 @@ void ColourConverter::convertXYZtoLuv() { REAL Ydiv = Y/Yn ; if (Ydiv > 0.008856) L = 116.0 * pow(Ydiv,1.0f/3.0) - 16.0 ; L = 116.0 * pow(Ydiv,1.0/3.0) - 16.0 ; else // near black L = 903.3 * Ydiv ; ... ...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment