Changeset 34 in flair-dev for trunk/include


Ignore:
Timestamp:
Sep 28, 2016, 8:40:33 AM (5 years ago)
Author:
Sanahuja Guillaume
Message:

doc

Location:
trunk/include
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/FlairSensorActuator/SimuGps.h

    r32 r34  
    8787
    8888  typedef struct {
    89     float x;
    90     float y;
    91     float z;
     89    float e;
     90    float n;
     91    float u;
     92    float ve;
     93    float vn;
    9294  } gps_states_t;
    9395
  • trunk/include/FlairSimulator/Gui.h

    r13 r34  
    5252class Gui : public core::Object {
    5353  friend class ::Simulator_impl;
     54  friend class VisualizationCamera;
    5455
    5556public:
     
    6263  irr::scene::IAnimatedMesh *getMesh(std::string filename) const;
    6364  irr::scene::ISceneManager *getSceneManager(void) const;
     65  irr::IrrlichtDevice *getDevice(void) const;
    6466  float getAspectRatio(void) const;
    6567
    6668protected:
    67   irr::IrrlichtDevice *getDevice(void) const;
    6869  void setMesh(std::string file,
    6970               irr::core::vector3df position = irr::core::vector3df(0, 0, 0),
  • trunk/include/FlairSimulator/Model.h

    r13 r34  
    2525#ifdef GL
    2626#include <aabbox3d.h>
     27#include <IEventReceiver.h>
    2728namespace irr {
    2829class SEvent;
     
    5152namespace simulator {
    5253class Simulator;
    53 class AnimPoursuite;
     54class FollowMeCamera;
    5455
    55 class Model : public core::IODevice {
     56class Model : public core::IODevice
     57#ifdef GL
     58, public irr::IEventReceiver
     59#endif
     60 {
    5661  friend class ::Gui_impl;
    5762  friend class ::Simulator_impl;
    5863  friend class ::Model_impl;
    59   friend class AnimPoursuite;
    6064  friend class sensor::SensorGL;
    6165
     
    8084  virtual void WritedbtBuf(char *dbtbuf) = 0;
    8185  virtual void ReaddbtBuf(char *dbtbuf) = 0;
    82   virtual bool OnEvent(const irr::SEvent &event) = 0;
     86
     87  //default event handling
     88  bool OnEvent(const irr::SEvent &event) { return false;};
    8389
    8490  //! Sets the value of the camera's far clipping plane (default: 2000.0f)
     
    9399  virtual void CalcModel(void) = 0;
    94100#ifdef GL
    95   AnimPoursuite *getCamera(void) const;
     101  FollowMeCamera *getFollowMeCamera(void) const;
    96102  virtual void AnimateModel(void) = 0;
    97103  // void setPosition(core::Vector3D pos);
  • trunk/include/FlairSimulator/Parser.h

    r13 r34  
    2323
    2424namespace flair {
     25  namespace core {
     26    class Vector3D;
     27  }
     28}
     29
     30namespace flair {
    2531namespace simulator {
    2632class Parser : public Gui {
     
    2834  /*can create:
    2935  - cylinders: in y axis
     36  - fixed cameras
    3037
    3138  */
     
    4552  irr::core::vector3df getSceneVect(xmlNode *mesh_node, xmlChar *param,
    4653                                    bool isScale = false);
     54  core::Vector3D getMeshVector3D(xmlNode *mesh_node, xmlChar *param);
    4755};
    4856}
  • trunk/include/FlairSimulator/X4.h

    r13 r34  
    6666  void CalcModel(void);
    6767#ifdef GL
    68   bool OnEvent(const irr::SEvent &event){};
    6968  void AnimateModel(void);
    7069  size_t dbtSize(void) const;
  • trunk/include/FlairSimulator/X8.h

    r13 r34  
    6666  void CalcModel(void);
    6767#ifdef GL
    68   bool OnEvent(const irr::SEvent &event){};
    6968  void AnimateModel(void);
    7069  size_t dbtSize(void) const;
Note: See TracChangeset for help on using the changeset viewer.