Changeset 1025 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/AdjModel.cxx

Timestamp:

06/20/06 13:28:51 (18 years ago)

Author:

gumbau

Message:

namespace simplif

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/AdjModel.cxx (modified) (3 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/AdjModel.cxx

@@ -7 +7 @@
      mlab: (Id: polymodel.cc,v 1.21 1997/02/06 16:34:14 garland Exp)
   via
-     QSlim: (Id: polymodel.cc,v 1.5 1997/02/25 20:36:36 garland Exp)
+     simplif: (Id: polymodel.cc,v 1.5 1997/02/25 20:36:36 garland Exp)
 
  ************************************************************************/
@@ -13 +13 @@
 #include "AdjModel.h"
 
-using namespace qslim;
+using namespace simplif;
 
 int Model::in_Vertex(const Vec3& p)
@@ -329 +329 @@
 /*              // SUS: recalcular la normal en los triangulos cambiados no degenerados
 
-                qslim::Vertex * auxv0 = F->vertex(0);
-                qslim::Vertex * auxv1 = F->vertex(1);
-                qslim::Vertex * auxv2 = F->vertex(2);
-                qslim::Vec3 vd1(auxv1->operator[](qslim::X) - auxv0->operator[](qslim::X), 
-                                                auxv1->operator[](qslim::Y) - auxv0->operator[](qslim::Y),
-                                                auxv1->operator[](qslim::Z) - auxv0->operator[](qslim::Z));
-                qslim::Vec3 vd2(auxv2->operator[](qslim::X) - auxv0->operator[](qslim::X), 
-                                                auxv2->operator[](qslim::Y) - auxv0->operator[](qslim::Y),
-                                                auxv2->operator[](qslim::Z) - auxv0->operator[](qslim::Z));
-
-                qslim::unitize(vd1);
-                qslim::unitize(vd2);
-
-                qslim::Vec3 vn = vd1 ^ vd2;
-                qslim::unitize(vn);
+                simplif::Vertex * auxv0 = F->vertex(0);
+                simplif::Vertex * auxv1 = F->vertex(1);
+                simplif::Vertex * auxv2 = F->vertex(2);
+                simplif::Vec3 vd1(auxv1->operator[](simplif::X) - auxv0->operator[](simplif::X), 
+                                                auxv1->operator[](simplif::Y) - auxv0->operator[](simplif::Y),
+                                                auxv1->operator[](simplif::Z) - auxv0->operator[](simplif::Z));
+                simplif::Vec3 vd2(auxv2->operator[](simplif::X) - auxv0->operator[](simplif::X), 
+                                                auxv2->operator[](simplif::Y) - auxv0->operator[](simplif::Y),
+                                                auxv2->operator[](simplif::Z) - auxv0->operator[](simplif::Z));
+
+                simplif::unitize(vd1);
+                simplif::unitize(vd2);
+
+                simplif::Vec3 vn = vd1 ^ vd2;
+                simplif::unitize(vn);
                 
                 //auxf->vertex_normals[0] = vn;
                 //auxf->vertex_normals[1] = vn;
                 //auxf->vertex_normals[2] = vn;
-                F->vertex_normals[0][qslim::X] = vn[qslim::X];
-                F->vertex_normals[0][qslim::Y] = vn[qslim::Y];
-                F->vertex_normals[0][qslim::Z] = vn[qslim::Z];
-                F->vertex_normals[1][qslim::X] = vn[qslim::X];
-                F->vertex_normals[1][qslim::Y] = vn[qslim::Y];
-                F->vertex_normals[1][qslim::Z] = vn[qslim::Z];
-                F->vertex_normals[2][qslim::X] = vn[qslim::X];
-                F->vertex_normals[2][qslim::Y] = vn[qslim::Y];
-                F->vertex_normals[2][qslim::Z] = vn[qslim::Z];*/
+                F->vertex_normals[0][simplif::X] = vn[simplif::X];
+                F->vertex_normals[0][simplif::Y] = vn[simplif::Y];
+                F->vertex_normals[0][simplif::Z] = vn[simplif::Z];
+                F->vertex_normals[1][simplif::X] = vn[simplif::X];
+                F->vertex_normals[1][simplif::Y] = vn[simplif::Y];
+                F->vertex_normals[1][simplif::Z] = vn[simplif::Z];
+                F->vertex_normals[2][simplif::X] = vn[simplif::X];
+                F->vertex_normals[2][simplif::Y] = vn[simplif::Y];
+                F->vertex_normals[2][simplif::Z] = vn[simplif::Z];*/
 
     }