Commit 7af03e77 by Kenneth Vanhoey

### Comment cleanup

parent 569bf731
 ... ... @@ -249,27 +249,24 @@ void Approximator_RGBfunctions::approximate(Dart d) REAL alpha1 = ((n * j1pr) > 0 ? -1 : 1) * acos( std::max(std::min(1.0f, n * n1), -1.0f) ) ; // angle positif ssi REAL alpha2 = ((n * j2pr) > 0 ? -1 : 1) * acos( std::max(std::min(1.0f, n * n2), -1.0f) ) ; // PI/2 < angle(j1',n) < -PI/2 ssi j1'*n < 0 assert (-3.15 < gamma1 && gamma1 <= 3.15) ; assert (-3.15 < gamma2 && gamma2 <= 3.15) ; assert (-3.15 < alpha1 && alpha1 <= 3.15) ; assert (-3.15 < alpha2 && alpha2 <= 3.15) ; // assert (-3.15 < gamma1 && gamma1 <= 3.15) ; // assert (-3.15 < gamma2 && gamma2 <= 3.15) ; // assert (-3.15 < alpha1 && alpha1 <= 3.15) ; // assert (-3.15 < alpha2 && alpha2 <= 3.15) ; MATRIX36 &f1 = this->m_attrV[d] ; MATRIX36 &f2 = this->m_attrV[dd] ; // MATRIX36 &f1 = this->m_attrV[d] ; // MATRIX36 &f2 = this->m_attrV[dd] ; // Create and sum quadrics // std::cout << "angles1 : " << gamma1 << " " << alpha1 << std::endl ; // std::cout << "angles2 : " << gamma2 << " " << alpha2 << std::endl ; QuadricRGBfunctions q(f1, gamma1/*, alpha1*/) ; m_quadricRGBfunctions[d].zero() ; m_quadricRGBfunctions[d] += QuadricRGBfunctions(this->m_attrV[d], gamma1/*, alpha1*/) ; m_quadricRGBfunctions[d] += QuadricRGBfunctions(this->m_attrV[dd], gamma2/*, alpha2*/) ; m_quadricRGBfunctions[d] += QuadricRGBfunctions(this->m_attrV[d], gamma1, alpha1) ; m_quadricRGBfunctions[d] += QuadricRGBfunctions(this->m_attrV[dd], gamma2, alpha2) ; // Compute new function if (! m_quadricRGBfunctions[d].findOptimizedRGBfunctions(this->m_approx[d])) { this->m_approx[d] = this->m_attrV[d]; // if fail take first one } MATRIX36 &newF = this->m_approx[d] ; // MATRIX36 &newF = this->m_approx[d] ; // std::cout << "Approx of : " <m_attrV[d] << std::endl ; ... ...
 ... ... @@ -71,7 +71,6 @@ QuadricRGBfunctions::QuadricRGBfunctions(const MATRIX36& cf, const REAL ga MATRIX66 R1,R2_b,R2_c ; buildRotateMatrix(R1,gamma); // Rotation 1 // R1.transpose() ; buildIntegralMatrix_A(A,alpha); // Parameterized integral matrix A buildIntegralMatrix_b(R2_b,alpha); // Parameterized integral matrix b ... ...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!