Changeset 134 in flair-src for trunk/lib/FlairSimulator/src/GenericObject.cpp

Timestamp:

02/09/17 17:10:24 (7 years ago)

Author:

Sanahuja Guillaume

Message:

correction bugs parser

File:

• trunk/lib/FlairSimulator/src/GenericObject.cpp (modified) (4 diffs)

trunk/lib/FlairSimulator/src/GenericObject.cpp

@@ -17 +17 @@
 #ifdef GL
 #include "GenericObject.h"
+#include "Simulator.h"
 #include "Simulator_impl.h"
+#include "Gui.h"
 
 #include "Quaternion.h"
+#include "Euler.h"
 #include <ISceneManager.h>
+#include <IMeshSceneNode.h>
 
 using namespace irr;
@@ -33 +37 @@
 namespace simulator {
 
-GenericObject::GenericObject(Simulator *parent, std::string name,
-                             ISceneManager *sceneManager)
-    : IMeshSceneNode(sceneManager->getRootSceneNode(), sceneManager,
-                     -1) //, IODevice(parent,name)
+GenericObject::GenericObject(Simulator *parent, IMesh *mesh)
 {
-  setMaterialFlag(EMF_LIGHTING, false);
-  Material = getMaterial(0);
-  // setMaterialTexture(0,sceneManager->getVideoDriver()->getTexture("/home/cesar/igep/uav_dev_svn/trunk/media/nskinbl.jpg"));
-  Material.NormalizeNormals = true;
-  Material.Wireframe = false;
-  Material.Lighting = false;
+        meshSceneNode=getGui()->getSceneManager()->addMeshSceneNode(mesh);
+        
+  selector = getGui()->getSceneManager()->createTriangleSelector(mesh, meshSceneNode);
+  meshSceneNode->setTriangleSelector(selector);
+        
+  meshSceneNode->setMaterialFlag(EMF_LIGHTING, false);
 
   parent->pimpl_->objects.push_back(this);
@@ -50 +51 @@
 GenericObject::~GenericObject() {}
 
+ITriangleSelector *GenericObject::TriangleSelector(void) { return selector; }
+
 void GenericObject::setScale(float value) {
-  ISceneNode::setScale(vector3df(value, value, value));
+  meshSceneNode->setScale(vector3df(value, value, value));
 }
 
-void GenericObject::setScale(vector3df scale) { ISceneNode::setScale(scale); }
-
-ITriangleSelector *GenericObject::TriangleSelector(void) { return selector; }
-
-void GenericObject::OnRegisterSceneNode(void) {
-  if (IsVisible)
-    SceneManager->registerNodeForRendering(this);
-
-  ISceneNode::OnRegisterSceneNode();
+void GenericObject::setScale(const vector3df& scale) { 
+        meshSceneNode->setScale(scale);
 }
 
-void GenericObject::render(void) {
-  IVideoDriver *driver = SceneManager->getVideoDriver();
-
-  driver->setMaterial(Material);
-
-  driver->setTransform(ETS_WORLD, AbsoluteTransformation);
-  driver->drawMeshBuffer(mesh->getMeshBuffer(0));
+void GenericObject::setPosition(const vector3df& pos) {
+  meshSceneNode->setPosition(ToIrrlichtCoordinates(pos));
 }
 
-void GenericObject::setMesh(IMesh *mesh) {
-  this->mesh = mesh;
-  box = mesh->getBoundingBox();
-
-  selector = getSceneManager()->createTriangleSelector(mesh, this);
-  setTriangleSelector(selector);
-}
-
-IMesh *GenericObject::getMesh(void) { return mesh; }
-
-void GenericObject::setPosition(irr::core::vector3df pos) {
-  ISceneNode::setPosition(ToIrrlichtCoordinates(pos));
-}
-
-void GenericObject::setRotation(irr::core::vector3df rotation) {
+void GenericObject::setRotation(const vector3df& rotation) {
   Euler eulerA(rotation.X, rotation.Y, rotation.Z);
   Euler eulerB;
@@ -96 +73 @@
   quatB.ToEuler(eulerB);
 
-  ISceneNode::setRotation(Euler::ToDegree(1) *
+  meshSceneNode->setRotation(Euler::ToDegree(1) *
                           vector3df(eulerB.roll, eulerB.pitch, eulerB.yaw));
 }