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


Ignore:
Timestamp:
02/09/17 17:10:24 (5 years ago)
Author:
Sanahuja Guillaume
Message:

correction bugs parser

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairSimulator/src/unexported/GenericObject.h

    r69 r134  
    1919#ifdef GL
    2020
    21 #include "Simulator.h"
    22 
    23 #include "ConditionVariable.h"
    24 #include "Gui.h"
    25 #include "Gui_impl.h"
    26 #include <ISceneManager.h>
    27 #include <ISceneNodeAnimatorCollisionResponse.h>
    28 #include <IMetaTriangleSelector.h>
    29 #include <IVideoDriver.h>
    30 #include <ICameraSceneNode.h>
    31 #include "FollowMeCamera.h"
    32 
    33 #include <IODevice.h>
    34 #include <Euler.h>
    35 #include <Vector3D.h>
    36 
    37 #include <aabbox3d.h>
    38 #include <IMeshSceneNode.h>
     21#include <vector3d.h>
    3922
    4023namespace irr {
    41 class SEvent;
    42 namespace scene {
    43 class IMesh;
    44 class ISceneManager;
    45 class ITriangleSelector;
    46 class IMetaTriangleSelector;
    47 class ISceneNodeAnimatorCollisionResponse;
    48 }
     24        namespace scene {
     25                class IMesh;
     26                class IMeshSceneNode;
     27                class ITriangleSelector;
     28                class ISceneNode;
     29        }
    4930}
    5031
    51 class Gui_impl;
    5232class Simulator_impl;
    5333
    5434namespace flair {
    55 namespace core {
    56 class ConditionVariable;
    57 }
    5835namespace simulator {
    5936class Simulator;
    60 class AnimPoursuite;
    6137
    62 class GenericObject : public irr::scene::IMeshSceneNode {
     38class GenericObject {
    6339  friend class ::Simulator_impl;
    6440
    6541public:
    66   GenericObject(Simulator *parent, std::string name,
    67                 irr::scene::ISceneManager *sceneManager);
     42  GenericObject(Simulator *parent,irr::scene::IMesh *mesh);
    6843  virtual ~GenericObject();
    6944
    70   // FROM IMPL
    7145  irr::scene::ITriangleSelector *TriangleSelector(void);
    72   irr::core::aabbox3d<irr::f32> box;
    73   // END FROM IMPL
    74 
    75   irr::scene::ISceneNode *getSceneNode();
    76   virtual const irr::core::aabbox3d<irr::f32> &getBoundingBox(void) const {
    77     return box;
    78   }
    79 
    80   void setPosition(irr::core::vector3df position);
    8146  void setScale(float value);
    82   void setScale(irr::core::vector3df scale);
    83   void setRotation(irr::core::vector3df rotation);
    84   void OnRegisterSceneNode(void);
    85   void setMesh(irr::scene::IMesh *mesh);
    86   irr::scene::IMesh *getMesh(void);
    87   void render(void);
    88   virtual void setReadOnlyMaterials(bool readonly){};
    89   virtual bool isReadOnlyMaterials(void) const { return false; }
    90   virtual irr::scene::IShadowVolumeSceneNode *
    91   addShadowVolumeSceneNode(const irr::scene::IMesh *shadowMesh = 0,
    92                            irr::s32 id = -1, bool zfailmethod = true,
    93                            irr::f32 infinity = 1000.0f) {
    94     return NULL;
    95   }
    96 
     47  void setScale(const irr::core::vector3df& scale);
     48        void setPosition(const irr::core::vector3df& position);
     49  void setRotation(const irr::core::vector3df& rotation);
     50 
    9751private:
    98   void UpdateFrom(core::io_data *data){};
    99   irr::scene::IMesh *mesh;
    10052  irr::scene::ITriangleSelector *selector;
    101   flair::core::ConditionVariable *cond;
    102   irr::video::SMaterial Material;
    103 };
     53        irr::scene::IMeshSceneNode *meshSceneNode;
     54};
    10455} // end namespace simulator
    10556} // end namespace flair
Note: See TracChangeset for help on using the changeset viewer.