Changeset 236 in flair-src for trunk/demos/PidStandalone/simulator/src


Ignore:
Timestamp:
04/12/18 16:52:46 (4 years ago)
Author:
Sanahuja Guillaume
Message:

change build directories for new architecture

File:
1 edited

Legend:

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

    r105 r236  
    1818#include <SimuImu.h>
    1919#ifdef GL
    20 #include <SimuCameraGL.h>
    2120#include <Parser.h>
    2221#include <SimuUsGL.h>
     
    9796#ifdef GL
    9897    SimuUsGL* us_gl;
    99 
    100     SimuCameraGL *cam_bas;
    10198    Parser *gui;
    10299#endif
     
    108105
    109106#ifdef GL
    110     gui=new Parser(simu,960,480,640,480,media_path,scene_file);
     107    gui=new Parser(1024, 768, 1024, 768,media_path,scene_file);
    111108#endif
    112109
    113110    if(type=="x4")
    114111    {
    115         drone=new X4(simu,name,0);
     112        drone=new X4(name,0);
    116113    }
    117114    else
    118115    {
    119         drone=new X8(simu,name,0);
     116        drone=new X8(name,0);
    120117    }
    121     imu=new SimuImu(drone,"imu",0);
     118    imu=new SimuImu(drone,"imu",0,0);
    122119
    123120#ifdef GL
    124     us_gl=new SimuUsGL(drone,"us",0);
    125     cam_bas=new SimuCameraGL(drone,"bottom camera",320,240,640,0,0);
     121    us_gl=new SimuUsGL(drone,"us",0,0);
    126122#endif
    127123
Note: See TracChangeset for help on using the changeset viewer.