manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected another typeclash in the curvature types (a CurVecType definition was missing in the emptycore component)

This commit is contained in:
Paolo Cignoni 2014-06-24 08:41:41 +00:00
parent 938eefd398
commit eb642099f1
2 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vcg/simplex/vertex/component.h
View File

@ -124,7 +124,8 @@ public:
int cVHi() const { static int z=0; return z;} int cVHi() const { static int z=0; return z;}
static bool HasVHAdjacency() { return false; } static bool HasVHAdjacency() { return false; }
typedef Point3f VecType; typedef float CurScalarType;
typedef Point3f CurVecType;
typedef Point2f CurvatureType; typedef Point2f CurvatureType;
float &Kh() { static float dummy = 0.f; assert(0);return dummy;} float &Kh() { static float dummy = 0.f; assert(0);return dummy;}
float &Kg() { static float dummy = 0.f; assert(0);return dummy;} float &Kg() { static float dummy = 0.f; assert(0);return dummy;}
@ -132,15 +133,15 @@ public:
float cKg() const { static float dummy = 0.f; assert(0); return dummy;} float cKg() const { static float dummy = 0.f; assert(0); return dummy;}
typedef CurvatureDirBaseType<float> CurvatureDirType; typedef CurvatureDirBaseType<float> CurvatureDirType;
VecType &PD1() {static VecType v(0,0,0); assert(0);return v;} CurVecType &PD1() {static CurVecType v(0,0,0); assert(0);return v;}
VecType &PD2() {static VecType v(0,0,0); assert(0);return v;} CurVecType &PD2() {static CurVecType v(0,0,0); assert(0);return v;}
VecType cPD1() const {static VecType v(0,0,0); assert(0);return v;} CurVecType cPD1() const {static CurVecType v(0,0,0); assert(0);return v;}
VecType cPD2() const {static VecType v(0,0,0); assert(0);return v;} CurVecType cPD2() const {static CurVecType v(0,0,0); assert(0);return v;}
ScalarType &K1() { static ScalarType v = 0.0;assert(0);return v;} CurScalarType &K1() { static ScalarType v = 0.0;assert(0);return v;}
ScalarType &K2() { static ScalarType v = 0.0;assert(0);return v;} CurScalarType &K2() { static ScalarType v = 0.0;assert(0);return v;}
ScalarType cK1() const {static ScalarType v = 0.0;assert(0);return v;} CurScalarType cK1() const {static ScalarType v = 0.0;assert(0);return v;}
ScalarType cK2() const {static ScalarType v = 0.0;assert(0);return v;} CurScalarType cK2() const {static ScalarType v = 0.0;assert(0);return v;}
static bool HasCurvature() { return false; } static bool HasCurvature() { return false; }
static bool HasCurvatureDir() { return false; } static bool HasCurvatureDir() { return false; }