Browse Source

change vtd_pilot_if.

yuchuli 2 years ago
parent
commit
79387b88a4
2 changed files with 13 additions and 3 deletions
  1. 12 2
      src/driver/vtd_pilot_if/vtd_pilot.cpp
  2. 1 1
      src/driver/vtd_rdb/main.cpp

+ 12 - 2
src/driver/vtd_pilot_if/vtd_pilot.cpp

@@ -143,14 +143,24 @@ void vtd_pilot::ConvertToObjectArray(std::vector<iv::vtd::rdbdata> &xvectorrdbda
                     dimx = xobj.base.geo.dimX;
                     dimy = xobj.base.geo.dimY;
                     dimz = xobj.base.geo.dimZ;
+  //                  std::cout<<" dimx: "<<dimx<<" dimy: "<<dimy<<std::endl;
                     double xoff,yoff;
+                    std::cout<<" obj hedad: "<<xobj.base.pos.h<<" our head: "<<mfHeading<<" rel heading: "<<fobjheading<<std::endl;
                     for(xoff = (dimx*(-0.5));xoff<=(dimx*0.5);xoff=xoff+0.2)
                     {
                         for(yoff = (dimy*(-0.5));yoff<=(dimy*0.5);yoff = yoff+0.2)
                         {
                             double reloffx,reloffy;
+                            if(fabs(fobjheading) < 0.1)
+                            {
+                                for(int m=0;m<1000;m++)
+                                std::cout<<" hello;"<<std::endl;
+
+                            }
+    //                        fobjheading = 0;
+    //                        std::cout<<"xoff: "<<xoff<<" yoff: "<<yoff<<std::endl;
                             reloffx = xoff*cos(fobjheading) - yoff*sin(fobjheading) + relx;
-                            reloffy = yoff*sin(fobjheading) + yoff*sin(fobjheading) + rely;
+                            reloffy = xoff*sin(fobjheading) + yoff*cos(fobjheading) + rely;
                             iv::fusion::NomalXYZ *pnormal = pobject->add_nomal_centroid();
                             pnormal->set_nomal_x((reloffy)*(-1.0));
                             pnormal->set_nomal_y(reloffx);
@@ -160,7 +170,7 @@ void vtd_pilot::ConvertToObjectArray(std::vector<iv::vtd::rdbdata> &xvectorrdbda
                     pobject->set_allocated_dimensions(pdim);
                     pobject->set_velocity_linear_x(sqrt(pow(relvx,2)+pow(relvy,2)));
 
-                    std::cout<<" x: "<<relx<<" y: "<<rely<<std::endl;
+//                    std::cout<<" x: "<<relx<<" y: "<<rely<<std::endl;
                 }
 
 

+ 1 - 1
src/driver/vtd_rdb/main.cpp

@@ -1,4 +1,4 @@
-#include <QCoreApplication>
+ #include <QCoreApplication>
 
 #include "rdbconn.h"
 #include <iostream>