Changeset 107 in flair-src for trunk

Timestamp:

11/03/16 11:11:54 (7 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk

Files:

• ReleaseNotes (modified) (1 diff)
• lib/FlairMeta/src/HdsX8.cpp (modified) (2 diffs)
• lib/FlairSimulator/src/FixedCamera.cpp (modified) (5 diffs)
• lib/FlairSimulator/src/FixedCamera.h (modified) (1 diff)
• tools/Controller/DualShock3/CMakeLists.txt (modified) (2 diffs)
• tools/Controller/Mavlink/CMakeLists.txt (modified) (2 diffs)
• tools/Dbt2csv/CMakeLists.txt (modified) (2 diffs)
• tools/FlairGCS/CMakeLists.txt (modified) (2 diffs)

trunk/ReleaseNotes

@@ -1 +1 @@
 * Actual Version:
 
+-----------------------------------------------------------
+* Tag 0.0.2:
+
+- src/SensorActuator: quaternion support for 3dmgx3
 - tool/FlairGCS: added rx rate display
 - demos/SimpleFleet: new demo, 2 UAVs coordination
-- srs/FlairSimulator: added fixed camera
+- src/FlairSimulator: added fixed camera
 
 -----------------------------------------------------------

trunk/lib/FlairMeta/src/HdsX8.cpp

@@ -62 +62 @@
           }
   */
-  //SetVerticalCamera(new Ps3Eye(parent, "camv", 0, 50));
+  SetVerticalCamera(new Ps3Eye(parent, "camv", 0, 50));
 }
 
@@ -70 +70 @@
   ((Gx3_25_ahrs *)GetAhrs())->Start();
   ((Srf08 *)GetUsRangeFinder())->Start();
-  //((Ps3Eye *)GetVerticalCamera())->Start();
+  ((Ps3Eye *)GetVerticalCamera())->Start();
   Uav::StartSensors();
 }

trunk/lib/FlairSimulator/src/FixedCamera.cpp

@@ -43 +43 @@
   camera->setPosition(vector3df(ToIrrlichtCoordinates(position)));
   camera->setTarget(vector3df(ToIrrlichtCoordinates(lookat)));
+  target=vector3df(ToIrrlichtCoordinates(lookat));
   init=false;
   rotation=camera->getRotation();
@@ -62 +63 @@
   ICameraSceneNode *camera = static_cast<ICameraSceneNode *>(node);
   vector3df newRotation=rotation;
+  vector3df newTarget=target;
 
 if(init==false) {
@@ -76 +78 @@
       Rotating = true;
       //nRotY = rotation.Y;
-      nRotZ = rotation.Z;
+      //nRotZ =0;// rotation.Z;
     } else {
       nRotY = (RotateStart.Y - MousePos.Y) * rotateSpeed;
-      nRotZ += (RotateStart.X - MousePos.X) * rotateSpeed;
+      nRotZ = (RotateStart.X - MousePos.X) * rotateSpeed;
       newRotation.rotateXZBy(-nRotY);
       //nRotY = sat(nRotY);
+
+      //newTarget.rotateXZBy(-nRotY,camera->getPosition());
+      newTarget.rotateXYBy( nRotZ,camera->getPosition());
+      camera->setTarget(newTarget);
     }
   } else if (Rotating) {
@@ -88 +94 @@
     //rotation.Y = sat(rotation.Y);
     //nRotY = rotation.Y;
-    nRotZ = rotation.Z;
+    //nRotZ = rotation.Z;
     Rotating = false;
+    target=camera->getTarget();
+    rotation=camera->getRotation();
+  printf("%f %f %f\n",rotation.X,rotation.Y,rotation.Z);
   }
 
@@ -102 +111 @@
   }
 
-
+//newTarget.rotateXZBy(-nRotY,camera->getPosition());
+//  newTarget.rotateXYBy( nRotZ,camera->getPosition());
 
   //camera->setRotation(vector3df(rotation.X,-180-nRotY,nRotZ));
   //camera->setRotation(vector3df(rotation.X,nRotY,0));
   //camera->bindTargetAndRotation(true);
-  camera->setRotation(rotation);
-  //camera->setTarget(vector3df(ToIrrlichtCoordinates(core::Vector3D(0,0,-2))));
+ // camera->setRotation(rotation);
+ // camera->setTarget(newTarget);
   //rotation=camera->getRotation();
   //printf("%f %f %f\n",rotation.X,rotation.Y,rotation.Z);

trunk/lib/FlairSimulator/src/FixedCamera.h

@@ -34 +34 @@
   float sat(float value);
   irr::core::position2df RotateStart;
-  irr::core::vector3df rotation;
+  irr::core::vector3df rotation,target;
   bool Rotating;
   float rotateSpeed;

trunk/tools/Controller/DualShock3/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(dualshock3)
 cmake_minimum_required(VERSION 2.8)
+include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
 
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
-
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 include(${FLAIR_USE_FILE})
 
@@ -31 +32 @@
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+
+else()
+warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+endif()

trunk/tools/Controller/Mavlink/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(MavPlanner)
 cmake_minimum_required(VERSION 2.8)
+include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
+
 include(${FLAIR_USE_FILE})
 
@@ -27 +29 @@
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+
+else()
+warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+endif()

trunk/tools/Dbt2csv/CMakeLists.txt

@@ -2 +2 @@
 cmake_minimum_required(VERSION 2.8)
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
 
 SET(PROJECT_SOURCE_FILES
@@ -47 +49 @@
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+
+else()
+warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+endif()

trunk/tools/FlairGCS/CMakeLists.txt

@@ -2 +2 @@
 cmake_minimum_required(VERSION 2.8)
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
 
 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
@@ -85 +87 @@
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+
+else()
+warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+endif()