Changeset 50 in flair-dev for trunk/include/FlairSimulator/Gui.h

Timestamp:

05/31/17 15:54:26 (7 years ago)

Author:

Sanahuja Guillaume

Message:

doc

File:

• trunk/include/FlairSimulator/Gui.h (modified) (5 diffs)

trunk/include/FlairSimulator/Gui.h

@@ -19 +19 @@
 
 #include <Object.h>
+#include <Vector3D.h>
 #include <EDriverTypes.h>
 #include <vector3d.h>
@@ -36 +37 @@
 namespace core {
 class Object;
-class Vector3D;
 class Euler;
 class Quaternion;
@@ -48 +48 @@
 namespace flair {
 namespace simulator {
-class Simulator;
 
-class Gui : public core::Object {
+class Gui: public core::Object {
   friend class ::Simulator_impl;
   friend class VisualizationCamera;
 
 public:
-  Gui(const Simulator *parent, std::string name, int app_width, int app_height,
+  Gui(std::string name, int app_width, int app_height,
       int scene_width, int scene_height, std::string media_path,
       irr::video::E_DRIVER_TYPE driver_type = irr::video::EDT_OPENGL);
@@ -126 +125 @@
 * \return vector in irrlicht coordinates
 */
-irr::core::vector3df ToIrrlichtCoordinates(core::Vector3D vect);
+template<typename T>  irr::core::vector3df ToIrrlichtCoordinates(core::Vector3D<T> vect);
 
 /*!
@@ -137 +136 @@
 * \return vector in simulator coordinates
 */
-core::Vector3D ToSimulatorCoordinates(irr::core::vector3df vect);
+core::Vector3Df ToSimulatorCoordinates(irr::core::vector3df vect);
 
 /*!