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

Timestamp:

04/12/18 16:52:46 (6 years ago)

Author:

Sanahuja Guillaume

Message:

change build directories for new architecture

Location:

trunk/demos/PidStandalone/simulator

Files:

• build_arm (deleted)
• build_armv5te (added)
• build_armv5te/bin (added)
• build_armv7a_neon (added)
• build_armv7a_neon/bin (added)
• build_core2_64 (added)
• build_core2_64/bin (added)
• build_core2_64/bin/setup_x4.xml (added)
• build_core2_64/bin/setup_x8.xml (added)
• build_core2_64/bin/simulator_x4.sh (added)
• build_core2_64/bin/simulator_x8.sh (added)
• build_x86_64 (deleted)
• src/main.cpp (modified) (3 diffs)

trunk/demos/PidStandalone/simulator/src/main.cpp

@@ -18 +18 @@
 #include <SimuImu.h>
 #ifdef GL
-#include <SimuCameraGL.h>
 #include <Parser.h>
 #include <SimuUsGL.h>
@@ -97 +96 @@
 #ifdef GL
     SimuUsGL* us_gl;
-
-    SimuCameraGL *cam_bas;
     Parser *gui;
 #endif
@@ -108 +105 @@
 
 #ifdef GL
-    gui=new Parser(simu,960,480,640,480,media_path,scene_file);
+    gui=new Parser(1024, 768, 1024, 768,media_path,scene_file);
 #endif
 
     if(type=="x4")
     {
-        drone=new X4(simu,name,0);
+        drone=new X4(name,0);
     }
     else
     {
-        drone=new X8(simu,name,0);
+        drone=new X8(name,0);
     }
-    imu=new SimuImu(drone,"imu",0);
+    imu=new SimuImu(drone,"imu",0,0);
 
 #ifdef GL
-    us_gl=new SimuUsGL(drone,"us",0);
-    cam_bas=new SimuCameraGL(drone,"bottom camera",320,240,640,0,0);
+    us_gl=new SimuUsGL(drone,"us",0,0);
 #endif