merging

(bzr r13922.1.13)

1 files changed, 15 insertions, 18 deletions

diff --git a/src/sp-mesh-array.h b/src/sp-mesh-array.h
index 19f8634f8..b078b221e 100644
--- a/src/sp-mesh-array.h
+++ b/src/sp-mesh-array.h
@@ -45,16 +45,14 @@
 // For color picking
 #include "sp-item.h"
 
-enum SPMeshSmooth {
-  SP_MESH_SMOOTH_NONE,
-  SP_MESH_SMOOTH_SMOOTH,
-  SP_MESH_SMOOTH_SMOOTH1,
-  SP_MESH_SMOOTH_SMOOTH2,
-  SP_MESH_SMOOTH_SMOOTH3,
-  SP_MESH_SMOOTH_SMOOTH4,
-  SP_MESH_SMOOTH_SMOOTH5,
-  SP_MESH_SMOOTH_SMOOTH6,
-  SP_MESH_SMOOTH_SMOOTH7
+enum SPMeshType {
+  SP_MESH_TYPE_COONS,
+  SP_MESH_TYPE_BICUBIC
+};
+
+enum SPMeshGeometry {
+  SP_MESH_GEOMETRY_NORMAL,
+  SP_MESH_GEOMETRY_CONICAL
 };
 
 enum NodeType {
@@ -137,14 +135,14 @@ public:
   void    setOpacity( unsigned int i, double o );
 };
 
-class SPMeshGradient;
+class SPMesh;
 
 // An array of mesh nodes.
 class SPMeshNodeArray {
 
 // Should be private
 public:
-  SPMeshGradient *mg;
+  SPMesh *mg;
   std::vector< std::vector< SPMeshNode* > > nodes;
 
 public:
@@ -159,22 +157,21 @@ public:
   friend class SPMeshPatchI;
 
   SPMeshNodeArray() { built = false; mg = NULL; drag_valid = false; };
-  SPMeshNodeArray( SPMeshGradient *mg );
+  SPMeshNodeArray( SPMesh *mg );
   SPMeshNodeArray( const SPMeshNodeArray& rhs );
   SPMeshNodeArray& operator=(const SPMeshNodeArray& rhs);
 
   ~SPMeshNodeArray() { clear(); };
   bool built;
 
-  void read( SPMeshGradient *mg );
-  void write( SPMeshGradient *mg );
-  void create( SPMeshGradient *mg, SPItem *item, Geom::OptRect bbox );
+  void read( SPMesh *mg );
+  void write( SPMesh *mg );
+  void create( SPMesh *mg, SPItem *item, Geom::OptRect bbox );
   void clear();
   void print();
 
   // Fill 'smooth' with a smoothed version by subdividing each patch.
-  void smooth( SPMeshNodeArray* smooth, SPMeshSmooth type);
-  void smooth2( SPMeshNodeArray* smooth, SPMeshSmooth type);
+  void bicubic( SPMeshNodeArray* smooth, SPMeshType type);
 
   // Get size of patch
   unsigned int patch_rows();