Commit ff3b80d2 authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

corrections dans AHEM : _CELL et _ORBIT

parent 9ad68434
......@@ -222,7 +222,7 @@ void AHEMImporter<PFP>::LoadTopology()
{
// Allocate vertices
AttributeContainer& vxContainer = map->getAttributeContainer(VERTEX_CELL);
AttributeContainer& vxContainer = map->getAttributeContainer(VERTEX);
verticesId = new unsigned int[hdr.meshHdr.vxCount];
......@@ -234,10 +234,10 @@ void AHEMImporter<PFP>::LoadTopology()
// Ensure vertices are created by querying the position attribute
AttributeHandler<typename PFP::VEC3> position = map->template getAttribute<typename PFP::VEC3>(VERTEX_ORBIT, "position") ;
AttributeHandler<typename PFP::VEC3> position = map->template getAttribute<typename PFP::VEC3>(VERTEX, "position") ;
if (!position.isValid())
position = map->template addAttribute<typename PFP::VEC3>(VERTEX_ORBIT, "position") ;
position = map->template addAttribute<typename PFP::VEC3>(VERTEX, "position") ;
......@@ -272,7 +272,7 @@ void AHEMImporter<PFP>::LoadTopology()
addedHE[heId].vxIdFrom = prevVx;
addedHE[heId].vxIdTo = verticesId[*ix];
map->setDartEmbedding(VERTEX_ORBIT, d, prevVx);
map->setDartEmbedding(VERTEX, d, prevVx);
d = map->phi1(d);
prevVx = *ix++;
......@@ -286,7 +286,7 @@ void AHEMImporter<PFP>::LoadTopology()
addedHE[heId].vxIdFrom = prevVx;
addedHE[heId].vxIdTo = firstVx;
map->setDartEmbedding(VERTEX_ORBIT, d, prevVx);
map->setDartEmbedding(VERTEX, d, prevVx);
heId++;
}
......@@ -315,10 +315,10 @@ void AHEMImporter<PFP>::LoadTopology()
template <typename PFP>
void AHEMImporter<PFP>::LoadPosition(AHEMAttributeDescriptor* posDescr)
{
AttributeHandler<typename PFP::VEC3> position = map->template getAttribute<typename PFP::VEC3>(VERTEX_ORBIT, "position") ;
AttributeHandler<typename PFP::VEC3> position = map->template getAttribute<typename PFP::VEC3>(VERTEX, "position") ;
if (!position.isValid())
position = map->template addAttribute<typename PFP::VEC3>(VERTEX_ORBIT, "position") ;
position = map->template addAttribute<typename PFP::VEC3>(VERTEX, "position") ;
f.seekg(posDescr->fileStartOffset, std::ios_base::beg);
......
......@@ -78,10 +78,10 @@ void UniversalLoader<MapType, AttrTypeLoader>::ImportAttribute( MapType& map,
template<typename MapType, typename AttrTypeLoader>
void UniversalLoader<MapType, AttrTypeLoader>::UnpackOnVertex(MapType& map, const unsigned int* verticesId, const AHEMHeader* hdr, const char* attrName, const void* buffer) const
{
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(VERTEX_ORBIT, attrName);
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(VERTEX, attrName);
if (!attr.isValid())
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(VERTEX_ORBIT, attrName);
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(VERTEX, attrName);
char* p = (char*)buffer;
......@@ -97,10 +97,10 @@ void UniversalLoader<MapType, AttrTypeLoader>::UnpackOnVertex(MapType& map, cons
template<typename MapType, typename AttrTypeLoader>
void UniversalLoader<MapType, AttrTypeLoader>:: UnpackOnFace(MapType& map, const Dart* facesId, const AHEMHeader* hdr, const char* attrName, const void* buffer) const
{
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(FACE_ORBIT, attrName);
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(FACE, attrName);
if (!attr.isValid())
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(FACE_ORBIT, attrName);
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(FACE, attrName);
......@@ -117,10 +117,10 @@ void UniversalLoader<MapType, AttrTypeLoader>:: UnpackOnFace(MapType& map, const
template<typename MapType, typename AttrTypeLoader>
void UniversalLoader<MapType, AttrTypeLoader>:: UnpackOnHE(MapType& map, const Dart* facesId, const AHEMHeader* hdr, const char* attrName, const void* buffer) const
{
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART_ORBIT, attrName);
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART, attrName);
if (!attr.isValid())
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART_ORBIT, attrName);
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART, attrName);
......@@ -145,10 +145,10 @@ void UniversalLoader<MapType, AttrTypeLoader>:: UnpackOnHE(MapType& map, const D
template<typename MapType, typename AttrTypeLoader>
void UniversalLoader<MapType, AttrTypeLoader>:: UnpackOnHEFC(MapType& map, const Dart* facesId, const AHEMHeader* hdr, const char* attrName, const void* buffer) const
{
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART_ORBIT, attrName);
AttributeHandler<typename AttrTypeLoader::ATTR_TYPE> attr = map.template getAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART, attrName);
if (!attr.isValid())
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART_ORBIT, attrName);
attr = map.template addAttribute<typename AttrTypeLoader::ATTR_TYPE>(DART, attrName);
char* p = (char*)buffer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment