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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

refonte camera simu

Location:

trunk/lib/FlairSimulator/src/unexported

Files:

• FollowMeCamera.h (moved) (moved from trunk/lib/FlairSimulator/src/unexported/AnimPoursuite.h ) (3 diffs)
• GenericObject.h (modified) (1 diff)
• Gui_impl.h (modified) (3 diffs)
• Model_impl.h (modified) (3 diffs)

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