From 807f5973fb19df5464c0a264dfb20852e13a0e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 13 Jan 2012 09:04:40 +0000 Subject: [PATCH] Disabled unused variables git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@492 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Apps/Decimating/CmdOption.hh | 2 +- .../Streaming-qt4/Server/VDPMServerSession.cc | 1 + .../Streaming/Server/VDPMServerSession.cc | 2 + .../Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc | 54 +++++++++---------- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/CmdOption.hh b/src/OpenMesh/Apps/Decimating/CmdOption.hh index ebaed634..df1de795 100644 --- a/src/OpenMesh/Apps/Decimating/CmdOption.hh +++ b/src/OpenMesh/Apps/Decimating/CmdOption.hh @@ -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_; } diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc index 336593a8..ea46524d 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc @@ -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 diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc index 618c82da..57dd73ea 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc @@ -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 diff --git a/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc b/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc index 9a5c26d3..bd8914a2 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc +++ b/src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc @@ -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; } } }