Renamed some namespaces and removed extra files
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@455 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -49,7 +49,7 @@
|
|||||||
//
|
//
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
#define MB_MODEDGELENGTHT_C
|
#define MODEDGELENGTHT_C
|
||||||
|
|
||||||
|
|
||||||
//== INCLUDES =================================================================
|
//== INCLUDES =================================================================
|
||||||
|
|||||||
@@ -49,8 +49,8 @@
|
|||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
|
|
||||||
#ifndef MB_MODEDGELENGTHT_HH
|
#ifndef MODEDGELENGTHT_HH
|
||||||
#define MB_MODEDGELENGTHT_HH
|
#define MODEDGELENGTHT_HH
|
||||||
|
|
||||||
|
|
||||||
//== INCLUDES =================================================================
|
//== INCLUDES =================================================================
|
||||||
@@ -108,11 +108,11 @@ private:
|
|||||||
} // END_NS_DECIMATER
|
} // END_NS_DECIMATER
|
||||||
} // END_NS_OPENMESH
|
} // END_NS_OPENMESH
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
#if defined(INCLUDE_TEMPLATES) && !defined(MB_MODEDGELENGTHT_C)
|
#if defined(INCLUDE_TEMPLATES) && !defined(MODEDGELENGTHT_C)
|
||||||
#define MB_MODEDGELENGTHT_TEMPLATES
|
#define MODEDGELENGTHT_TEMPLATES
|
||||||
#include "ModEdgeLengthT.cc"
|
#include "ModEdgeLengthT.cc"
|
||||||
#endif
|
#endif
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
#endif // MB_MODEDGELENGTHT_HH defined
|
#endif // MODEDGELENGTHT_HH defined
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
//
|
//
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
#define MB_MODHAUSDORFFT_C
|
#define MODHAUSDORFFT_C
|
||||||
|
|
||||||
|
|
||||||
//== INCLUDES =================================================================
|
//== INCLUDES =================================================================
|
||||||
|
|||||||
@@ -50,8 +50,8 @@
|
|||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
|
|
||||||
#ifndef MB_MODHAUSDORFFT_HH
|
#ifndef MODHAUSDORFFT_HH
|
||||||
#define MB_MODHAUSDORFFT_HH
|
#define MODHAUSDORFFT_HH
|
||||||
|
|
||||||
|
|
||||||
//== INCLUDES =================================================================
|
//== INCLUDES =================================================================
|
||||||
@@ -149,11 +149,11 @@ private:
|
|||||||
} // END_NS_DECIMATER
|
} // END_NS_DECIMATER
|
||||||
} // END_NS_OPENMESH
|
} // END_NS_OPENMESH
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
#if defined(INCLUDE_TEMPLATES) && !defined(MB_MODHAUSDORFFT_C)
|
#if defined(INCLUDE_TEMPLATES) && !defined(MODHAUSDORFFT_C)
|
||||||
#define MB_MODHAUSDORFFT_TEMPLATES
|
#define MODHAUSDORFFT_TEMPLATES
|
||||||
#include "ModHausdorffT.cc"
|
#include "ModHausdorffT.cc"
|
||||||
#endif
|
#endif
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
#endif // MB_MODHAUSDORFFT_HH defined
|
#endif // MODHAUSDORFFT_HH defined
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
|
|||||||
@@ -49,8 +49,8 @@
|
|||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
|
|
||||||
#ifndef MB_MODNORMALDEVIATIONT_HH
|
#ifndef MODNORMALDEVIATIONT_HH
|
||||||
#define MB_MODNORMALDEVIATIONT_HH
|
#define MODNORMALDEVIATIONT_HH
|
||||||
|
|
||||||
|
|
||||||
//== INCLUDES =================================================================
|
//== INCLUDES =================================================================
|
||||||
@@ -208,6 +208,6 @@ private:
|
|||||||
} // END_NS_DECIMATER
|
} // END_NS_DECIMATER
|
||||||
} // END_NS_OPENMESH
|
} // END_NS_OPENMESH
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
#endif // MB_MODNORMALDEVIATIONT_HH defined
|
#endif // MODNORMALDEVIATIONT_HH defined
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
# angle in degrees [0,60]
|
|
||||||
#
|
|
||||||
# compute roundness of first case
|
|
||||||
|
|
||||||
A = [ 0.0335717 0.0576863 -0.0503314 ]';
|
|
||||||
B = [ 0.0325544 0.057614 -0.0504989 ]';
|
|
||||||
C = [ 0.0323531 0.057051 -0.0504476 ]';
|
|
||||||
|
|
||||||
#
|
|
||||||
vecAC=C-A;
|
|
||||||
vecAB=B-A;
|
|
||||||
|
|
||||||
aa = norm(B-C)^2;
|
|
||||||
bb = norm(vecAC)^2;
|
|
||||||
cc = norm(vecAB)^2;
|
|
||||||
AA = norm(cross(vecAC,vecAB))^2
|
|
||||||
|
|
||||||
nom = AA * min( aa, min(bb,cc) );
|
|
||||||
denom = aa * bb * cc;
|
|
||||||
nR1 = sqrt(4.0/3.0) * sqrt(nom/denom)
|
|
||||||
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
# angle in degrees [0,60]
|
|
||||||
# [replace :angle: with a value between 0 and 60]
|
|
||||||
alpha_d = :angle:;
|
|
||||||
|
|
||||||
# compute roundness of first case
|
|
||||||
|
|
||||||
alpha = pi * alpha_d/180;
|
|
||||||
|
|
||||||
A = [ 0 0 0 ]';
|
|
||||||
B = [ 2*cos(alpha) 0 0 ]';
|
|
||||||
C = [ cos(alpha) sin(alpha) 0 ]';
|
|
||||||
|
|
||||||
#
|
|
||||||
vecAC=C-A;
|
|
||||||
vecAB=B-A;
|
|
||||||
|
|
||||||
aa = norm(B-C)^2;
|
|
||||||
bb = norm(vecAC)^2;
|
|
||||||
cc = norm(vecAB)^2;
|
|
||||||
AA = norm(cross(vecAC,vecAB))^2;
|
|
||||||
|
|
||||||
nom = AA * min( aa, min(bb,cc) );
|
|
||||||
denom = aa * bb * cc;
|
|
||||||
nR1 = sqrt(4.0/3.0) * sqrt(nom/denom)
|
|
||||||
|
|
||||||
# compute roundness of 2nd case
|
|
||||||
|
|
||||||
alpha = pi * ((180-alpha_d)/2)/180;
|
|
||||||
|
|
||||||
A = [ 0 0 0 ]';
|
|
||||||
B = [ 2*cos(alpha) 0 0 ]';
|
|
||||||
C = [ cos(alpha) sin(alpha) 0 ]';
|
|
||||||
|
|
||||||
#
|
|
||||||
vecAC=C-A;
|
|
||||||
vecAB=B-A;
|
|
||||||
|
|
||||||
aa = norm(B-C)^2;
|
|
||||||
bb = norm(vecAC)^2;
|
|
||||||
cc = norm(vecAB)^2;
|
|
||||||
AA = norm(cross(vecAC,vecAB))^2;
|
|
||||||
|
|
||||||
nom = AA * min( aa, min(bb,cc) );
|
|
||||||
denom = aa * bb * cc;
|
|
||||||
nR2 = sqrt(4.0/3.0) * sqrt(nom/denom)
|
|
||||||
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
i=0
|
|
||||||
while ((i <= 60)); do
|
|
||||||
cat roundness.m | perl -pe "s/:angle:/$i/" > tmp.m
|
|
||||||
echo $i `octave -q tmp.m 2> /dev/null | grep -v "nR2" | perl -pe 's/^nR1 = (.*)$/\1/'`
|
|
||||||
i=$((++i))
|
|
||||||
done
|
|
||||||
Reference in New Issue
Block a user