Mercurial > hg > wabletios

diff lump.h @ 4:79c7cf39a0a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed new mesh crash - static array bounds. Made home made mutex for wavetable access. Less clicks?
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Mon, 10 Dec 2012 13:00:03 +0000
parents c667dfe12d47
children 085d80989ba7
line wrap: on
line diff
--- a/lump.h	Fri Dec 07 19:20:57 2012 +0000
+++ b/lump.h	Mon Dec 10 13:00:03 2012 +0000
@@ -18,22 +18,23 @@
 private:
 	double mass, inverseMass;
 	bool grabbed, highlighted;
-    const int maxSprings;
-	
+
 	TwoVector velocity;
 	TwoVector accel;
 	double friction;
 
 public:
     bool constrained;
-	Spring** attachedSprings; // pointers to all attached springs
+	vector<Spring*> attachedSprings; // pointers to all attached springs
 	int numAttachedSprings;
     
     enum ConstrainMode {NOT_CONSTRAINED,CONSTRAIN_X,CONSTRAIN_Y,CONSTRAIN_XY};
     ConstrainMode constrainMode;
 	
     bool isInScanPath;
-
+    bool isScanPathEnd;
+    bool isScanPathStart;
+    
 	TwoVector position;
     TwoVector previousPosition;
 	double totalForceMag;