diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp index e10d2864b9de9fab2dbe94af7530af44847f3019..36ac6db473ab646f97dbb0152b8041ece522566a 100644 --- a/Geo/MElement.cpp +++ b/Geo/MElement.cpp @@ -303,12 +303,12 @@ void MElement::xyz2uvw(double xyz[3], double uvw[3]) } double inv[3][3]; inv3x3(jac, inv); - double un = uvw[0] + - inv[0][0] * (xyz[0] - xn) + inv[1][0] * (xyz[1] - yn) + inv[2][0] * (xyz[2] - zn); - double vn = uvw[1] + - inv[0][1] * (xyz[0] - xn) + inv[1][1] * (xyz[1] - yn) + inv[2][1] * (xyz[2] - zn) ; - double wn = uvw[2] + - inv[0][2] * (xyz[0] - xn) + inv[1][2] * (xyz[1] - yn) + inv[2][2] * (xyz[2] - zn) ; + double un = uvw[0] + inv[0][0] * (xyz[0] - xn) + + inv[1][0] * (xyz[1] - yn) + inv[2][0] * (xyz[2] - zn); + double vn = uvw[1] + inv[0][1] * (xyz[0] - xn) + + inv[1][1] * (xyz[1] - yn) + inv[2][1] * (xyz[2] - zn); + double wn = uvw[2] + inv[0][2] * (xyz[0] - xn) + + inv[1][2] * (xyz[1] - yn) + inv[2][2] * (xyz[2] - zn); error = sqrt(SQU(un - uvw[0]) + SQU(vn - uvw[1]) + SQU(wn - uvw[2])); uvw[0] = un; uvw[1] = vn; diff --git a/Geo/MVertex.cpp b/Geo/MVertex.cpp index 3f9b6e97598a85df463b834d7cd64bab7b9b70c3..396486d80a0a1026a476428f47ddda181962f4ec 100644 --- a/Geo/MVertex.cpp +++ b/Geo/MVertex.cpp @@ -281,7 +281,6 @@ static void getAllParameters(MVertex *v, GFace *gf, std::vector<SPoint2> ¶ms bool reparamMeshEdgeOnFace(MVertex *v1, MVertex *v2, GFace *gf, SPoint2 ¶m1, SPoint2 ¶m2) { - std::vector<SPoint2> p1, p2; getAllParameters(v1, gf, p1); getAllParameters(v2, gf, p2); @@ -328,8 +327,6 @@ bool reparamMeshEdgeOnFace(MVertex *v1, MVertex *v2, GFace *gf, bool reparamMeshVertexOnFace(const MVertex *v, const GFace *gf, SPoint2 ¶m) { - - if (gf->geomType() == GEntity::CompoundSurface && v->onWhat()->dim() < 2){ GFaceCompound *gfc = (GFaceCompound*) gf; diff --git a/Geo/MVertex.h b/Geo/MVertex.h index 78cb939917d8f73a706cbfe33c8db4efdb93a01a..7e4287106dd96c001c0f067692b3ed3b11346a46 100644 --- a/Geo/MVertex.h +++ b/Geo/MVertex.h @@ -42,7 +42,7 @@ class MVertex{ // the geometrical entity the vertex is associated with GEntity *_ge; - public : + public: MVertex(double x, double y, double z, GEntity *ge=0, int num=0); virtual ~MVertex(){} @@ -113,7 +113,7 @@ class MVertex{ class MEdgeVertex : public MVertex{ protected: double _u, _lc; - public : + public: MEdgeVertex(double x, double y, double z, GEntity *ge, double u, double lc = -1.0, int num = 0) : MVertex(x, y, z, ge,num), _u(u), _lc(lc)