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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

File:

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

trunk/lib/FlairSimulator/src/Model.cpp

@@ -18 +18 @@
 #include "Model_impl.h"
 #include "Simulator.h"
-#include "Simulator_impl.h"
 #include <DoubleSpinBox.h>
 
 #ifdef GL
 #include "FollowMeCamera.h"
-#include "Gui.h"
 #include <ICameraSceneNode.h>
 using namespace irr;
@@ -36 +34 @@
 namespace simulator {
 
-Model::Model(const Simulator *parent, std::string name)
-    : IODevice(parent, name) {
-#ifdef GL
-  pimpl_ =
-      new Model_impl(this, name, getGui()->getSceneManager(), parent->pimpl_);
-#else
-  pimpl_ = new Model_impl(this, name, parent->pimpl_);
-#endif
-  parent->pimpl_->models.push_back(this);
+Model::Model(std::string name,uint32_t modelId)
+    : IODevice(getSimulator(), name) {
+  pimpl_ = new Model_impl(this, name,modelId);
 }
 
@@ -79 +71 @@
 float Model::dT(void) const { return pimpl_->dT->Value(); }
 
+int Model::GetId(void) const {
+  return pimpl_->modelId;
+}
+
 } // end namespace simulator
 } // end namespace flair