diff mesh.h @ 8:4ea605899aca

Hide controls for supernatant.

--- a/mesh.h	Wed Feb 06 13:48:49 2013 +0000
+++ b/mesh.h	Tue May 14 10:34:32 2013 +0100
@@ -14,11 +14,12 @@
 #include "lump.h"
 #include "scanpath.h"
 #include "globalForces.h"
-
+#include "json.h"
 
 class Mesh{
 public:
-
+    int dim1, dim2;
+    
     bool radial; // tells us if mesh is radial or not
 	// toggles
 	bool syrup;
@@ -43,7 +44,8 @@
 	enum constrainMode { CONSTRAIN_CORNERS, CONSTRAIN_EDGES,CONSTRAIN_EDGES_XY, CONSTRAIN_SINGLE_POINT, CONSTRAIN_SINGLE_POINT_X, CONSTRAIN_SINGLE_POINT_Y, CONSTRAIN_GRAB_REGION,CONSTRAIN_GRAB_REGION_X,CONSTRAIN_GRAB_REGION_Y, CONSTRAIN_ALL_X, CONSTRAIN_ALL_Y};
 	double GRAB_RANGE;
 	 
-	
+	enum MeshType {SQUARE_CROSS_MESH, SPIDER_MESH, SPIDER_CROSS_MESH, DROPLET_MESH, LINE_MESH, TRIANGLE_MESH, GROUNDED_LINE_MESH, HOLED_SPIDER_MESH};
+    MeshType meshType;
 
     // MEMBER FUNCTIONS
 	Mesh();
@@ -107,11 +109,17 @@
 	void clearScanPath();
     void disconnectDraw(); // enables you to draw scanpths anywhere
 	int inscribeScanPath(double ax, double ay);
+    
+    // inscribeScanPathFromJson
+    
     // called by scanpath.update wavetables
 	double getNextSample();
     
     virtual void update();
-
+    
+// save stuff
+    Json::Value convertToJsonForSaving();
+    
 protected:
 
     int prevLump;