Changeset 34 in flair-dev for trunk/include/FlairSimulator

Timestamp:

Sep 28, 2016, 8:40:33 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

doc

Location:

trunk/include/FlairSimulator

Files:

• FixedCamera.h (added)
• Gui.h (modified) (2 diffs)
• Model.h (modified) (4 diffs)
• Parser.h (modified) (3 diffs)
• VisualizationCamera.h (added)
• X4.h (modified) (1 diff)
• X8.h (modified) (1 diff)

trunk/include/FlairSimulator/Gui.h

@@ -52 +52 @@
 class Gui : public core::Object {
   friend class ::Simulator_impl;
+  friend class VisualizationCamera;
 
 public:
@@ -62 +63 @@
   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/include/FlairSimulator/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/include/FlairSimulator/Parser.h

@@ -23 +23 @@
 
 namespace flair {
+  namespace core {
+    class Vector3D;
+  }
+}
+
+namespace flair {
 namespace simulator {
 class Parser : public Gui {
@@ -28 +34 @@
   /*can create:
   - cylinders: in y axis
+  - fixed cameras
 
   */
@@ -45 +52 @@
   irr::core::vector3df getSceneVect(xmlNode *mesh_node, xmlChar *param,
                                     bool isScale = false);
+  core::Vector3D getMeshVector3D(xmlNode *mesh_node, xmlChar *param);
 };
 }

trunk/include/FlairSimulator/X4.h

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

trunk/include/FlairSimulator/X8.h

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