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

Timestamp:

Feb 9, 2017, 5:10:24 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

correction bugs parser

File:

• trunk/lib/FlairSimulator/src/unexported/GenericObject.h (modified) (1 diff)

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

@@ -19 +19 @@
 #ifdef GL
 
-#include "Simulator.h"
-
-#include "ConditionVariable.h"
-#include "Gui.h"
-#include "Gui_impl.h"
-#include <ISceneManager.h>
-#include <ISceneNodeAnimatorCollisionResponse.h>
-#include <IMetaTriangleSelector.h>
-#include <IVideoDriver.h>
-#include <ICameraSceneNode.h>
-#include "FollowMeCamera.h"
-
-#include <IODevice.h>
-#include <Euler.h>
-#include <Vector3D.h>
-
-#include <aabbox3d.h>
-#include <IMeshSceneNode.h>
+#include <vector3d.h>
 
 namespace irr {
-class SEvent;
-namespace scene {
-class IMesh;
-class ISceneManager;
-class ITriangleSelector;
-class IMetaTriangleSelector;
-class ISceneNodeAnimatorCollisionResponse;
-}
+        namespace scene {
+                class IMesh;
+                class IMeshSceneNode;
+                class ITriangleSelector;
+                class ISceneNode;
+        }
 }
 
-class Gui_impl;
 class Simulator_impl;
 
 namespace flair {
-namespace core {
-class ConditionVariable;
-}
 namespace simulator {
 class Simulator;
-class AnimPoursuite;
 
-class GenericObject : public irr::scene::IMeshSceneNode {
+class GenericObject {
   friend class ::Simulator_impl;
 
 public:
-  GenericObject(Simulator *parent, std::string name,
-                irr::scene::ISceneManager *sceneManager);
+  GenericObject(Simulator *parent,irr::scene::IMesh *mesh);
   virtual ~GenericObject();
 
-  // FROM IMPL
   irr::scene::ITriangleSelector *TriangleSelector(void);
-  irr::core::aabbox3d<irr::f32> box;
-  // END FROM IMPL
-
-  irr::scene::ISceneNode *getSceneNode();
-  virtual const irr::core::aabbox3d<irr::f32> &getBoundingBox(void) const {
-    return box;
-  }
-
-  void setPosition(irr::core::vector3df position);
   void setScale(float value);
-  void setScale(irr::core::vector3df scale);
-  void setRotation(irr::core::vector3df rotation);
-  void OnRegisterSceneNode(void);
-  void setMesh(irr::scene::IMesh *mesh);
-  irr::scene::IMesh *getMesh(void);
-  void render(void);
-  virtual void setReadOnlyMaterials(bool readonly){};
-  virtual bool isReadOnlyMaterials(void) const { return false; }
-  virtual irr::scene::IShadowVolumeSceneNode *
-  addShadowVolumeSceneNode(const irr::scene::IMesh *shadowMesh = 0,
-                           irr::s32 id = -1, bool zfailmethod = true,
-                           irr::f32 infinity = 1000.0f) {
-    return NULL;
-  }
-
+  void setScale(const irr::core::vector3df& scale);
+        void setPosition(const irr::core::vector3df& position);
+  void setRotation(const irr::core::vector3df& rotation);
+ 
 private:
-  void UpdateFrom(core::io_data *data){};
-  irr::scene::IMesh *mesh;
   irr::scene::ITriangleSelector *selector;
-  flair::core::ConditionVariable *cond;
-  irr::video::SMaterial Material;
-};
+        irr::scene::IMeshSceneNode *meshSceneNode;
+}; 
 } // end namespace simulator
 } // end namespace flair