Context Navigation

Changeset 94 in flair-dev for trunk/include

Timestamp:

Jan 8, 2019, 10:14:12 AM (6 years ago)

Author:

Sanahuja Guillaume

Message:

draw vrpn axis in simulator

Location:

trunk/include

Files:

-              r50
+              r94
 #include <VrpnObject.h>
+#include <VrpnClient.h>
 #include <io_data.h>
 #include <Vector3D.h>
 …
 class MetaVrpnObject : public sensor::VrpnObject {
 public:
   MetaVrpnObject(std::string name);
   MetaVrpnObject(std::string name,uint8_t id);
+  MetaVrpnObject(std::string name,sensor::VrpnClient *client=sensor::GetVrpnClient());
+  MetaVrpnObject(std::string name,uint8_t id,sensor::VrpnClient *client=sensor::GetVrpnClient());
   ~MetaVrpnObject();
   gui::DataPlot1D *VxPlot(void) const; // 1,0
 …
 private:
   void ConstructorCommon(std::string name);
+  void ConstructorCommon(std::string name,sensor::VrpnClient *client);
   filter::LowPassFilter *pbas;
   filter::EulerDerivative *euler;

-              r68
+              r94
 #include <IODevice.h>
+#include <VrpnClient.h>
 #include <Vector3D.h>
 #include <stdint.h>
 …
 class VrpnObject_impl;
-class VrpnClient_impl;
 namespace flair {
 …
 class VrpnObject : public core::IODevice {
   friend class ::VrpnObject_impl;
-  friend class ::VrpnClient_impl;
 public:
 …
   * \param name VRPN object name, should be the same as defined in the server
   * \param tab Tab for the user interface
+  * \param client VrpnClient of the connection, if unspecified, use the default one
   */
   VrpnObject(std::string name,
              const gui::TabWidget *tab);
+             const gui::TabWidget *tab,sensor::VrpnClient *client=GetVrpnClient());
   /*!
   * \brief Constructor
+  *
   * Construct a VrpnObject. Connection is done by IP.
+  * Construct a VrpnObject. Connection is done by xbee.
+  *
   * \param name name
   * \param id VRPN object id, should be the same as defined in the server
+  * \param id VRPN object id, should be the same as defined in the xbee bridge
   * \param tab Tab for the user interface
+  * \param client VrpnClient of the connection, if unspecified, use the default one
   */
   VrpnObject(std::string name, uint8_t id,
              const gui::TabWidget *tab);
+             const gui::TabWidget *tab,sensor::VrpnClient *client=GetVrpnClient());
   /*!

-              r13
+              r94
         const irr::core::vector3df &position = irr::core::vector3df(0, 0, 0),
         bool inverted = false, irr::s32 id = -1);
+  Blade(irr::scene::ISceneNode *parent,
+        const irr::core::vector3df &position = irr::core::vector3df(0, 0, 0),
+        bool inverted = false, irr::s32 id = -1);
   virtual void OnRegisterSceneNode(void);
   virtual void render(void);

-              r13
+              r94
       const irr::core::vector3df &rotation = irr::core::vector3df(0, 0, 0),
       irr::video::ITexture *texture = NULL, irr::s32 id = -1);
+  MeshSceneNode(
+      irr::scene::ISceneNode *parent, irr::scene::IMesh *mesh,
+      const irr::core::vector3df &position = irr::core::vector3df(0, 0, 0),
+      const irr::core::vector3df &rotation = irr::core::vector3df(0, 0, 0),
+      irr::video::ITexture *texture = NULL, irr::s32 id = -1);
   virtual void OnRegisterSceneNode(void);

r50	r94
44	44	// yaw_deg: rotation of the vrpn coordinate with respect to the earth
45	45	// coordinate, around z axis
46		Simulator(std::string name, int optitrack_mstime = 10, float yaw_deg = 30);
	46	Simulator(std::string name, int optitrack_mstime = 10, float yaw_deg = 30, int port=3883);
47	47	~Simulator();
48	48	void RunSimu(void);

-              r34
+              r94
     class ICameraSceneNode;
+  }
+  namespace video {
+    class ITexture;
+  }
+}
 …
   irr::scene::ICameraSceneNode *getCameraSceneNode(void);
   std::string getName(void);
+  void renderAxisToTexture(irr::video::ITexture* texture);
 private:
   virtual bool isEventReceiverEnabled(void) const { return true; }
+  irr::scene::ISceneNode *nodeX,*nodeY,*nodeZ;
+  irr::scene::ISceneManager *axis_scenemanager;
 protected:
   bool LMouseKey;
   irr::scene::ICameraSceneNode *camera;
+  irr::scene::ICameraSceneNode *axis_camera;
   irr::core::position2df MousePos;
   float currentZoom;

-              r68
+              r94
 #ifdef GL
   virtual void Draw(void);
+  virtual void ExtraDraw(void){};
+  virtual void ExtraDraw(void){};
+#endif
-protected:
-  Blade *fl_blade, *fr_blade, *rl_blade, *rr_blade;
-  core::Mutex *motor_speed_mutex;
-#endif
 private:
   void CalcModel(void);
 …
   void WritedbtBuf(char *dbtbuf);
   void ReaddbtBuf(char *dbtbuf);
+  Blade *fl_blade, *fr_blade, *rl_blade, *rr_blade;
+  core::Mutex *motor_speed_mutex;
 #endif

-              r68
+              r94
 protected:
+#ifdef GL
+  Blade *tfl_blade, *tfr_blade, *trl_blade, *trr_blade;
+  Blade *bfl_blade, *bfr_blade, *brl_blade, *brr_blade;
+#endif
 private:
   void CalcModel(void);
 …
   void ReaddbtBuf(char *dbtbuf);
   core::Mutex *motor_speed_mutex;
+  Blade *tfl_blade, *tfr_blade, *trl_blade, *trr_blade;
+  Blade *bfl_blade, *bfr_blade, *brl_blade, *brr_blade;
 #endif

Note: See TracChangeset for help on using the changeset viewer.