comparison mesh.h @ 10:df1d4beb6994

Save working, but hacky. Midi? Algorave.

     MeshType meshType;
 
     // MEMBER FUNCTIONS
 	Mesh();
     Mesh(Json::Value& savedMesh); // contructor using saved mesh
-    
+    void setReasonableDefaults();
 	virtual ~Mesh();
 
     void draw();
     
 	// INTERACTIONS

     virtual void update();
     
 // save stuff
     Json::Value convertToJsonForSaving();
     Json::Value saveConnectionsAsJson();
+    // UTILS
+    TwoVector calculateCentre();
+	void connect(int springnum,int lumpnum);
+    void connect(int springnum,int lumpnum,int alumpnum2);
+	int getNearestLump(double ax,double ay);
 protected:
 
     int prevLump;
     
 	// specific mesh shapes override these:

     
 	void setLumpPositionsFromJson(Json::Value lumpPositions);
 	void makeConnectionsFromJson(Json::Value connections);
 	void makeScanPathFromJson(Json::Value scanPathElements);
     void constrainFromJson(Json::Value constrainedLumps);
-    // UTILS    
-    TwoVector calculateCentre();
-	void connect(int springnum,int lumpnum);
-    void connect(int springnum,int lumpnum,int alumpnum2);
-	int getNearestLump(double ax,double ay);	
+
 	
 };
 //---------------------------------------------------------
 class SpiderMesh : public Mesh{
 public: