Commit 807f5973 authored by Jan Möbius's avatar Jan Möbius
Browse files

Disabled unused variables

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@492 fdac6126-5c0c-442c-9429-916003d36597
parent 688e0e8f
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
typedef T value_type; typedef T value_type;
CmdOption(const T& _val) : val_(_val), valid_(true), enabled_(false) { } CmdOption(const T& _val) : val_(_val), valid_(true), enabled_(false) { }
CmdOption() : valid_(false), enabled_(false) { } CmdOption() : val_(T()),valid_(false), enabled_(false) { }
// has been set and has a value // has been set and has a value
bool is_valid(void) const { return valid_; } bool is_valid(void) const { return valid_; }
......
...@@ -73,6 +73,7 @@ set_vdpm(const char _vdpm_name[256]) ...@@ -73,6 +73,7 @@ set_vdpm(const char _vdpm_name[256])
vdpm_->vhierarchy_roots(roots); vdpm_->vhierarchy_roots(roots);
n_details = vdpm_->n_details(); n_details = vdpm_->n_details();
std::cout << "Details : " << n_details << std::endl;
//vfront_.init(roots, n_details); //vfront_.init(roots, n_details);
// vertex hierarchy window // vertex hierarchy window
......
...@@ -73,6 +73,8 @@ set_vdpm(const char _vdpm_name[256]) ...@@ -73,6 +73,8 @@ set_vdpm(const char _vdpm_name[256])
vdpm_->vhierarchy_roots(roots); vdpm_->vhierarchy_roots(roots);
n_details = vdpm_->n_details(); n_details = vdpm_->n_details();
std::cout << "Details : " << n_details << std::endl;
//vfront_.init(roots, n_details); //vfront_.init(roots, n_details);
// vertex hierarchy window // vertex hierarchy window
......
...@@ -963,7 +963,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -963,7 +963,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
OpenMesh::Vec3f residual; OpenMesh::Vec3f residual;
float distance2; // float distance2;
if ( s + t <= det ) if ( s + t <= det )
{ {
...@@ -977,12 +977,12 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -977,12 +977,12 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( -d >= a ) if ( -d >= a )
{ {
s = 1.0f; s = 1.0f;
distance2 = a+2.0f*d+f; // distance2 = a+2.0f*d+f;
} }
else else
{ {
s = -d/a; s = -d/a;
distance2 = d*s+f; // distance2 = d*s+f;
} }
} }
else else
...@@ -991,17 +991,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -991,17 +991,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( e >= 0.0f ) if ( e >= 0.0f )
{ {
t = 0.0f; t = 0.0f;
distance2 = f; // distance2 = f;
} }
else if ( -e >= c ) else if ( -e >= c )
{ {
t = 1.0f; t = 1.0f;
distance2 = c+2.0f*e+f; // distance2 = c+2.0f*e+f;
} }
else else
{ {
t = -e/c; t = -e/c;
distance2 = e*t+f; // distance2 = e*t+f;
} }
} }
} }
...@@ -1011,17 +1011,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1011,17 +1011,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( e >= 0.0f ) if ( e >= 0.0f )
{ {
t = 0.0f; t = 0.0f;
distance2 = f; // distance2 = f;
} }
else if ( -e >= c ) else if ( -e >= c )
{ {
t = 1.0f; t = 1.0f;
distance2 = c+2.0f*e+f; // distance2 = c+2.0f*e+f;
} }
else else
{ {
t = -e/c; t = -e/c;
distance2 = e*t+f; // distance2 = e*t+f;
} }
} }
} }
...@@ -1031,17 +1031,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1031,17 +1031,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( d >= 0.0f ) if ( d >= 0.0f )
{ {
s = 0.0f; s = 0.0f;
distance2 = f; // distance2 = f;
} }
else if ( -d >= a ) else if ( -d >= a )
{ {
s = 1.0f; s = 1.0f;
distance2 = a+2.0f*d+f; // distance2 = a+2.0f*d+f;
} }
else else
{ {
s = -d/a; s = -d/a;
distance2 = d*s+f; // distance2 = d*s+f;
} }
} }
else // region 0 else // region 0
...@@ -1050,8 +1050,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1050,8 +1050,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
float inv_det = 1.0f/det; float inv_det = 1.0f/det;
s *= inv_det; s *= inv_det;
t *= inv_det; t *= inv_det;
distance2 = s*(a*s+b*t+2.0f*d) + // distance2 = s*(a*s+b*t+2.0f*d) + t*(b*s+c*t+2.0f*e)+f;
t*(b*s+c*t+2.0f*e)+f;
} }
} }
else else
...@@ -1070,14 +1069,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1070,14 +1069,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
{ {
s = 1.0f; s = 1.0f;
t = 0.0f; t = 0.0f;
distance2 = a+2.0f*d+f; // distance2 = a+2.0f*d+f;
} }
else else
{ {
s = numer/denom; s = numer/denom;
t = 1.0f - s; t = 1.0f - s;
distance2 = s*(a*s+b*t+2.0f*d) + // distance2 = s*(a*s+b*t+2.0f*d) + t*(b*s+c*t+2.0f*e)+f;
t*(b*s+c*t+2.0f*e)+f;
} }
} }
else else
...@@ -1086,17 +1084,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1086,17 +1084,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( tmp1 <= 0.0f ) if ( tmp1 <= 0.0f )
{ {
t = 1.0f; t = 1.0f;
distance2 = c+2.0f*e+f; // distance2 = c+2.0f*e+f;
} }
else if ( e >= 0.0f ) else if ( e >= 0.0f )
{ {
t = 0.0f; t = 0.0f;
distance2 = f; // distance2 = f;
} }
else else
{ {
t = -e/c; t = -e/c;
distance2 = e*t+f; // distance2 = e*t+f;
} }
} }
} }
...@@ -1112,13 +1110,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1112,13 +1110,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
{ {
t = 1.0f; t = 1.0f;
s = 0.0f; s = 0.0f;
distance2 = c+2.0f*e+f; // distance2 = c+2.0f*e+f;
} }
else else
{ {
t = numer/denom; t = numer/denom;
s = 1.0f - t; s = 1.0f - t;
distance2 = s*(a*s+b*t+2.0f*d)+ t*(b*s+c*t+2.0f*e)+f; // distance2 = s*(a*s+b*t+2.0f*d)+ t*(b*s+c*t+2.0f*e)+f;
} }
} }
else else
...@@ -1127,17 +1125,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1127,17 +1125,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( tmp1 <= 0.0f ) if ( tmp1 <= 0.0f )
{ {
s = 1.0f; s = 1.0f;
distance2 = a+2.0f*d+f; // distance2 = a+2.0f*d+f;
} }
else if ( d >= 0.0f ) else if ( d >= 0.0f )
{ {
s = 0.0f; s = 0.0f;
distance2 = f; // distance2 = f;
} }
else else
{ {
s = -d/a; s = -d/a;
distance2 = d*s+f; // distance2 = d*s+f;
} }
} }
} }
...@@ -1148,7 +1146,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1148,7 +1146,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
{ {
s = 0.0f; s = 0.0f;
t = 1.0f; t = 1.0f;
distance2 = c+2.0f*e+f; // distance2 = c+2.0f*e+f;
} }
else else
{ {
...@@ -1157,13 +1155,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t) ...@@ -1157,13 +1155,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
{ {
s = 1.0f; s = 1.0f;
t = 0.0f; t = 0.0f;
distance2 = a+2.0f*d+f; // distance2 = a+2.0f*d+f;
} }
else else
{ {
s = numer/denom; s = numer/denom;
t = 1.0f - s; t = 1.0f - s;
distance2 = s*(a*s+b*t+2.0f*d) + t*(b*s+c*t+2.0f*e)+f; // distance2 = s*(a*s+b*t+2.0f*d) + t*(b*s+c*t+2.0f*e)+f;
} }
} }
} }
......
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