Changeset 69 in flair-src for trunk

Timestamp:

Sep 2, 2016, 5:48:40 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

refonte camera simu

Location:

trunk/lib/FlairSimulator/src

Files:

• FixedCamera.cpp (added)
• FixedCamera.h (added)
• FollowMeCamera.cpp (moved) (moved from trunk/lib/FlairSimulator/src/AnimPoursuite.cpp ) (5 diffs)
• GenericObject.cpp (modified) (1 diff)
• Gui.cpp (modified) (2 diffs)
• Gui.h (modified) (1 diff)
• Gui_impl.cpp (modified) (14 diffs)
• Man.cpp (modified) (2 diffs)
• Model.cpp (modified) (3 diffs)
• Model.h (modified) (4 diffs)
• Model_impl.cpp (modified) (2 diffs)
• Parser.cpp (modified) (1 diff)
• VisualizationCamera.cpp (added)
• VisualizationCamera.h (added)
• X4.h (modified) (1 diff)
• X8.h (modified) (1 diff)
• unexported/FollowMeCamera.h (moved) (moved from trunk/lib/FlairSimulator/src/unexported/AnimPoursuite.h ) (3 diffs)
• unexported/GenericObject.h (modified) (1 diff)
• unexported/Gui_impl.h (modified) (3 diffs)
• unexported/Model_impl.h (modified) (3 diffs)

trunk/lib/FlairSimulator/src/FollowMeCamera.cpp

@@ -4 +4 @@
 // %flair:license}
 //  created:    2012/08/21
-//  filename:   AnimPoursuite.cpp
+//  filename:   FollowMeCamera.cpp
 //
 //  author:     Guillaume Sanahuja
@@ -16 +16 @@
 #ifdef GL
 
-#include "AnimPoursuite.h"
+#include "FollowMeCamera.h"
 #include "Simulator.h"
 #include "Model.h"
 #include "Model_impl.h"
+#include "Gui.h"
 #include <ICursorControl.h>
 #include <ICameraSceneNode.h>
+#include <IrrlichtDevice.h>
+#include <ISceneManager.h>
 
 using namespace irr;
@@ -31 +34 @@
 namespace simulator {
 
-AnimPoursuite::AnimPoursuite(const ISceneNode *parent, float rotateSpeed,
-                             float zoomSpeed) {
+FollowMeCamera::FollowMeCamera(const ISceneNode *parent, float rotateSpeed,
+                             float zoomSpeed):VisualizationCamera(rotateSpeed,zoomSpeed)  {
   this->parent = parent;
-  this->zoomSpeed = zoomSpeed;
-  this->rotateSpeed = rotateSpeed;
-  currentZoom = 100;
   RotY = 20;
   RotZ = 0;
   Rotating = false;
-  LMouseKey = false;
 }
 
-AnimPoursuite::~AnimPoursuite() {}
+FollowMeCamera::~FollowMeCamera() {}
 
-void AnimPoursuite::setPositionOffset(vector3df newpos) { pos_offset = newpos; }
+void FollowMeCamera::setPositionOffset(vector3df newpos) { pos_offset = newpos; }
 
-void AnimPoursuite::setTargetOffset(vector3df newpos) {
+void FollowMeCamera::setTargetOffset(vector3df newpos) {
   target_offset = newpos;
 }
 
-float AnimPoursuite::sat(float value) {
+float FollowMeCamera::sat(float value) {
   if (value > 89)
     value = 89;
@@ -59 +58 @@
 }
 
-void AnimPoursuite::animateNode(ISceneNode *node, u32 timeMs) {
-  ICameraSceneNode *camera = static_cast<ICameraSceneNode *>(node);
+void FollowMeCamera::animateNode(ISceneNode *node, u32 timeMs) {
   vector3df pos;
 
@@ -97 +95 @@
 }
 
-ISceneNodeAnimator *AnimPoursuite::createClone(ISceneNode *node,
-                                               ISceneManager *newManager) {
-  return NULL;
-}
-
-bool AnimPoursuite::MouseMoved(const SEvent &event,
-                               irr::core::position2df MousePos) {
-  if (event.EventType != EET_MOUSE_INPUT_EVENT)
-    return false;
-
-  switch (event.MouseInput.Event) {
-
-  case EMIE_MOUSE_WHEEL:
-    currentZoom -= event.MouseInput.Wheel * zoomSpeed;
-    if (currentZoom <= 0)
-      currentZoom = zoomSpeed;
-    break;
-  case EMIE_LMOUSE_PRESSED_DOWN:
-    LMouseKey = true;
-    break;
-  case EMIE_LMOUSE_LEFT_UP:
-    LMouseKey = false;
-    break;
-  case EMIE_MOUSE_MOVED:
-    this->MousePos = MousePos;
-    break;
-  default:
-    return false;
-    break;
-  }
-
-  return true;
-}
 
 } // end namespace simulator

trunk/lib/FlairSimulator/src/GenericObject.cpp

@@ -19 +19 @@
 #include "Simulator_impl.h"
 
-#include "ConditionVariable.h"
 #include "Quaternion.h"
-#include "Gui.h"
-#include "Gui_impl.h"
-#include <IMesh.h>
 #include <ISceneManager.h>
-#include <IMetaTriangleSelector.h>
-#include <IVideoDriver.h>
-#include "AnimPoursuite.h"
+
 using namespace irr;
 using namespace video;
 using namespace scene;
 using namespace core;
-using namespace io;
 
 using namespace flair::core;

trunk/lib/FlairSimulator/src/Gui.cpp

@@ -19 +19 @@
 #include "Gui_impl.h"
 #include "Simulator.h"
-#include "Simulator_impl.h"
 #include "Model.h"
-#include "Model_impl.h"
-#include "AnimPoursuite.h"
-#include <Euler.h>
-#include <Object.h>
 #include <IMeshSceneNode.h>
 #include <IVideoDriver.h>
 #include <ISceneManager.h>
-#include <unistd.h>
 #include <algorithm>
 #include <GL/gl.h>
@@ -37 +31 @@
 
 void constructor() {
-  compile_info("FlairSensorActuator");
+  compile_info("FlairSimulator");
 }
 

trunk/lib/FlairSimulator/src/Gui.h

@@ -62 +62 @@
   irr::scene::IAnimatedMesh *getMesh(std::string filename) const;
   irr::scene::ISceneManager *getSceneManager(void) const;
+  irr::IrrlichtDevice *getDevice(void) const;
   float getAspectRatio(void) const;
 
 protected:
-  irr::IrrlichtDevice *getDevice(void) const;
   void setMesh(std::string file,
                irr::core::vector3df position = irr::core::vector3df(0, 0, 0),

trunk/lib/FlairSimulator/src/Gui_impl.cpp

@@ -22 +22 @@
 #include "Model.h"
 #include "Model_impl.h"
-#include "AnimPoursuite.h"
 #include <Object.h>
 #include <Euler.h>
@@ -40 +39 @@
 public:
   // This is the one method that we have to implement
-  virtual bool OnEvent(const SEvent &event) {
+  bool OnEvent(const SEvent &event) {
     // Remember whether each key is down or up
     if (event.EventType == EET_KEY_INPUT_EVENT)
       KeyIsDown[event.KeyInput.Key] = event.KeyInput.PressedDown;
 
-    // Send all other events to camera
-    if (event.EventType == EET_MOUSE_INPUT_EVENT && camera)
-      // return camera->OnEvent(event);
-      return camera->MouseMoved(event, cursorControl->getRelativePosition());
-
     if (model)
       return model->OnEvent(event);
@@ -57 +51 @@
 
   // This is used to check whether a key is being held down
-  virtual bool IsKeyDown(EKEY_CODE keyCode) {
+  bool IsKeyDown(EKEY_CODE keyCode) {
     if (KeyIsDown[keyCode] == true) {
       KeyIsDown[keyCode] = false;
@@ -66 +60 @@
   }
 
-  MyEventReceiver(ICursorControl *cursorControl) {
-    this->cursorControl = cursorControl;
-    camera = NULL;
+  MyEventReceiver(void) {
     model = NULL;
     for (u32 i = 0; i < KEY_KEY_CODES_COUNT; ++i)
       KeyIsDown[i] = false;
   }
-  void SetCamera(AnimPoursuite *camera) { this->camera = camera; }
   void SetModel(Model *model) { this->model = model; }
 
@@ -79 +70 @@
   // We use this array to store the current state of each key
   bool KeyIsDown[KEY_KEY_CODES_COUNT];
-  AnimPoursuite *camera;
   Model *model;
-  ICursorControl *cursorControl;
 };
 
@@ -96 +85 @@
   device = createDevice(driver_type, dimension2d<u32>(app_width, app_height),
                         16, false, false, false);
-  receiver = new MyEventReceiver(device->getCursorControl());
+  receiver = new MyEventReceiver();
   device->setEventReceiver(receiver);
   device->getLogger()->setLogLevel(ELL_NONE);
@@ -109 +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();
@@ -185 +187 @@
   int cam_id = 0;
 
-  receiver->SetCamera(models.at(cam_id)->pimpl_->animator);
   receiver->SetModel(models.at(cam_id));
 
@@ -199 +200 @@
     }
     for (size_t j = 0; j < models.size(); j++) {
-      if (i == j)
-        continue;
+      if (i == j) continue;
       models.at(i)->pimpl_->MetaTriangleSelector()->addTriangleSelector(
           models.at(j)->pimpl_->TriangleSelector());
@@ -247 +247 @@
 
     // vue poursuite
-    smgr->setActiveCamera(models.at(cam_id)->pimpl_->camera);
+    smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
     driver->setViewPort(core::rect<s32>(0, 0, scene_width, scene_height));
     smgr->drawAll(); // commente voir plus bas
@@ -279 +279 @@
     // mais a priori souci avec models.at(i)->pimpl_->CheckCollision();
     // (setelipsoid?)
-    smgr->setActiveCamera(models.at(cam_id)->pimpl_->camera);
+    smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
     driver->setViewPort(core::rect<s32>(0, 0, scene_width, scene_height));
     smgr->drawAll();
@@ -294 +294 @@
     if (receiver->IsKeyDown(KEY_PRIOR)) {
       cam_id++;
-      if (cam_id >= (int)models.size())
-        cam_id = 0;
-      receiver->SetCamera(models.at(cam_id)->pimpl_->animator);
+      if (cam_id >= (int)models.size()) cam_id = 0;
       receiver->SetModel(models.at(cam_id));
       setWindowCaption(models.at(cam_id), fps);
@@ -302 +300 @@
     if (receiver->IsKeyDown(KEY_NEXT)) {
       cam_id--;
-      if (cam_id < 0)
-        cam_id = models.size() - 1;
-      receiver->SetCamera(models.at(cam_id)->pimpl_->animator);
+      if (cam_id < 0) cam_id = models.size() - 1;
       receiver->SetModel(models.at(cam_id));
       setWindowCaption(models.at(cam_id), fps);
@@ -355 +351 @@
   }
 
-  receiver->SetCamera(NULL);
   receiver->SetModel(NULL);
 }

trunk/lib/FlairSimulator/src/Man.cpp

@@ -25 +25 @@
 #include <Tab.h>
 #include <DoubleSpinBox.h>
-#include "AnimPoursuite.h"
+#include "FollowMeCamera.h"
 
 using namespace irr;
@@ -47 +47 @@
   node->getMaterial(0).Lighting = false;
 
-  getCamera()->setPositionOffset(vector3df(0, 0, 100));
-  getCamera()->setTargetOffset(vector3df(0, 0, 100));
+  getFollowMeCamera()->setPositionOffset(vector3df(0, 0, 100));
+  getFollowMeCamera()->setTargetOffset(vector3df(0, 0, 100));
 
   setTriangleSelector(

trunk/lib/FlairSimulator/src/Model.cpp

@@ -19 +19 @@
 #include "Simulator.h"
 #include "Simulator_impl.h"
+#include "FollowMeCamera.h"
 #include <DoubleSpinBox.h>
 
@@ -63 +64 @@
 aabbox3d<f32> *Model::Box() const { return &(pimpl_->box); }
 
-AnimPoursuite *Model::getCamera(void) const { return pimpl_->animator; }
+FollowMeCamera *Model::getFollowMeCamera(void) const { return pimpl_->camera; }
 
 void Model::setTriangleSelector(ITriangleSelector *selector) {
@@ -71 +72 @@
 }
 
-void Model::setCameraFarValue(float zf) { pimpl_->camera->setFarValue(zf); }
+void Model::setCameraFarValue(float zf) { pimpl_->camera->getCameraSceneNode()->setFarValue(zf); }
 #endif
 

trunk/lib/FlairSimulator/src/Model.h

@@ -25 +25 @@
 #ifdef GL
 #include <aabbox3d.h>
+#include <IEventReceiver.h>
 namespace irr {
 class SEvent;
@@ -51 +52 @@
 namespace simulator {
 class Simulator;
-class AnimPoursuite;
+class FollowMeCamera;
 
-class Model : public core::IODevice {
+class Model : public core::IODevice
+#ifdef GL
+, public irr::IEventReceiver
+#endif
+ {
   friend class ::Gui_impl;
   friend class ::Simulator_impl;
   friend class ::Model_impl;
-  friend class AnimPoursuite;
   friend class sensor::SensorGL;
 
@@ -80 +84 @@
   virtual void WritedbtBuf(char *dbtbuf) = 0;
   virtual void ReaddbtBuf(char *dbtbuf) = 0;
-  virtual bool OnEvent(const irr::SEvent &event) = 0;
+
+  //default event handling
+  bool OnEvent(const irr::SEvent &event) { return false;};
 
   //! Sets the value of the camera's far clipping plane (default: 2000.0f)
@@ -93 +99 @@
   virtual void CalcModel(void) = 0;
 #ifdef GL
-  AnimPoursuite *getCamera(void) const;
+  FollowMeCamera *getFollowMeCamera(void) const;
   virtual void AnimateModel(void) = 0;
   // void setPosition(core::Vector3D pos);

trunk/lib/FlairSimulator/src/Model_impl.cpp

@@ -37 +37 @@
 #include <IVideoDriver.h>
 #include <ICameraSceneNode.h>
-#include "AnimPoursuite.h"
+#include "FollowMeCamera.h"
+
 using namespace irr;
 using namespace video;
@@ -82 +83 @@
 
   // camera
-  camera = getSceneManager()->addCameraSceneNode();
-  camera->setAspectRatio(
-      getGui()->getAspectRatio()); // on force a cause du view port
-  camera->setUpVector(vector3df(0, 0, 1));
-
-  animator = new AnimPoursuite(this);
-  camera->addAnimator(animator);
-  camera->setFarValue(8000);
+  camera = new FollowMeCamera(this);
 
   position_init = false;

trunk/lib/FlairSimulator/src/Parser.cpp

@@ -20 +20 @@
 #include "GenericObject.h"
 #include <vector3d.h>
-#include <irrlicht.h>
+#include <IrrlichtDevice.h>
+#include <IFileSystem.h>
 #include "GenericObject.h"
 

trunk/lib/FlairSimulator/src/X4.h

@@ -66 +66 @@
   void CalcModel(void);
 #ifdef GL
-  bool OnEvent(const irr::SEvent &event){};
   void AnimateModel(void);
   size_t dbtSize(void) const;

trunk/lib/FlairSimulator/src/X8.h

@@ -66 +66 @@
   void CalcModel(void);
 #ifdef GL
-  bool OnEvent(const irr::SEvent &event){};
   void AnimateModel(void);
   size_t dbtSize(void) const;

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

@@ -4 +4 @@
 // %flair:license}
 //  created:    2012/08/21
-//  filename:   AnimPoursuite.h
+//  filename:   FollowMeCamera.h
 //
 //  author:     Guillaume Sanahuja
@@ -15 +15 @@
 /*********************************************************************/
 
-#ifndef ANIMPOURSUITE_H
-#define ANIMPOURSUITE_H
+#ifndef FOLLOWMECAMERA_H
+#define FOLLOWMECAMERA_H
 
-#include <ISceneNodeAnimator.h>
-#include <position2d.h>
-#include <vector3d.h>
+#include "VisualizationCamera.h"
+
 
 namespace flair {
 namespace simulator {
 
-class AnimPoursuite : public irr::scene::ISceneNodeAnimator {
+class FollowMeCamera : public VisualizationCamera {
 public:
-  AnimPoursuite(const irr::scene::ISceneNode *parent,
+  FollowMeCamera(const irr::scene::ISceneNode *parent,
                 float rotateSpeed = -500.0f, float zoomSpeed = 4.0f);
-  ~AnimPoursuite();
+  ~FollowMeCamera();
 
   void animateNode(irr::scene::ISceneNode *node, irr::u32 timeMs);
-  ISceneNodeAnimator *createClone(irr::scene::ISceneNode *node,
-                                  irr::scene::ISceneManager *newManager = 0);
-  bool MouseMoved(const irr::SEvent &event, irr::core::position2df MousePos);
   void setPositionOffset(irr::core::vector3df newpos);
   void setTargetOffset(irr::core::vector3df newpos);
 
 private:
-  virtual bool isEventReceiverEnabled(void) const { return true; }
-
   irr::core::vector3df pos_offset, target_offset;
-  bool LMouseKey;
   irr::core::position2df RotateStart;
-  irr::core::position2df MousePos;
   const irr::scene::ISceneNode *parent;
   bool Rotating;
   float RotY, RotZ;
-  float rotateSpeed;
-  float zoomSpeed;
-  float currentZoom;
   float sat(float value);
 };
@@ -57 +46 @@
 } // end namespace flair
 
-#endif // ANIMPOURSUITE_H
+#endif // FOLLOWMECAMERA_H

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

@@ -29 +29 @@
 #include <IVideoDriver.h>
 #include <ICameraSceneNode.h>
-#include "AnimPoursuite.h"
+#include "FollowMeCamera.h"
 
 #include <IODevice.h>

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

@@ -30 +30 @@
 class IMeshSceneNode;
 class ITriangleSelector;
+//class ICameraSceneNode;
 }
 namespace video {
@@ -48 +49 @@
 class GenericObject;
 class Gui;
+class FixedCamera;
 }
 }
@@ -83 +85 @@
   size_t dbtSize(std::vector<flair::simulator::Model *> modeles);
   char *dbtbuf;
+  flair::simulator::FixedCamera *fixedCamera;
   flair::simulator::Gui *self;
+  //irr::scene::ICameraSceneNode * camera;
 };
 

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

@@ -38 +38 @@
 namespace simulator {
 class Simulator;
-class AnimPoursuite;
+class FollowMeCamera;
 }
 }
@@ -52 +52 @@
 class IMetaTriangleSelector;
 class ISceneNodeAnimatorCollisionResponse;
-class ICameraSceneNode;
 }
 }
@@ -94 +93 @@
   irr::core::aabbox3d<irr::f32> box;
   void SynchronizationPoint();
-  irr::scene::ICameraSceneNode *camera;
-  flair::simulator::AnimPoursuite *animator;
+  flair::simulator::FollowMeCamera *camera;
   irr::scene::ITriangleSelector *selector;
 #endif