Changeset 70 in flair-src for trunk/lib/FlairSimulator/src/FixedCamera.cpp

Timestamp:

Sep 6, 2016, 5:49:32 PM (9 years ago)

Author:

Sanahuja Guillaume

Message:

simu cameras

File:

• trunk/lib/FlairSimulator/src/FixedCamera.cpp (modified) (4 diffs)

trunk/lib/FlairSimulator/src/FixedCamera.cpp

@@ -25 +25 @@
 #include <IrrlichtDevice.h>
 #include <ISceneManager.h>
+#include <Euler.h>
 
 using namespace irr;
@@ -34 +35 @@
 namespace simulator {
 
-FixedCamera::FixedCamera(core::Vector3D position,float rotateSpeed,float zoomSpeed):VisualizationCamera(rotateSpeed,zoomSpeed)  {
-  RotY = 020;
+FixedCamera::FixedCamera(std::string name,core::Vector3D position,float inRotateSpeed,float inZoomSpeed):VisualizationCamera(name)  {
+  RotY = -90;
   RotZ = 0;
   Rotating = false;
-
-   // camera
-  camera->setPosition(vector3df(position.x,position.y,position.z));
+  rotateSpeed=inRotateSpeed;
+  zoomSpeed=inZoomSpeed;
+  camera->setPosition(vector3df(ToIrrlichtCoordinates(position)));
+  fov=camera->getFOV();
 }
 
 FixedCamera::~FixedCamera() {}
+
+float FixedCamera::sat(float value) {
+  if (value >= -1)
+    value = -1;
+  if (value <= -179)
+    value = -179;
+  return value;
+}
 
 void FixedCamera::animateNode(ISceneNode *node, u32 timeMs) {
@@ -60 +70 @@
       nRotY += (RotateStart.Y - MousePos.Y) * rotateSpeed;
       nRotZ += (RotateStart.X - MousePos.X) * rotateSpeed;
+      nRotY = sat(nRotY);
     }
   } else if (Rotating) {
     RotY += (RotateStart.Y - MousePos.Y) * rotateSpeed;
     RotZ += (RotateStart.X - MousePos.X) * rotateSpeed;
+    RotY = sat(RotY);
     nRotY = RotY;
     nRotZ = RotZ;
@@ -69 +81 @@
   }
 
+  float newFov=fov+currentZoom*zoomSpeed;
+  if(newFov>fov) {
+    newFov=fov;
+    currentZoom=0;
+  }
+  if(newFov<0) {
+    newFov=zoomSpeed;
+    currentZoom=1-fov/zoomSpeed;
+  }
+
   camera->setRotation(vector3df(0,nRotY,nRotZ));
   camera->bindTargetAndRotation(true);
+  camera->setFOV(newFov);
 }