Skip to content
Snippets Groups Projects
Commit a3c851a4 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

pp

parent 3d7b780c
No related branches found
No related tags found
No related merge requests found
...@@ -86,6 +86,12 @@ static void FinishUpBoundingBox() ...@@ -86,6 +86,12 @@ static void FinishUpBoundingBox()
double l = sqrt(SQU(range[0]) + SQU(range[2])); double l = sqrt(SQU(range[0]) + SQU(range[2]));
CTX::instance()->min[1] -= l; CTX::instance()->max[1] += l; CTX::instance()->min[1] -= l; CTX::instance()->max[1] += l;
} }
CTX::instance()->lc = sqrt(SQU(CTX::instance()->max[0] - CTX::instance()->min[0]) +
SQU(CTX::instance()->max[1] - CTX::instance()->min[1]) +
SQU(CTX::instance()->max[2] - CTX::instance()->min[2]));
for(int i = 0; i < 3; i++)
CTX::instance()->cg[i] = 0.5 * (CTX::instance()->min[i] + CTX::instance()->max[i]);
} }
void SetBoundingBox(double xmin, double xmax, void SetBoundingBox(double xmin, double xmax,
...@@ -96,12 +102,6 @@ void SetBoundingBox(double xmin, double xmax, ...@@ -96,12 +102,6 @@ void SetBoundingBox(double xmin, double xmax,
CTX::instance()->min[1] = ymin; CTX::instance()->max[1] = ymax; CTX::instance()->min[1] = ymin; CTX::instance()->max[1] = ymax;
CTX::instance()->min[2] = zmin; CTX::instance()->max[2] = zmax; CTX::instance()->min[2] = zmin; CTX::instance()->max[2] = zmax;
FinishUpBoundingBox(); FinishUpBoundingBox();
CTX::instance()->lc = sqrt(SQU(CTX::instance()->max[0] - CTX::instance()->min[0]) +
SQU(CTX::instance()->max[1] - CTX::instance()->min[1]) +
SQU(CTX::instance()->max[2] - CTX::instance()->min[2]));
for(int i = 0; i < 3; i++)
CTX::instance()->cg[i] = 0.5 * (CTX::instance()->min[i] + CTX::instance()->max[i]);
} }
void SetBoundingBox(bool aroundVisible) void SetBoundingBox(bool aroundVisible)
...@@ -127,12 +127,6 @@ void SetBoundingBox(bool aroundVisible) ...@@ -127,12 +127,6 @@ void SetBoundingBox(bool aroundVisible)
CTX::instance()->min[1] = bb.min().y(); CTX::instance()->max[1] = bb.max().y(); CTX::instance()->min[1] = bb.min().y(); CTX::instance()->max[1] = bb.max().y();
CTX::instance()->min[2] = bb.min().z(); CTX::instance()->max[2] = bb.max().z(); CTX::instance()->min[2] = bb.min().z(); CTX::instance()->max[2] = bb.max().z();
FinishUpBoundingBox(); FinishUpBoundingBox();
CTX::instance()->lc = sqrt(SQU(CTX::instance()->max[0] - CTX::instance()->min[0]) +
SQU(CTX::instance()->max[1] - CTX::instance()->min[1]) +
SQU(CTX::instance()->max[2] - CTX::instance()->min[2]));
for(int i = 0; i < 3; i++)
CTX::instance()->cg[i] = 0.5 * (CTX::instance()->min[i] + CTX::instance()->max[i]);
} }
// FIXME: this is necessary for now to have an approximate CTX::instance()->lc // FIXME: this is necessary for now to have an approximate CTX::instance()->lc
......
...@@ -150,7 +150,7 @@ void filterColumns(std::vector<MElement*> &elem, ...@@ -150,7 +150,7 @@ void filterColumns(std::vector<MElement*> &elem,
// delete c[i]; // delete c[i];
} }
} }
printf("%i --> %i\n",elem.size(),toKeep.size()); printf("%d --> %d\n", (int)elem.size(), (int)toKeep.size());
elem = toKeep; elem = toKeep;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment