Diff: main.cpp

Revision:

3:b44ff6de81bd

Parent:

2:34157ebbf56b

Child:

4:f9d364f10335

--- a/main.cpp	Sat Mar 31 12:50:32 2012 +0000
+++ b/main.cpp	Mon Apr 02 05:33:44 2012 +0000
@@ -106,15 +106,15 @@
     // Tested modes:
     blobconf.clearConfig();
 //   blobconf.addOneElasticLoopContractCentral();
-//   blobconf.addOneElasticContourFollowing();
+ //  blobconf.addOneElasticContourFollowing();
 
-//  blobconf.addOneRigidLoopBouncing();
+  blobconf.addOneRigidLoopBouncing();
 //  blobconf.addOneRigidLoopBouncing();
 //  blobconf.addOneRigidLoopBouncing();
 //  blobconf.addOneRigidLoopBouncing();
 // blobconf.addOneRigidLoopBouncing();
 
- blobconf.addOneRigidLoopFollowing();
+// blobconf.addOneRigidLoopFollowing();
 
     // Important: first, set the initial position for all the blobs, this will be useful because
     // when changing modes we can use the previous central position...
@@ -125,8 +125,8 @@
     lsr.setConfigToRender(&blobconf);
 
     // Timer on the rendering function of the oneLoop object:
-    // timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL); // the address of the object, member function, and interval (in seconds)
-    timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL); // the address of the object, member function, and interval (in seconds)
+   //  timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThreadONEBLOBONLY, RENDER_INTERVAL); // the address of the object, member function, and interval (in seconds)
+   timerForRendering.attach(&lsr, &simpleLaserSensingRenderer::laserRenderThread, RENDER_INTERVAL); // the address of the object, member function, and interval (in seconds)
 
     // Timer for sending OSC data:
    // timerForSendingData.attach(&blobconf, &blobConfig::sendConfData, 0.025); // time in seconds (25ms -> 40Hz)