Acc update

compositemodel/include/GoTools/compositemodel/ParameterizeUtils.h

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 1998, 2000-2007, 2010, 2011, 2012, 2013 SINTEF ICT,
+ * Applied Mathematics, Norway.
+ *
+ * Contact information: E-mail: tor.dokken@sintef.no                      
+ * SINTEF ICT, Department of Applied Mathematics,                         
+ * P.O. Box 124 Blindern,                                                 
+ * 0314 Oslo, Norway.                                                     
+ *
+ * This file is part of GoTools.
+ *
+ * GoTools is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version. 
+ *
+ * GoTools is distributed in the hope that it will be useful,        
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of         
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with GoTools. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public
+ * License, a covered work must retain the producer line in every data
+ * file that is created or manipulated using GoTools.
+ *
+ * Other Usage
+ * You can be released from the requirements of the license by purchasing
+ * a commercial license. Buying such a license is mandatory as soon as you
+ * develop commercial activities involving the GoTools library without
+ * disclosing the source code of your own applications.
+ *
+ * This file may be used in accordance with the terms contained in a
+ * written agreement between you and SINTEF ICT. 
+ */
+
+#ifndef __PARAMETERIZEUTILS_H
+#define __PARAMETERIZEUTILS_H
+
+#include "GoTools/parametrization/PrOrganizedPoints.h"
+#include "GoTools/utils/Array.h"
+#include <vector>
+
+namespace Go
+{
+  class ftPointSet;
+
+  namespace ParameterizeUtils
+  {
+    void parameterizeGraph(shared_ptr<ftPointSet> graph,
+			   std::vector<double>& uv_pars);
+
+    void parameterizeTriang(const double *xyz_points, int nmbp, 
+			    const int *triangles, int nmbt,
+			    std::vector<double>& uv_pars);
+
+    void doParameterize(shared_ptr<PrOrganizedPoints>& op,
+			std::vector<double>& uv_pars);
+
+    bool recognizeCornerNodes(std::vector<int>& bd_nodes,
+			      std::vector<Vector3D>& bd_pnts,
+			      double bd_len,
+			      std::vector<int>& cc);
+
+    void getPointsAndNormal(const double *xyz_points, int nmbp, 
+			    const int *triangles, int nmbt,
+			    std::vector<double>& point_and_normal);
+  }
+}
+
+#endif 

compositemodel/include/GoTools/compositemodel/SurfaceModelUtils.h

@@ -148,6 +148,24 @@ namespace Go
     void triangulateFaces(std::vector<shared_ptr<ftSurface> >& faces,
 			  shared_ptr<ftPointSet>& triang, double tol);
 
+    void triangulateModel(shared_ptr<SurfaceModel>& model, double density,
+			  shared_ptr<ftPointSet>& triang);
+
+    void samplePointsModel(shared_ptr<SurfaceModel>& model,
+			   double density,
+			   shared_ptr<ftPointSet>& triang);
+
+    void getFaceInnerSamplePoints(shared_ptr<ftSurface>& face, 
+				  double density,
+				  shared_ptr<ftPointSet>& points);
+
+    void getBoundarySamplePoints(shared_ptr<SurfaceModel>& model, 
+				 double density,
+				 shared_ptr<ftPointSet>& points);
+
+    void performModelTriangulate(shared_ptr<SurfaceModel>& model, 
+				 shared_ptr<ftPointSet>& triang,
+				 double density);
     void 
       reduceUnderlyingSurface(shared_ptr<BoundedSurface>& bd_sf,
 			      std::vector<shared_ptr<CurveOnSurface> >& cvs);

compositemodel/include/GoTools/compositemodel/ftPointSet.h

@@ -118,6 +118,15 @@ class ftSamplePoint
     /// Am I on sub surface boundary?
     bool isOnSubSurfaceBoundary() const
     { return ((at_boundary_ == 2) || (at_boundary_ == 1)); }
+    /// Am I on an inner boundary?
+  bool isOnInnerBoundary() const
+  { return at_boundary_ == 2; }
+
+  virtual bool isCorner() const
+  {
+    return false;
+  }
+
     /// Get number of neighbours.
     int getNmbNeighbour() const
     { return (int)next_.size();}