Changeset 123 in flair-src for trunk/demos/CircleFollower

Timestamp:

01/10/17 15:56:53 (7 years ago)

Author:

Sanahuja Guillaume

Message:

vision filter

Location:

trunk/demos/CircleFollower

Files:

• simulator/src/main.cpp (modified) (4 diffs)
• uav/CMakeLists.txt (modified) (1 diff)

trunk/demos/CircleFollower/simulator/src/main.cpp

@@ -18 +18 @@
 #include <SimuImu.h>
 #ifdef GL
-#include <SimuCameraGL.h>
 #include <Parser.h>
 #include <Man.h>
@@ -94 +93 @@
 #ifdef GL
     SimuUsGL* us_gl;
-
-    Camera *cam_av,*cam_bas;
     Parser *gui;
     Man *man;
@@ -106 +103 @@
 
 #ifdef GL
-    gui=new Parser(simu,960,480,640,480,media_path,scene_file);
+    gui=new Parser(simu,1024,768,1024,768,media_path,scene_file);
 #endif
 
@@ -119 +116 @@
 #ifdef GL
     us_gl=new SimuUsGL(drone,"us",0);
-    cam_bas=new SimuCameraGL(drone,"bottom camera",320,240,640,0,0);
-    cam_av=new SimuCameraGL(drone,"front camera",320,240,640,240,1);
+    
 
     man=new Man(simu,"target");

trunk/demos/CircleFollower/uav/CMakeLists.txt

@@ -5 +5 @@
 SET(FLAIR_USE_FILTER TRUE)
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
+SET(FLAIR_USE_VISION_FILTER TRUE)
 SET(FLAIR_USE_META TRUE)
 SET(FLAIR_USE_VRPN TRUE)