Changeset 107 in flair-src for trunk/lib/FlairSimulator

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/lib/FlairSimulator/src

Files:

• FixedCamera.cpp (modified) (5 diffs)
• FixedCamera.h (modified) (1 diff)

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;