Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled unused variables

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@492 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-01-13 09:04:40 +00:00
parent 688e0e8feb
commit 807f5973fb
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Apps/Decimating/CmdOption.hh
View File

@@ -50,7 +50,7 @@ public:
typedef T value_type;
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
bool is_valid(void) const { return valid_; }

1
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc
View File

@@ -73,6 +73,7 @@ set_vdpm(const char _vdpm_name[256])
vdpm_->vhierarchy_roots(roots);
n_details = vdpm_->n_details();
std::cout << "Details : " << n_details << std::endl;
//vfront_.init(roots, n_details);
// vertex hierarchy window

2
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc
View File

@@ -73,6 +73,8 @@ set_vdpm(const char _vdpm_name[256])
vdpm_->vhierarchy_roots(roots);
n_details = vdpm_->n_details();
std::cout << "Details : " << n_details << std::endl;
//vfront_.init(roots, n_details);
// vertex hierarchy window

54
src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc
View File

@@ -963,7 +963,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
OpenMesh::Vec3f residual;
float distance2;
// float distance2;
if ( s + t <= det )
{
@@ -977,12 +977,12 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( -d >= a )
{
s = 1.0f;
distance2 = a+2.0f*d+f;
// distance2 = a+2.0f*d+f;
}
else
{
s = -d/a;
distance2 = d*s+f;
// distance2 = d*s+f;
}
}
else
@@ -991,17 +991,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( e >= 0.0f )
{
t = 0.0f;
distance2 = f;
// distance2 = f;
}
else if ( -e >= c )
{
t = 1.0f;
distance2 = c+2.0f*e+f;
// distance2 = c+2.0f*e+f;
}
else
{
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)
if ( e >= 0.0f )
{
t = 0.0f;
distance2 = f;
// distance2 = f;
}
else if ( -e >= c )
{
t = 1.0f;
distance2 = c+2.0f*e+f;
// distance2 = c+2.0f*e+f;
}
else
{
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)
if ( d >= 0.0f )
{
s = 0.0f;
distance2 = f;
// distance2 = f;
}
else if ( -d >= a )
{
s = 1.0f;
distance2 = a+2.0f*d+f;
// distance2 = a+2.0f*d+f;
}
else
{
s = -d/a;
distance2 = d*s+f;
// distance2 = d*s+f;
}
}
else // region 0
@@ -1050,8 +1050,7 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
float inv_det = 1.0f/det;
s *= inv_det;
t *= inv_det;
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
@@ -1070,14 +1069,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
{
s = 1.0f;
t = 0.0f;
distance2 = a+2.0f*d+f;
// distance2 = a+2.0f*d+f;
}
else
{
s = numer/denom;
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;
}
}
else
@@ -1086,17 +1084,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( tmp1 <= 0.0f )
{
t = 1.0f;
distance2 = c+2.0f*e+f;
// distance2 = c+2.0f*e+f;
}
else if ( e >= 0.0f )
{
t = 0.0f;
distance2 = f;
// distance2 = f;
}
else
{
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)
{
t = 1.0f;
s = 0.0f;
distance2 = c+2.0f*e+f;
// distance2 = c+2.0f*e+f;
}
else
{
t = numer/denom;
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
@@ -1127,17 +1125,17 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
if ( tmp1 <= 0.0f )
{
s = 1.0f;
distance2 = a+2.0f*d+f;
// distance2 = a+2.0f*d+f;
}
else if ( d >= 0.0f )
{
s = 0.0f;
distance2 = f;
// distance2 = f;
}
else
{
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)
{
s = 0.0f;
t = 1.0f;
distance2 = c+2.0f*e+f;
// distance2 = c+2.0f*e+f;
}
else
{
@@ -1157,13 +1155,13 @@ point2triangle_residual(const Vec3f &p, const Vec3f tri[3], float &s, float &t)
{
s = 1.0f;
t = 0.0f;
distance2 = a+2.0f*d+f;
// distance2 = a+2.0f*d+f;
}
else
{
s = numer/denom;
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;
}
}
}