Changeset 123 in flair-src for trunk/demos


Ignore:
Timestamp:
Jan 10, 2017, 3:56:53 PM (5 years ago)
Author:
Sanahuja Guillaume
Message:

vision filter

Location:
trunk/demos
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/CircleFollower/simulator/src/main.cpp

    r23 r123  
    1818#include <SimuImu.h>
    1919#ifdef GL
    20 #include <SimuCameraGL.h>
    2120#include <Parser.h>
    2221#include <Man.h>
     
    9493#ifdef GL
    9594    SimuUsGL* us_gl;
    96 
    97     Camera *cam_av,*cam_bas;
    9895    Parser *gui;
    9996    Man *man;
     
    106103
    107104#ifdef GL
    108     gui=new Parser(simu,960,480,640,480,media_path,scene_file);
     105    gui=new Parser(simu,1024,768,1024,768,media_path,scene_file);
    109106#endif
    110107
     
    119116#ifdef GL
    120117    us_gl=new SimuUsGL(drone,"us",0);
    121     cam_bas=new SimuCameraGL(drone,"bottom camera",320,240,640,0,0);
    122     cam_av=new SimuCameraGL(drone,"front camera",320,240,640,240,1);
     118   
    123119
    124120    man=new Man(simu,"target");
  • trunk/demos/CircleFollower/uav/CMakeLists.txt

    r42 r123  
    55SET(FLAIR_USE_FILTER TRUE)
    66SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    78SET(FLAIR_USE_META TRUE)
    89SET(FLAIR_USE_VRPN TRUE)
  • trunk/demos/Gps/simulator/src/main.cpp

    r89 r123  
    1919#include <SimuGps.h>
    2020#ifdef GL
    21 #include <SimuCameraGL.h>
    2221#include <Parser.h>
    2322#include <Man.h>
     
    9695#ifdef GL
    9796    SimuUsGL *us_gl;
    98 
    99     Camera *cam_av,*cam_bas;
    10097    Parser *gui;
    10198    Man *man;
     
    108105
    109106#ifdef GL
    110     gui=new Parser(simu,960,480,640,480,media_path,scene_file);
     107    gui=new Parser(simu,1024,768,1024,768,media_path,scene_file);
    111108#endif
    112109
     
    121118#ifdef GL
    122119    us_gl=new SimuUsGL(drone,"us",0);
    123     cam_bas=new SimuCameraGL(drone,"bottom camera",320,240,640,0,0);
    124     cam_av=new SimuCameraGL(drone,"front camera",320,240,640,240,1);
    125 
    126120    man=new Man(simu,"target");
    127121#endif
  • trunk/demos/Gps/uav/CMakeLists.txt

    r122 r123  
    55SET(FLAIR_USE_FILTER TRUE)
    66SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    78SET(FLAIR_USE_META TRUE)
    89SET(FLAIR_USE_GPS TRUE)
     10
    911
    1012include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
  • trunk/demos/OpticalFlow/simulator/CMakeLists.txt

    r122 r123  
    55SET(FLAIR_USE_SIMULATOR TRUE)
    66SET(FLAIR_USE_SIMULATOR_GL TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    78
    89include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
  • trunk/demos/OpticalFlow/uav/CMakeLists.txt

    r122 r123  
    44SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    55SET(FLAIR_USE_FILTER TRUE)
    6 #SET(FLAIR_USE_VISION_FILTER TRUE)
    76SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    88SET(FLAIR_USE_META TRUE)
    99
  • trunk/demos/OpticalFlow/uav/src/main.cpp

    r122 r123  
    1818#include <tclap/CmdLine.h>
    1919#include <TargetEthController.h>
    20 #include <init.h>
     20#include <VisionFilter.h>
    2121
    2222using namespace TCLAP;
     
    4141    parseOptions(argc,argv);
    4242
     43                if(!InitVisionFilter("file="+dsp_file)) {
     44                        exit(1);
     45                }
     46               
    4347    FrameworkManager *manager;
    4448    manager= new FrameworkManager(name);
     
    4650    manager->SetupUserInterface(xml_file);
    4751    manager->SetupLogger(log_path);
    48     SetupDSP(dsp_file);
    4952
    5053    Uav* drone=CreateUav(name,uav_type);
     
    5760    delete manager;
    5861
    59     CloseDSP();
     62    CloseVisionFilter();
    6063}
    6164
  • trunk/demos/SimpleFleet/uav/CMakeLists.txt

    r42 r123  
    55SET(FLAIR_USE_FILTER TRUE)
    66SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    78SET(FLAIR_USE_META TRUE)
    89SET(FLAIR_USE_VRPN TRUE)
  • trunk/demos/Skeletons/CustomReferenceAngles/CMakeLists.txt

    r122 r123  
    55SET(FLAIR_USE_FILTER TRUE)
    66SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    78SET(FLAIR_USE_META TRUE)
    89
  • trunk/demos/Skeletons/CustomTorques/CMakeLists.txt

    r122 r123  
    55SET(FLAIR_USE_FILTER TRUE)
    66SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_VISION_FILTER TRUE)
    78SET(FLAIR_USE_META TRUE)
    89
Note: See TracChangeset for help on using the changeset viewer.