comparison scanpath.h @ 3:d346ddc50f70

Vectorised a few things. Fiddled with new mesh creator... not solved much.

 #ifndef _SCANPATHH
 #define _SCANPATHH
 #include "lump.h"
 #include "spring.h"
 #include <vector>
-
+struct Element{
+    Lump * eLump;
+    Spring * eSpring;
+    Element(Lump * aLump, Spring * aSpring){
+        eLump = aLump;
+        eSpring = aSpring;
+        
+    };
+    
+};
 
 class ScanPath{
 private:
 	int numElements;
     int maxElements;

     bool audioAccessing;
     bool updateAccessing;
 
 	//Spring ** springPath;
 	// springpath - an array of pointers to the springs in the path
-	// lump path - ditto should be same number 
-	Lump ** lumpPath;
-    Spring ** springPath;
-    
+	// lump path - ditto should be same number
+    vector<Element> pathElements;
+
     double * wavetableNew;
     double * wavetableOld;
     double * wavetableUpdate;
 
     double currentLength;

     scanModes scanMode;
     double restLength;
     
 	ScanPath();
 	~ScanPath();
-    
+    void init();
     
 	void inscribe(double ax,double ay);
 	void clear();
     
     void draw();

     double getNextSample();
     double getNextSample(double aPhasor);
     double getNextSampleCubic(double aPhasor);
     // redone stuff
     void initWavetables();
-    void addElement(Lump* aLump, Spring * aSpring);
+    void addElement(Lump* const aLump, Spring * const aSpring);
 
     void updateWavetables();
 
 };