Changeset 163 in flair-src


Ignore:
Timestamp:
Mar 6, 2017, 10:11:48 PM (5 years ago)
Author:
Bayard Gildas
Message:

Muffff

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/OpticalFlow/uav/src/DemoOpticalFlow.cpp

    r156 r163  
    6262  opticalFlow=new OpticalFlow(greyCameraImage,uav->GetVerticalCamera()->GetLayout()->NewRow(),"flux optique");
    6363  opticalFlowCompensated=new OpticalFlowCompensated(opticalFlow,uav->GetAhrs(),uav->GetVerticalCamera()->GetLayout()->NewRow(),"flux optique compense");
    64   opticalFlowSpeedRaw=new OpticalFlowSpeed(opticalFlowCompensated,"vitesse du flux optique");
     64  opticalFlowSpeedRaw=new OpticalFlowSpeed(opticalFlowCompensated,uav->GetAhrs(),uav->GetVerticalCamera()->GetLayout()->NewRow(),"vitesse du Flux Optique");
    6565  //opticalFlowSpeed=vitesse de déplacement en pixels par seconde (moyenne sur tous les points et division par le delta T)
    6666  cvmatrix* twoByOneOFS=new cvmatrix((const Thread*)this,2,1,floatType);
  • trunk/demos/OpticalFlow/uav/src/DemoOpticalFlow.h

    r155 r163  
    5656        flair::core::cvmatrix *opticalFlowReference;
    5757        flair::filter::Pid *u_x, *u_y;
    58         flair::filter::LowPassFilter* opticalFlowSpeed;
    59         flair::filter::LowPassFilter* opticalFlowAcceleration;
    6058        flair::filter::CvtColor* greyCameraImage;
    6159        flair::core::AhrsData *customReferenceOrientation;
     60        flair::core::cvmatrix *opticalFlowRealSpeed,*opticalFlowRealAcceleration;
    6261
    6362    private:
     
    6867    flair::gui::PushButton *startOpticalflow,*stopOpticalflow;
    6968    void StartOpticalFlow(void);
    70         flair::core::cvmatrix *opticalFlowRealSpeed,*opticalFlowRealAcceleration;
     69        flair::filter::LowPassFilter* opticalFlowSpeed;
     70        flair::filter::LowPassFilter* opticalFlowAcceleration;
    7171};
    7272
  • trunk/lib/FlairSimulator/src/Model_impl.cpp

    r158 r163  
    200200
    201201  states_mutex->GetMutex();
     202//self->state[0].Pos.x=0;
     203//self->state[0].Pos.y=0;
    202204  nodePosition = ToIrrlichtCoordinates(self->state[0].Pos);
    203205  nodeOrientation = ToIrrlichtOrientation(self->state[0].Quat);
Note: See TracChangeset for help on using the changeset viewer.