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

commented out per vertex curvature property (todo: decide how to handle complete removal)

This commit is contained in:
Luigi Malomo 2021-11-03 14:19:44 +01:00 committed by alemuntoni
parent 5c63ade13d
commit 7eaeb7bece
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wrap/nanoply/include/nanoply.hpp
View File

@ -104,8 +104,8 @@ namespace nanoply
NNP_BITFLAG = 0x00040000, /**< Bit flags. */ NNP_BITFLAG = 0x00040000, /**< Bit flags. */
NNP_K1 = 0x00080000, /**< Main curvaure value k1. */ NNP_K1 = 0x00080000, /**< Main curvaure value k1. */
NNP_K2 = 0x00100000, /**< Main curvaure value k2. */ NNP_K2 = 0x00100000, /**< Main curvaure value k2. */
NNP_KG = 0x00200000, /**< Gaussian curvature value. */ // NNP_KG = 0x00200000, /**< Gaussian curvature value. */
NNP_KH = 0x00400000, /**< Mean curvature value. */ // NNP_KH = 0x00400000, /**< Mean curvature value. */
NNP_K1DIR = 0x00800000, /**< Curvature direction k1. */ NNP_K1DIR = 0x00800000, /**< Curvature direction k1. */
NNP_K2DIR = 0x01000000, /**< Curvature direction k2. */ NNP_K2DIR = 0x01000000, /**< Curvature direction k2. */
NNP_EDGE_V1 = 0x02000000, /**< Index of the first vertex of the edge. */ NNP_EDGE_V1 = 0x02000000, /**< Index of the first vertex of the edge. */
@ -242,8 +242,8 @@ namespace nanoply
{ PlyEntity::NNP_BITFLAG, NameVector({ "flags" }) }, { PlyEntity::NNP_BITFLAG, NameVector({ "flags" }) },
{ PlyEntity::NNP_K1, NameVector({ "k1" }) }, { PlyEntity::NNP_K1, NameVector({ "k1" }) },
{ PlyEntity::NNP_K2, NameVector({ "k2" }) }, { PlyEntity::NNP_K2, NameVector({ "k2" }) },
{ PlyEntity::NNP_KG, NameVector({ "k" }) }, // { PlyEntity::NNP_KG, NameVector({ "k" }) },
{ PlyEntity::NNP_KH, NameVector({ "h" }) }, // { PlyEntity::NNP_KH, NameVector({ "h" }) },
{ PlyEntity::NNP_K1DIR, NameVector({ "k1dir" }) }, { PlyEntity::NNP_K1DIR, NameVector({ "k1dir" }) },
{ PlyEntity::NNP_K2DIR, NameVector({ "k2dir" }) }, { PlyEntity::NNP_K2DIR, NameVector({ "k2dir" }) },
{ PlyEntity::NNP_EDGE_V1, NameVector({ "vertex1", "v1" }) }, { PlyEntity::NNP_EDGE_V1, NameVector({ "vertex1", "v1" }) },
@ -738,8 +738,8 @@ namespace nanoply
case NNP_BITFLAG: return "NNP_BITFLAG "; case NNP_BITFLAG: return "NNP_BITFLAG ";
case NNP_K1: return "NNP_K1 "; case NNP_K1: return "NNP_K1 ";
case NNP_K2: return "NNP_K2 "; case NNP_K2: return "NNP_K2 ";
case NNP_KG: return "NNP_K "; // case NNP_KG: return "NNP_K ";
case NNP_KH: return "NNP_H "; // case NNP_KH: return "NNP_H ";
case NNP_K1DIR: return "NNP_K1DIR "; case NNP_K1DIR: return "NNP_K1DIR ";
case NNP_K2DIR: return "NNP_K2DIR "; case NNP_K2DIR: return "NNP_K2DIR ";
case NNP_EDGE_V1: return "NNP_EDGE_V1 "; case NNP_EDGE_V1: return "NNP_EDGE_V1 ";

60
wrap/nanoply/include/nanoplyWrapper.hpp
View File

@ -856,8 +856,8 @@ namespace nanoply
case NNP_DENSITY: mask |= BitMask::IO_VERTRADIUS; break; case NNP_DENSITY: mask |= BitMask::IO_VERTRADIUS; break;
case NNP_TEXTURE2D: case NNP_TEXTURE2D:
case NNP_TEXTURE3D: mask |= BitMask::IO_VERTTEXCOORD; break; case NNP_TEXTURE3D: mask |= BitMask::IO_VERTTEXCOORD; break;
case NNP_KH: // case NNP_KH:
case NNP_KG: mask |= BitMask::IO_VERTCURV; break; // case NNP_KG: mask |= BitMask::IO_VERTCURV; break;
case NNP_K1: case NNP_K1:
case NNP_K2: case NNP_K2:
case NNP_K1DIR: case NNP_K1DIR:
@ -1012,21 +1012,21 @@ namespace nanoply
else else
vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexType, 2, VertexTexScalar>(NNP_TEXTURE2D, (*mesh.vert.begin()).T().P().V())); vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexType, 2, VertexTexScalar>(NNP_TEXTURE2D, (*mesh.vert.begin()).T().P().V()));
} }
if ((bitMask & BitMask::IO_VERTCURV) && vcg::tri::HasPerVertexCurvature(mesh)) // if ((bitMask & BitMask::IO_VERTCURV) && vcg::tri::HasPerVertexCurvature(mesh))
{ // {
if (ocfVertexMask & BitMask::IO_VERTCURV) // if (ocfVertexMask & BitMask::IO_VERTCURV)
{ // {
vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexCurType, 1, VertexCurScalar>(NNP_KG, &(*mesh.vert.begin()).Kg())); // vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexCurType, 1, VertexCurScalar>(NNP_KG, &(*mesh.vert.begin()).Kg()));
vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexCurType, 1, VertexCurScalar>(NNP_KH, &(*mesh.vert.begin()).Kh())); // vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexCurType, 1, VertexCurScalar>(NNP_KH, &(*mesh.vert.begin()).Kh()));
} // }
else // else
{ // {
vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexType, 1, VertexCurScalar>(NNP_KG, &(*mesh.vert.begin()).Kg())); // vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexType, 1, VertexCurScalar>(NNP_KG, &(*mesh.vert.begin()).Kg()));
vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexType, 1, VertexCurScalar>(NNP_KH, &(*mesh.vert.begin()).Kh())); // vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexType, 1, VertexCurScalar>(NNP_KH, &(*mesh.vert.begin()).Kh()));
} // }
} // }
if ((bitMask & BitMask::IO_VERTCURVDIR) && vcg::tri::HasPerVertexCurvatureDir(mesh)) if ((bitMask & BitMask::IO_VERTCURVDIR) && vcg::tri::HasPerVertexCurvatureDir(mesh))
{ {
if (ocfVertexMask & BitMask::IO_VERTCURVDIR) if (ocfVertexMask & BitMask::IO_VERTCURVDIR)
{ {
vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexCurDirType, 1, VertexDirCurScalar>(NNP_K1, &(*mesh.vert.begin()).K1())); vertexDescr.dataDescriptor.push_back(new DataDescriptor<VertexCurDirType, 1, VertexDirCurScalar>(NNP_K1, &(*mesh.vert.begin()).K1()));
@ -1380,19 +1380,19 @@ namespace nanoply
else else
PushDescriport<VertexType, VertexTexScalar, 2>(vertexProp, vertexDescr, NNP_TEXTURE2D, (*mesh.vert.begin()).T().P().V()); PushDescriport<VertexType, VertexTexScalar, 2>(vertexProp, vertexDescr, NNP_TEXTURE2D, (*mesh.vert.begin()).T().P().V());
} }
if ((bitMask & BitMask::IO_VERTCURV) && vcg::tri::HasPerVertexCurvature(mesh)) // if ((bitMask & BitMask::IO_VERTCURV) && vcg::tri::HasPerVertexCurvature(mesh))
{ // {
if (ocfVertexMask & BitMask::IO_VERTTEXCOORD) // if (ocfVertexMask & BitMask::IO_VERTTEXCOORD)
{ // {
PushDescriport<VertexCurType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KG, &(*mesh.vert.begin()).Kg()); // PushDescriport<VertexCurType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KG, &(*mesh.vert.begin()).Kg());
PushDescriport<VertexCurType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KH, &(*mesh.vert.begin()).Kh()); // PushDescriport<VertexCurType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KH, &(*mesh.vert.begin()).Kh());
} // }
else // else
{ // {
PushDescriport<VertexType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KG, &(*mesh.vert.begin()).Kg()); // PushDescriport<VertexType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KG, &(*mesh.vert.begin()).Kg());
PushDescriport<VertexType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KH, &(*mesh.vert.begin()).Kh()); // PushDescriport<VertexType, VertexCurScalar, 1>(vertexProp, vertexDescr, NNP_KH, &(*mesh.vert.begin()).Kh());
} // }
} // }
if ((bitMask & BitMask::IO_VERTCURVDIR) && vcg::tri::HasPerVertexCurvatureDir(mesh)) if ((bitMask & BitMask::IO_VERTCURVDIR) && vcg::tri::HasPerVertexCurvatureDir(mesh))
{ {
if (ocfVertexMask & BitMask::IO_VERTCURVDIR) if (ocfVertexMask & BitMask::IO_VERTCURVDIR)