Changeset 121 in flair-src for trunk/lib/FlairMeta


Ignore:
Timestamp:
12/22/16 17:32:58 (7 years ago)
Author:
Sanahuja Guillaume
Message:

modifs camera

Location:
trunk/lib/FlairMeta/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/lib/FlairMeta/src/Uav.cpp

    r15 r121  
    4646  uav_vrpn = NULL;
    4747  verticalCamera = NULL;
     48  horizontalCamera = NULL;
    4849  this->multiplex = multiplex;
    4950}
    … …  
    7677void Uav::SetVerticalCamera(const Camera *inVerticalCamera) {
    7778  verticalCamera = (Camera *)inVerticalCamera;
     79}
     80
     81void Uav::SetHorizontalCamera(const Camera *inHorizontalCamera) {
     82  horizontalCamera = (Camera *)inHorizontalCamera;
    7883}
    7984/*
    … …  
    189194Camera *Uav::GetVerticalCamera(void) const { return verticalCamera; }
    190195
     196Camera *Uav::GetHorizontalCamera(void) const { return horizontalCamera; }
     197
    191198} // end namespace meta
    192199} // end namespace flair

  • trunk/lib/FlairMeta/src/Uav.h

    r15 r121  
    7878  meta::MetaVrpnObject *GetVrpnObject(void) const;
    7979  sensor::Camera *GetVerticalCamera(void) const;
     80  sensor::Camera *GetHorizontalCamera(void) const;
    8081
    8182protected:
    … …  
    8687  void SetBatteryMonitor(const sensor::BatteryMonitor *battery);
    8788  void SetVerticalCamera(const sensor::Camera *verticalCamera);
     89  void SetHorizontalCamera(const sensor::Camera *verticalCamera);
    8890
    8991private:
    … …  
    9799  MetaVrpnObject *uav_vrpn;
    98100  sensor::BatteryMonitor *battery;
    99   sensor::Camera *verticalCamera;
     101  sensor::Camera *verticalCamera,*horizontalCamera;
    100102};
    101103} // end namespace meta
Note: See TracChangeset for help on using the changeset viewer.