comparison button.mm @ 3:d346ddc50f70

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

 //  button on screen either side of mesh
 #include <iostream>
 #include "button.h"
 #include "globalUI.h"
 #include "globalForces.h"
+#include "scanpath.h"
+
 extern GlobalUI globalUI;
 extern GlobalForces globalForces;
+extern ScanPath scanPath;
 
 ControlButton::ControlButton(int abuttonId, int awidth,int aheight,int axpos,int aypos, string aname, Mesh *atheMeshPtr, ofColor acolor){
     width = awidth;
     height = aheight;
     xpos = axpos;

     }
     if (name == "gravity"){
         globalForces.gravityAmt = 4.0;
     }
     if(name == "scanmode"){
-        theMesh->scanPath->scanMode = theMesh->scanPath->SPEED;
+        scanPath.scanMode = scanPath.SPEED;
     }
         pressed = true;
 }
 
 void ControlButton::release(){

 	}	
     if (name == "gravity"){
         globalForces.gravityAmt = 0.0;
     }
     if(name == "scanmode"){
-        theMesh->scanPath->scanMode = theMesh->scanPath->DISPLACEMENT;
+        scanPath.scanMode = scanPath.DISPLACEMENT;
     }
     if (name == "freeAll"){
 		theMesh->constrain(.0,.0,Mesh::CONSTRAIN_EDGES);
 	}
     pressed = false;