Changeset 70 in flair-src for trunk/lib/FlairSimulator/src/unexported

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

simu cameras

Location:

trunk/lib/FlairSimulator/src/unexported

Files:

• FollowMeCamera.h (modified) (2 diffs)
• Gui_impl.h (modified) (5 diffs)

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);
 };