Changeset 70 in flair-src

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

simu cameras

Location:

trunk/lib/FlairSimulator/src

Files:

• FixedCamera.cpp (modified) (4 diffs)
• FixedCamera.h (modified) (2 diffs)
• FollowMeCamera.cpp (modified) (4 diffs)
• Gui.h (modified) (1 diff)
• Gui_impl.cpp (modified) (9 diffs)
• Man.cpp (modified) (1 diff)
• Model.cpp (modified) (1 diff)
• Model_impl.cpp (modified) (1 diff)
• VisualizationCamera.cpp (modified) (4 diffs)
• VisualizationCamera.h (modified) (4 diffs)
• unexported/FollowMeCamera.h (modified) (2 diffs)
• unexported/Gui_impl.h (modified) (5 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);
 }
 

trunk/lib/FlairSimulator/src/FixedCamera.h

@@ -26 +26 @@
 class FixedCamera : public VisualizationCamera {
 public:
-  FixedCamera(core::Vector3D position,float rotateSpeed = -500.0f, float zoomSpeed = 4.0f);
+  FixedCamera(std::string name,core::Vector3D position,float rotateSpeed = -500.0f, float zoomSpeed = .1f);
   ~FixedCamera();
 
@@ -32 +32 @@
 
 private:
+  float sat(float value);
   irr::core::position2df RotateStart;
   bool Rotating;
+  float rotateSpeed;
+  float zoomSpeed;
   float RotY, RotZ;
+  float fov;
 };
 

trunk/lib/FlairSimulator/src/FollowMeCamera.cpp

@@ -34 +34 @@
 namespace simulator {
 
-FollowMeCamera::FollowMeCamera(const ISceneNode *parent, float rotateSpeed,
-                             float zoomSpeed):VisualizationCamera(rotateSpeed,zoomSpeed)  {
+FollowMeCamera::FollowMeCamera(const ISceneNode *parent, std::string name,float inRotateSpeed,
+                             float inZoomSpeed):VisualizationCamera(name)  {
   this->parent = parent;
+  rotateSpeed=inRotateSpeed;
+  zoomSpeed=inZoomSpeed;
   RotY = 20;
   RotZ = 0;
@@ -44 +46 @@
 FollowMeCamera::~FollowMeCamera() {}
 
-void FollowMeCamera::setPositionOffset(vector3df newpos) { pos_offset = newpos; }
+void FollowMeCamera::setPositionOffset(vector3df newpos) {
+  pos_offset = ToIrrlichtCoordinates(newpos);
+}
 
 void FollowMeCamera::setTargetOffset(vector3df newpos) {
-  target_offset = newpos;
+  target_offset = ToIrrlichtCoordinates(newpos);
 }
 
@@ -59 +63 @@
 
 void FollowMeCamera::animateNode(ISceneNode *node, u32 timeMs) {
-  vector3df pos;
 
   float nRotY = RotY;
@@ -84 +87 @@
   }
 
-  pos.X = -currentZoom;
+  float newCurrentZoom= 100+currentZoom * zoomSpeed;
+  if (newCurrentZoom <= 0) {
+    newCurrentZoom =zoomSpeed;
+    currentZoom =1-100/zoomSpeed;
+  }
+
+  vector3df pos;
+  pos.X = -newCurrentZoom;
   pos.Y = 0;
   pos.Z = 0;

trunk/lib/FlairSimulator/src/Gui.h

@@ -52 +52 @@
 class Gui : public core::Object {
   friend class ::Simulator_impl;
+  friend class VisualizationCamera;
 
 public:

trunk/lib/FlairSimulator/src/Gui_impl.cpp

@@ -98 +98 @@
   smgr->setAmbientLight(video::SColorf(1, 1, 1));
 
-/*
-   // camera
-  camera = smgr->addCameraSceneNode();
-
-  camera->setAspectRatio(
-      (float)scene_width / (float)scene_height); // on force a cause du view port
-
-  camera->setUpVector(vector3df(0, 0, 1));
-
-  FixedCamera* animator = new FixedCamera(vector3df(1,1,1));
-  camera->addAnimator(animator);
-
-  camera->setFarValue(8000);*/
   /*
 env = device->getGUIEnvironment();
@@ -146 +133 @@
   delete receiver;
   // printf("del Gui_impl ok\n");
+}
+
+void Gui_impl::AddVisualizationCamera(VisualizationCamera* camera) {
+  cameras.push_back(camera);
 }
 
@@ -187 +178 @@
   int cam_id = 0;
 
-  receiver->SetModel(models.at(cam_id));
+  receiver->SetModel(models.at(0));
 
   for (size_t i = 0; i < models.size(); i++) {
@@ -213 +204 @@
   }
 
-  setWindowCaption(models.at(0), 0);
+  setWindowCaption(0, 0);
 
   while (device->run()) {
@@ -247 +238 @@
 
     // vue poursuite
-    smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
+    //smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
+    smgr->setActiveCamera(cameras.at(cam_id)->getCameraSceneNode());
     driver->setViewPort(core::rect<s32>(0, 0, scene_width, scene_height));
     smgr->drawAll(); // commente voir plus bas
@@ -279 +271 @@
     // mais a priori souci avec models.at(i)->pimpl_->CheckCollision();
     // (setelipsoid?)
-    smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
+    //smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
+    smgr->setActiveCamera(cameras.at(cam_id)->getCameraSceneNode());
     driver->setViewPort(core::rect<s32>(0, 0, scene_width, scene_height));
     smgr->drawAll();
@@ -286 +279 @@
 
     int fps = driver->getFPS();
-    // printf("fps %i\n",fps);
+
     if (lastFPS != fps) {
-      setWindowCaption(models.at(cam_id), fps);
+      setWindowCaption(cam_id, fps);
       lastFPS = fps;
     }
@@ -294 +287 @@
     if (receiver->IsKeyDown(KEY_PRIOR)) {
       cam_id++;
-      if (cam_id >= (int)models.size()) cam_id = 0;
-      receiver->SetModel(models.at(cam_id));
-      setWindowCaption(models.at(cam_id), fps);
+      if (cam_id >= (int)cameras.size()) cam_id = 0;
+      receiver->SetModel(getModelFromVisualizationCamera(models,cameras.at(cam_id)));
+      setWindowCaption(cam_id, fps);
     }
     if (receiver->IsKeyDown(KEY_NEXT)) {
       cam_id--;
-      if (cam_id < 0) cam_id = models.size() - 1;
-      receiver->SetModel(models.at(cam_id));
-      setWindowCaption(models.at(cam_id), fps);
+      if (cam_id < 0) cam_id = cameras.size() - 1;
+      receiver->SetModel(getModelFromVisualizationCamera(models,cameras.at(cam_id)));
+      setWindowCaption(cam_id, fps);
     }
 
@@ -354 +347 @@
 }
 
-void Gui_impl::setWindowCaption(Object *object, int fps) {
+Model *Gui_impl::getModelFromVisualizationCamera(std::vector<Model *> models,VisualizationCamera *camera) {
+  for (size_t i = 0; i < models.size(); i++) {
+      if(models.at(i)->getFollowMeCamera()==camera) return models.at(i);
+  }
+  return NULL;
+}
+
+void Gui_impl::setWindowCaption(int cam_id, int fps) {
   std::ostringstream text;
-  text << "Cam: " << object->ObjectName().c_str()
-       << ", Kbd: " << object->ObjectName().c_str() << ", FPS: " << fps;
+
+  text << "Cam: " << cameras.at(cam_id)->getName().c_str()
+     << ", FPS: " << fps;
 
   device->setWindowCaption(stringw(text.str().c_str()).c_str());

trunk/lib/FlairSimulator/src/Man.cpp

@@ -47 +47 @@
   node->getMaterial(0).Lighting = false;
 
-  getFollowMeCamera()->setPositionOffset(vector3df(0, 0, 100));
-  getFollowMeCamera()->setTargetOffset(vector3df(0, 0, 100));
+  getFollowMeCamera()->setPositionOffset(vector3df(0, 0, -1));
+  getFollowMeCamera()->setTargetOffset(vector3df(0, 0, -1));
 
   setTriangleSelector(

trunk/lib/FlairSimulator/src/Model.cpp

@@ -19 +19 @@
 #include "Simulator.h"
 #include "Simulator_impl.h"
-#include "FollowMeCamera.h"
 #include <DoubleSpinBox.h>
 
 #ifdef GL
+#include "FollowMeCamera.h"
 #include "Gui.h"
 #include <ICameraSceneNode.h>

trunk/lib/FlairSimulator/src/Model_impl.cpp

@@ -83 +83 @@
 
   // camera
-  camera = new FollowMeCamera(this);
+  camera = new FollowMeCamera(this,name);
 
   position_init = false;

trunk/lib/FlairSimulator/src/VisualizationCamera.cpp

@@ -21 +21 @@
 #include "Model_impl.h"
 #include "Gui.h"
+#include "Gui_impl.h"
 #include <ICursorControl.h>
 #include <ICameraSceneNode.h>
@@ -34 +35 @@
 namespace simulator {
 
-VisualizationCamera::VisualizationCamera(float inRotateSpeed,float inZoomSpeed) {
-  zoomSpeed = inZoomSpeed;
-  rotateSpeed = inRotateSpeed;
-  currentZoom = 100;
+VisualizationCamera::VisualizationCamera(std::string inName) {
+  name=inName;
+  currentZoom = 0;
   LMouseKey = false;
 
@@ -46 +46 @@
   camera->addAnimator(this);
   camera->setFarValue(8000);
+
+  getGui()->pimpl_->AddVisualizationCamera(this);
 }
 
 VisualizationCamera::~VisualizationCamera() {}
+
+std::string VisualizationCamera::getName(void) {
+  return name;
+}
 
 ICameraSceneNode *VisualizationCamera::getCameraSceneNode(void) {
@@ -66 +72 @@
 
   case EMIE_MOUSE_WHEEL:
-    currentZoom -= event.MouseInput.Wheel * zoomSpeed;
-    if (currentZoom <= 0)
-      currentZoom = zoomSpeed;
+    currentZoom -= event.MouseInput.Wheel;
     break;
   case EMIE_LMOUSE_PRESSED_DOWN:

trunk/lib/FlairSimulator/src/VisualizationCamera.h

@@ -21 +21 @@
 #include <position2d.h>
 #include <Vector3D.h>
+#include <string>
 
 namespace irr {
@@ -33 +34 @@
 class VisualizationCamera : private irr::scene::ISceneNodeAnimator {
 public:
-  VisualizationCamera(float rotateSpeed = -500.0f, float zoomSpeed = 4.0f);
+  VisualizationCamera(std::string name);
   ~VisualizationCamera();
 
@@ -40 +41 @@
   virtual bool OnEvent(const irr::SEvent& event);
   irr::scene::ICameraSceneNode *getCameraSceneNode(void);
+  std::string getName(void);
 
 private:
@@ -48 +50 @@
   irr::scene::ICameraSceneNode *camera;
   irr::core::position2df MousePos;
-  float rotateSpeed;
-  float zoomSpeed;
   float currentZoom;
+  std::string name;
 };
 

trunk/lib/FlairSimulator/src/unexported/FollowMeCamera.h

@@ -26 +26 @@
 class FollowMeCamera : public VisualizationCamera {
 public:
-  FollowMeCamera(const irr::scene::ISceneNode *parent,
+  FollowMeCamera(const irr::scene::ISceneNode *parent,std::string name,
                 float rotateSpeed = -500.0f, float zoomSpeed = 4.0f);
   ~FollowMeCamera();
@@ -41 +41 @@
   float RotY, RotZ;
   float sat(float value);
+  float rotateSpeed;
+  float zoomSpeed;
 };
 

trunk/lib/FlairSimulator/src/unexported/Gui_impl.h

@@ -30 +30 @@
 class IMeshSceneNode;
 class ITriangleSelector;
-//class ICameraSceneNode;
 }
 namespace video {
@@ -49 +48 @@
 class GenericObject;
 class Gui;
-class FixedCamera;
+class VisualizationCamera;
 }
 }
@@ -61 +60 @@
            irr::video::E_DRIVER_TYPE driver_type = irr::video::EDT_OPENGL);
   ~Gui_impl();
-  void RunGui(std::vector<flair::simulator::Model *> modeles,
+  void RunGui(std::vector<flair::simulator::Model *> models,
               std::vector<flair::simulator::GenericObject *> objects);
   void setMesh(std::string file,
@@ -74 +73 @@
   irr::scene::ISceneManager *smgr;
   int scene_width, scene_height;
+  void AddVisualizationCamera(flair::simulator::VisualizationCamera* camera);
 
 private:
@@ -80 +80 @@
   irr::gui::IGUIFont *font;
   irr::gui::IGUIEnvironment *env;
-  void setWindowCaption(flair::core::Object *object, int fps);
+  void setWindowCaption(int cam_id, int fps);
   void takeScreenshot(void);
   hdfile_t *dbtFile_r, *dbtFile_w;
   size_t dbtSize(std::vector<flair::simulator::Model *> modeles);
   char *dbtbuf;
-  flair::simulator::FixedCamera *fixedCamera;
   flair::simulator::Gui *self;
-  //irr::scene::ICameraSceneNode * camera;
+  std::vector<flair::simulator::VisualizationCamera *> cameras;
+  flair::simulator::Model *getModelFromVisualizationCamera(std::vector<flair::simulator::Model *> models,flair::simulator::VisualizationCamera *camera);
 };