Changeset 1025 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/quadrics.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/quadrics.cxx (modified) (16 diffs)

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

@@ -1 +1 @@
 // $Id: quadrics.cxx,v 1.5 1997/10/01 14:07:28 garland Exp $
 
-#include "qslim.h"
+#include "simplif.h"
 #include "quadrics.h"
 
@@ -16 +16 @@
 //
 
-using namespace qslim;
-
-Mat4 qslim::quadrix_vertex_constraint(const Vec3& v)
+using namespace simplif;
+
+Mat4 simplif::quadrix_vertex_constraint(const Vec3& v)
 {
     Mat4 L(Mat4::identity);
@@ -39 +39 @@
 // quadric" discussed in the paper.
 //
-Mat4 qslim::quadrix_plane_constraint(real a, real b, real c, real d)
+Mat4 simplif::quadrix_plane_constraint(real a, real b, real c, real d)
 {
     Mat4 K(Mat4::zero);
@@ -54 +54 @@
 // Define some other convenient ways for constructing these plane quadrics.
 //
-Mat4 qslim::quadrix_plane_constraint(const Vec3& n, real d)
-{
-    return qslim::quadrix_plane_constraint(n[X], n[Y], n[Z], d);
-}
-
-Mat4 qslim::quadrix_plane_constraint(Face& T)
+Mat4 simplif::quadrix_plane_constraint(const Vec3& n, real d)
+{
+    return simplif::quadrix_plane_constraint(n[X], n[Y], n[Z], d);
+}
+
+Mat4 simplif::quadrix_plane_constraint(Face& T)
 {
     const Plane& p = T.plane();
@@ -65 +65 @@
     p.coeffs(&a, &b, &c, &d);
 
-    return qslim::quadrix_plane_constraint(a, b, c, d);
-}
-
-qslim::Mat4 qslim::quadrix_plane_constraint(const qslim::Vec3& v1, const qslim::Vec3& v2, const qslim::Vec3& v3)
+    return simplif::quadrix_plane_constraint(a, b, c, d);
+}
+
+simplif::Mat4 simplif::quadrix_plane_constraint(const simplif::Vec3& v1, const simplif::Vec3& v2, const simplif::Vec3& v3)
 {
     Plane P(v1,v2,v3);
@@ -74 +74 @@
     P.coeffs(&a, &b, &c, &d);
 
-    return qslim::quadrix_plane_constraint(a, b, c, d);
-}
-
-real qslim::quadrix_evaluate_vertex(const Vec3& v, const Mat4& K)
+    return simplif::quadrix_plane_constraint(a, b, c, d);
+}
+
+real simplif::quadrix_evaluate_vertex(const Vec3& v, const Mat4& K)
 {
     real x=v[X], y=v[Y], z=v[Z];
@@ -113 +113 @@
 }
 
-bool qslim::check_for_discontinuity(Edge *e)
+bool simplif::check_for_discontinuity(Edge *e)
 {
     return is_border(e);
 }
 
-Mat4 qslim::quadrix_discontinuity_constraint(Edge *edge, const Vec3& n)
+Mat4 simplif::quadrix_discontinuity_constraint(Edge *edge, const Vec3& n)
 {
     Vec3& org = *edge->org();
@@ -128 +128 @@
 
     real d = -n2 * org;
-    return qslim::quadrix_plane_constraint(n2, d);
-}
-
-
-Mat4 qslim::quadrix_discontinuity_constraint(Edge *edge)
+    return simplif::quadrix_plane_constraint(n2, d);
+}
+
+
+Mat4 simplif::quadrix_discontinuity_constraint(Edge *edge)
 {
     Mat4 D(Mat4::zero);
@@ -139 +139 @@
 
     for(int i=0; i<faces.length(); i++)
-                D += qslim::quadrix_discontinuity_constraint(edge,faces(i)->plane().normal());
+                D += simplif::quadrix_discontinuity_constraint(edge,faces(i)->plane().normal());
 
     return D;
@@ -150 +150 @@
 //
 
-bool qslim::quadrix_find_local_fit(const Mat4& K,
+bool simplif::quadrix_find_local_fit(const Mat4& K,
                             const Vec3& v1, const Vec3& v2,
                             Vec3& candidate)
@@ -159 +159 @@
     bool try_midpoint = placement_policy > PLACE_ENDPOINTS;
 
-    real c1 = qslim::quadrix_evaluate_vertex(v1, K);
-    real c2 = qslim::quadrix_evaluate_vertex(v2, K);
+    real c1 = simplif::quadrix_evaluate_vertex(v1, K);
+    real c2 = simplif::quadrix_evaluate_vertex(v2, K);
     real c3;
-    if( try_midpoint ) c3 = qslim::quadrix_evaluate_vertex(v3, K);
+    if( try_midpoint ) c3 = simplif::quadrix_evaluate_vertex(v3, K);
 
     if( c1<c2 )
@@ -182 +182 @@
 }
 
-bool qslim::quadrix_find_line_fit(const Mat4& Q,
+bool simplif::quadrix_find_line_fit(const Mat4& Q,
                            const Vec3& v1, const Vec3& v2,
                            Vec3& candidate)
@@ -206 +206 @@
 }
 
-bool qslim::quadrix_find_best_fit(const Mat4& Q, Vec3& candidate)
+bool simplif::quadrix_find_best_fit(const Mat4& Q, Vec3& candidate)
 {
     Mat4 K = Q;
@@ -237 +237 @@
 #include <assert.h>
 
-real qslim::quadrix_pair_target(const Mat4& Q,
+real simplif::quadrix_pair_target(const Mat4& Q,
                          Vertex *v1,
                          Vertex *v2,
@@ -257 +257 @@
         {
             candidate = *v1;
-            return qslim::quadrix_evaluate_vertex(candidate, Q);
+            return simplif::quadrix_evaluate_vertex(candidate, Q);
         }
         else if( c2 > c1 )
         {
             candidate = *v2;
-            return qslim::quadrix_evaluate_vertex(candidate, Q);
+            return simplif::quadrix_evaluate_vertex(candidate, Q);
         }
         else if( c1>0 && policy>PLACE_LINE )
@@ -273 +273 @@
     {
     case PLACE_OPTIMAL:
-        if( qslim::quadrix_find_best_fit(Q, candidate) )
+        if( simplif::quadrix_find_best_fit(Q, candidate) )
             break;
 
     case PLACE_LINE:
-        if( qslim::quadrix_find_line_fit(Q, *v1, *v2, candidate) )
+        if( simplif::quadrix_find_line_fit(Q, *v1, *v2, candidate) )
             break;
 
     default:
-                qslim::quadrix_find_local_fit(Q, *v1, *v2, candidate);
+                simplif::quadrix_find_local_fit(Q, *v1, *v2, candidate);
                 break;
     }
 
-    return qslim::quadrix_evaluate_vertex(candidate, Q);
-}
+    return simplif::quadrix_evaluate_vertex(candidate, Q);
+}