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

Timestamp:

09/28/16 08:41:02 (7 years ago)

Author:

Sanahuja Guillaume

Message:

camera

File:

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

trunk/lib/FlairSimulator/src/FixedCamera.cpp

@@ -35 +35 @@
 namespace simulator {
 
-FixedCamera::FixedCamera(std::string name,core::Vector3D position,float inRotateSpeed,float inZoomSpeed):VisualizationCamera(name)  {
-  RotY = -90;
-  RotZ = 0;
+FixedCamera::FixedCamera(std::string name,core::Vector3D position,core::Vector3D lookat,float inRotateSpeed,float inZoomSpeed):VisualizationCamera(name)  {
   Rotating = false;
   rotateSpeed=inRotateSpeed;
   zoomSpeed=inZoomSpeed;
+
+  camera->bindTargetAndRotation(true);
   camera->setPosition(vector3df(ToIrrlichtCoordinates(position)));
+  camera->setTarget(vector3df(ToIrrlichtCoordinates(lookat)));
+  init=false;
+  rotation=camera->getRotation();
+  printf("%f %f %f\n",rotation.X,rotation.Y,rotation.Z);
   fov=camera->getFOV();
 }
@@ -57 +61 @@
 void FixedCamera::animateNode(ISceneNode *node, u32 timeMs) {
   ICameraSceneNode *camera = static_cast<ICameraSceneNode *>(node);
+  vector3df newRotation=rotation;
 
-  float nRotY = RotY;
-  float nRotZ = RotZ;
+if(init==false) {
+  rotation=camera->getRotation();
+  printf("%f %f %f\n",rotation.X,rotation.Y,rotation.Z);
+  init=true;
+}
+  float nRotY = 0;//rotation.Y;
+  float nRotZ = rotation.Z;
 
   if (LMouseKey == true) {
@@ -65 +75 @@
       RotateStart = MousePos;
       Rotating = true;
-      nRotY = RotY;
-      nRotZ = RotZ;
+      //nRotY = rotation.Y;
+      nRotZ = rotation.Z;
     } else {
-      nRotY += (RotateStart.Y - MousePos.Y) * rotateSpeed;
+      nRotY = (RotateStart.Y - MousePos.Y) * rotateSpeed;
       nRotZ += (RotateStart.X - MousePos.X) * rotateSpeed;
-      nRotY = sat(nRotY);
+      newRotation.rotateXZBy(-nRotY);
+      //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;
+    //rotation.Y += (RotateStart.Y - MousePos.Y) * rotateSpeed;
+    //rotation.Z += (RotateStart.X - MousePos.X) * rotateSpeed;
+    //rotation.Y = sat(rotation.Y);
+    //nRotY = rotation.Y;
+    nRotZ = rotation.Z;
     Rotating = false;
   }
@@ -91 +102 @@
   }
 
-  camera->setRotation(vector3df(0,nRotY,nRotZ));
-  camera->bindTargetAndRotation(true);
+
+
+  //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))));
+  //rotation=camera->getRotation();
+  //printf("%f %f %f\n",rotation.X,rotation.Y,rotation.Z);
+
   camera->setFOV(newFov);
 }