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

Timestamp:

04/12/17 13:59:38 (7 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

File:

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

trunk/lib/FlairSimulator/src/FixedCamera.cpp

@@ -35 +35 @@
 namespace simulator {
 
-FixedCamera::FixedCamera(std::string name,core::Vector3D position,core::Vector3D lookat,float inRotateSpeed,float inZoomSpeed):VisualizationCamera(name)  {
+FixedCamera::FixedCamera(std::string name,core::Vector3Df position,core::Vector3Df lookat,float inRotateSpeed,float inZoomSpeed):VisualizationCamera(name)  {
   Rotating = false;
   rotateSpeed=inRotateSpeed;
@@ -62 +62 @@
 
       //normal between target and up vector
-      cameraAxeY=target.crossProduct(irr::core::vector3df(0,0,1));
+      cameraAxeY=target.crossProduct(vector3df(0,0,1));
       cameraAxeY.normalize();
 
@@ -81 +81 @@
 
       //check angle
-      irr::core::vector3df newTarget(q3.X,q3.Y,q3.Z);
-      float angle=acos(newTarget.dotProduct(irr::core::vector3df(0,0,1))/newTarget.getLength());
-      irr::core::vector3df cross = newTarget.crossProduct(irr::core::vector3df(0,0,1));
+      vector3df newTarget(q3.X,q3.Y,q3.Z);
+      float angle=acos(newTarget.dotProduct(vector3df(0,0,1))/newTarget.getLength());
+      vector3df cross = newTarget.crossProduct(vector3df(0,0,1));
       if (cross.dotProduct(cameraAxeY) > 0) {
         newTarget += camera->getAbsolutePosition();