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

Timestamp:

Mar 5, 2017, 10:50:56 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

Location:

trunk/lib/FlairSimulator/src/unexported

Files:

• GenericObject.h (modified) (2 diffs)
• Model_impl.h (modified) (2 diffs)
• Simulator_impl.h (modified) (1 diff)

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

@@ -34 +34 @@
 namespace flair {
 namespace simulator {
-class Simulator;
 
 class GenericObject {
@@ -40 +39 @@
 
 public:
-  GenericObject(Simulator *parent,irr::scene::IMesh *mesh);
+  GenericObject(irr::scene::IMesh *mesh);
   virtual ~GenericObject();
 

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

@@ -66 +66 @@
                    {
 public:
-#ifdef GL
-  Model_impl(flair::simulator::Model *self, std::string name,
-             irr::scene::ISceneManager *scenemanager, vrpn_Connection_IP *vrpn);
-#else
-  Model_impl(flair::simulator::Model *self, std::string name,
-             vrpn_Connection_IP *vrpn);
-#endif
+  Model_impl(flair::simulator::Model *self, std::string name,uint32_t modelId);
   ~Model_impl();
 
@@ -100 +94 @@
   flair::gui::TabWidget *tabwidget;
   flair::gui::DoubleSpinBox *dT;
+  int modelId;
 
 private:

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

@@ -29 +29 @@
 }
 
+class Model_impl;
+
 class Simulator_impl : public vrpn_Connection_IP, private flair::core::Thread {
-  friend class flair::simulator::Model;
+  friend class ::Model_impl;
   friend class flair::simulator::GenericObject;