Commit cc11ac58 authored by Kirill Terekhov's avatar Kirill Terekhov

Correct wedge/prism nodes order

parent 031bc550
...@@ -152,6 +152,9 @@ namespace INMOST ...@@ -152,6 +152,9 @@ namespace INMOST
case Element::MultiLine: case Element::MultiLine:
case Element::Polygon: case Element::Polygon:
case Element::Tet: case Element::Tet:
case Element::Hex:
case Element::Pyramid:
case Element::Prism:
{ {
ElementArray<Node> nodes = it->getNodes(); ElementArray<Node> nodes = it->getNodes();
values.push_back(static_cast<integer>(nodes.size())); values.push_back(static_cast<integer>(nodes.size()));
...@@ -159,6 +162,7 @@ namespace INMOST ...@@ -159,6 +162,7 @@ namespace INMOST
values.push_back(jt->IntegerDF(set_id)); values.push_back(jt->IntegerDF(set_id));
break; break;
} }
/*
case Element::Prism: case Element::Prism:
{ {
ElementArray<Node> nodes = it->getNodes(); ElementArray<Node> nodes = it->getNodes();
...@@ -172,6 +176,8 @@ namespace INMOST ...@@ -172,6 +176,8 @@ namespace INMOST
values.push_back(nodes[4].IntegerDF(set_id)); values.push_back(nodes[4].IntegerDF(set_id));
break; break;
} }
*/
/*
case Element::Hex: case Element::Hex:
{ {
ElementArray<Node> nodes = it->getNodes(); ElementArray<Node> nodes = it->getNodes();
...@@ -199,6 +205,7 @@ namespace INMOST ...@@ -199,6 +205,7 @@ namespace INMOST
values.push_back(nodes[4].IntegerDF(set_id)); values.push_back(nodes[4].IntegerDF(set_id));
break; break;
} }
*/
case Element::Polyhedron: case Element::Polyhedron:
case Element::MultiPolygon: case Element::MultiPolygon:
{ {
......
...@@ -1365,9 +1365,9 @@ namespace INMOST ...@@ -1365,9 +1365,9 @@ namespace INMOST
} }
ElementArray<Node> verts = face->getNodes(); ElementArray<Node> verts = face->getNodes();
if( face->BackCell() == c ) if( face->BackCell() == c )
ret.insert(ret.end(),verts.begin(),verts.end());
else
ret.insert(ret.end(),verts.rbegin(),verts.rend()); ret.insert(ret.end(),verts.rbegin(),verts.rend());
else
ret.insert(ret.end(),verts.begin(),verts.end());
ElementArray<Edge> c_edges = c->getEdges(); ElementArray<Edge> c_edges = c->getEdges();
ElementArray<Edge> f_edges = face->getEdges(); ElementArray<Edge> f_edges = face->getEdges();
c_edges.SetPrivateMarker(cemrk); c_edges.SetPrivateMarker(cemrk);
......
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