Changeset 158 in flair-src for trunk/lib/FlairSimulator/src/Model_impl.cpp

Timestamp:

03/05/17 10:50:56 (6 years ago)

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

File:

• trunk/lib/FlairSimulator/src/Model_impl.cpp (modified) (3 diffs)

trunk/lib/FlairSimulator/src/Model_impl.cpp

@@ -18 +18 @@
 #include "Model_impl.h"
 #include "Simulator.h"
+#include "Simulator_impl.h"
 #include "TabWidget.h"
 #include "Tab.h"
@@ -51 +52 @@
 
 #ifdef GL
-Model_impl::Model_impl(Model *self, std::string name,
-                       ISceneManager *scenemanager, vrpn_Connection_IP *vrpn)
-    : ISceneNode(scenemanager->getRootSceneNode(), scenemanager, -1),
-      Thread(self, name, 50), vrpn_Tracker(name.c_str(), vrpn)
+Model_impl::Model_impl(Model *self, std::string name,uint32_t modelId)
+    : ISceneNode(getGui()->getSceneManager()->getRootSceneNode(), getGui()->getSceneManager(), -1),
+      Thread(self, name, 50), vrpn_Tracker(name.c_str(), getSimulator()->pimpl_)
 
 #else
-Model_impl::Model_impl(Model *self, std::string name, vrpn_Connection_IP *vrpn)
-    : Thread(self, name, 50), vrpn_Tracker(name.c_str(), vrpn)
+Model_impl::Model_impl(Model *self, std::string name,uint32_t modelId)
+    : Thread(self, name, 50), vrpn_Tracker(name.c_str(), getSimulator()->pimpl_)
 #endif
 {
   this->self = self;
+  this->modelId=modelId;
 
 #ifdef GL
@@ -131 +132 @@
 
   self->AddDataToLog(output);
+  
+  getSimulator()->pimpl_->models.push_back(self);
 }