From 2f58ee931d303770dd82b20d84e7d893149d0c0b Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 30 Sep 2016 22:28:36 +0200 Subject: [PATCH] [DEV/API] change .h in .hpp --- doxy_ege.py | 2 +- ege/AudioElement.cpp | 4 +- ege/{AudioElement.h => AudioElement.hpp} | 0 ege/AudioEngine.cpp | 4 +- ege/{AudioEngine.h => AudioEngine.hpp} | 0 ege/CollisionShapeCreator.cpp | 20 +++--- ...apeCreator.h => CollisionShapeCreator.hpp} | 4 +- ege/Environement.cpp | 12 ++-- ege/{Environement.h => Environement.hpp} | 24 +++---- ege/{Game.h => Game.hpp} | 22 +++--- ege/Light.cpp | 4 +- ege/{Light.h => Light.hpp} | 8 +-- ege/Material.cpp | 6 +- ege/{Material.h => Material.hpp} | 10 +-- ege/Particule.cpp | 6 +- ege/{Particule.h => Particule.hpp} | 6 +- ege/ParticuleEngine.cpp | 8 +-- ...{ParticuleEngine.h => ParticuleEngine.hpp} | 4 +- ege/ParticuleSimple.cpp | 4 +- ...{ParticuleSimple.h => ParticuleSimple.hpp} | 12 ++-- ege/Ray.cpp | 8 +-- ege/{Ray.h => Ray.hpp} | 6 +- ege/camera/Camera.cpp | 6 +- ege/camera/{Camera.h => Camera.hpp} | 12 ++-- ege/camera/{FPS.h => FPS.hpp} | 0 ege/camera/View.cpp | 6 +- ege/camera/{View.h => View.hpp} | 2 +- ege/debug.cpp | 2 +- ege/{debug.h => debug.hpp} | 2 +- ege/elements/Element.cpp | 10 +-- ege/elements/{Element.h => Element.hpp} | 22 +++--- ege/elements/ElementBase.cpp | 4 +- .../{ElementBase.h => ElementBase.hpp} | 2 +- ege/elements/ElementPhysic.cpp | 10 +-- .../{ElementPhysic.h => ElementPhysic.hpp} | 24 +++---- ege/physics/Engine.cpp | 10 +-- ege/physics/{Engine.h => Engine.hpp} | 18 ++--- ege/physicsShape/PhysicsBox.cpp | 4 +- .../{PhysicsBox.h => PhysicsBox.hpp} | 4 +- ege/physicsShape/PhysicsCapsule.cpp | 4 +- .../{PhysicsCapsule.h => PhysicsCapsule.hpp} | 4 +- ege/physicsShape/PhysicsCone.cpp | 4 +- .../{PhysicsCone.h => PhysicsCone.hpp} | 4 +- ege/physicsShape/PhysicsConvexHull.cpp | 4 +- ...sicsConvexHull.h => PhysicsConvexHull.hpp} | 4 +- ege/physicsShape/PhysicsCylinder.cpp | 4 +- ...{PhysicsCylinder.h => PhysicsCylinder.hpp} | 4 +- ege/physicsShape/PhysicsShape.cpp | 16 ++--- .../{PhysicsShape.h => PhysicsShape.hpp} | 9 ++- ege/physicsShape/PhysicsSphere.cpp | 4 +- .../{PhysicsSphere.h => PhysicsSphere.hpp} | 4 +- ege/resource/Mesh.cpp | 16 ++--- ege/resource/{Mesh.h => Mesh.hpp} | 24 +++---- ege/resource/MeshCube.cpp | 4 +- ege/resource/MeshEmf.cpp | 6 +- ege/resource/MeshGird.cpp | 4 +- ege/resource/MeshObj.cpp | 4 +- ege/resource/ParticuleMesh.cpp | 8 +-- .../{ParticuleMesh.h => ParticuleMesh.hpp} | 2 +- ege/resource/tools/{Face.h => Face.hpp} | 0 .../{FaceIndexing.h => FaceIndexing.hpp} | 0 ege/resource/tools/icoSphere.cpp | 4 +- .../tools/{icoSphere.h => icoSphere.hpp} | 8 +-- ege/resource/tools/isoSphere.cpp | 4 +- .../tools/{isoSphere.h => isoSphere.hpp} | 8 +-- ege/resource/tools/viewBox.cpp | 4 +- ege/resource/tools/{viewBox.h => viewBox.hpp} | 8 +-- ege/widget/Mesh.cpp | 8 +-- ege/widget/{Mesh.h => Mesh.hpp} | 6 +- ege/widget/Scene.cpp | 12 ++-- ege/widget/{Scene.h => Scene.hpp} | 24 +++---- lutin_ege.py | 68 +++++++++---------- sample/CameraPosition/appl/Windows.cpp | 20 +++--- .../appl/{Windows.h => Windows.hpp} | 6 +- sample/CameraPosition/appl/debug.cpp | 2 +- .../debug.h => CameraPosition/appl/debug.hpp} | 2 +- sample/CameraPosition/appl/main.cpp | 16 ++--- .../CameraPosition/appl/{main.h => main.hpp} | 0 sample/Collision/appl/Windows.cpp | 26 +++---- .../Collision/appl/{Windows.h => Windows.hpp} | 8 +-- sample/Collision/appl/debug.cpp | 2 +- .../appl/debug.h => Collision/appl/debug.hpp} | 2 +- sample/Collision/appl/main.cpp | 16 ++--- sample/Collision/appl/{main.h => main.hpp} | 0 sample/DoubleView/appl/Windows.cpp | 26 +++---- .../appl/{Windows.h => Windows.hpp} | 8 +-- sample/DoubleView/appl/debug.cpp | 2 +- .../debug.h => DoubleView/appl/debug.hpp} | 2 +- sample/DoubleView/appl/main.cpp | 16 ++--- sample/DoubleView/appl/{main.h => main.hpp} | 0 sample/MeshCreator/appl/Windows.cpp | 20 +++--- .../appl/{Windows.h => Windows.hpp} | 6 +- sample/MeshCreator/appl/debug.cpp | 2 +- .../MeshCreator/appl/{debug.h => debug.hpp} | 2 +- sample/MeshCreator/appl/main.cpp | 16 ++--- sample/MeshCreator/appl/{main.h => main.hpp} | 0 sample/RayTest/appl/Windows.cpp | 24 +++---- .../RayTest/appl/{Windows.h => Windows.hpp} | 8 +-- sample/RayTest/appl/debug.cpp | 2 +- sample/RayTest/appl/{debug.h => debug.hpp} | 2 +- sample/RayTest/appl/main.cpp | 16 ++--- sample/RayTest/appl/{main.h => main.hpp} | 0 102 files changed, 425 insertions(+), 426 deletions(-) rename ege/{AudioElement.h => AudioElement.hpp} (100%) rename ege/{AudioEngine.h => AudioEngine.hpp} (100%) rename ege/{CollisionShapeCreator.h => CollisionShapeCreator.hpp} (85%) rename ege/{Environement.h => Environement.hpp} (95%) rename ege/{Game.h => Game.hpp} (71%) rename ege/{Light.h => Light.hpp} (90%) rename ege/{Material.h => Material.hpp} (92%) rename ege/{Particule.h => Particule.hpp} (95%) rename ege/{ParticuleEngine.h => ParticuleEngine.hpp} (97%) rename ege/{ParticuleSimple.h => ParticuleSimple.hpp} (89%) rename ege/{Ray.h => Ray.hpp} (94%) rename ege/camera/{Camera.h => Camera.hpp} (96%) rename ege/camera/{FPS.h => FPS.hpp} (100%) rename ege/camera/{View.h => View.hpp} (98%) rename ege/{debug.h => debug.hpp} (97%) rename ege/elements/{Element.h => Element.hpp} (95%) rename ege/elements/{ElementBase.h => ElementBase.hpp} (96%) rename ege/elements/{ElementPhysic.h => ElementPhysic.hpp} (93%) rename ege/physics/{Engine.h => Engine.hpp} (90%) rename ege/physicsShape/{PhysicsBox.h => PhysicsBox.hpp} (92%) rename ege/physicsShape/{PhysicsCapsule.h => PhysicsCapsule.hpp} (92%) rename ege/physicsShape/{PhysicsCone.h => PhysicsCone.hpp} (92%) rename ege/physicsShape/{PhysicsConvexHull.h => PhysicsConvexHull.hpp} (92%) rename ege/physicsShape/{PhysicsCylinder.h => PhysicsCylinder.hpp} (91%) rename ege/physicsShape/{PhysicsShape.h => PhysicsShape.hpp} (94%) rename ege/physicsShape/{PhysicsSphere.h => PhysicsSphere.hpp} (92%) rename ege/resource/{Mesh.h => Mesh.hpp} (96%) rename ege/resource/{ParticuleMesh.h => ParticuleMesh.hpp} (95%) rename ege/resource/tools/{Face.h => Face.hpp} (100%) rename ege/resource/tools/{FaceIndexing.h => FaceIndexing.hpp} (100%) rename ege/resource/tools/{icoSphere.h => icoSphere.hpp} (76%) rename ege/resource/tools/{isoSphere.h => isoSphere.hpp} (76%) rename ege/resource/tools/{viewBox.h => viewBox.hpp} (75%) rename ege/widget/{Mesh.h => Mesh.hpp} (94%) rename ege/widget/{Scene.h => Scene.hpp} (86%) rename sample/CameraPosition/appl/{Windows.h => Windows.hpp} (84%) rename sample/{Collision/appl/debug.h => CameraPosition/appl/debug.hpp} (97%) rename sample/CameraPosition/appl/{main.h => main.hpp} (100%) rename sample/Collision/appl/{Windows.h => Windows.hpp} (81%) rename sample/{DoubleView/appl/debug.h => Collision/appl/debug.hpp} (97%) rename sample/Collision/appl/{main.h => main.hpp} (100%) rename sample/DoubleView/appl/{Windows.h => Windows.hpp} (80%) rename sample/{CameraPosition/appl/debug.h => DoubleView/appl/debug.hpp} (97%) rename sample/DoubleView/appl/{main.h => main.hpp} (100%) rename sample/MeshCreator/appl/{Windows.h => Windows.hpp} (84%) rename sample/MeshCreator/appl/{debug.h => debug.hpp} (97%) rename sample/MeshCreator/appl/{main.h => main.hpp} (100%) rename sample/RayTest/appl/{Windows.h => Windows.hpp} (83%) rename sample/RayTest/appl/{debug.h => debug.hpp} (97%) rename sample/RayTest/appl/{main.h => main.hpp} (100%) diff --git a/doxy_ege.py b/doxy_ege.py index 527f2cb..2585ed7 100644 --- a/doxy_ege.py +++ b/doxy_ege.py @@ -26,7 +26,7 @@ def create(target, module_name): '*operator<<*', ]) my_module.add_exclude_file([ - 'debug.h', + 'debug.hpp', ]) my_module.add_file_patterns([ '*.h', diff --git a/ege/AudioElement.cpp b/ege/AudioElement.cpp index 92fb6a2..0a42406 100644 --- a/ege/AudioElement.cpp +++ b/ege/AudioElement.cpp @@ -4,6 +4,6 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include diff --git a/ege/AudioElement.h b/ege/AudioElement.hpp similarity index 100% rename from ege/AudioElement.h rename to ege/AudioElement.hpp diff --git a/ege/AudioEngine.cpp b/ege/AudioEngine.cpp index 71006f5..f294794 100644 --- a/ege/AudioEngine.cpp +++ b/ege/AudioEngine.cpp @@ -4,6 +4,6 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include diff --git a/ege/AudioEngine.h b/ege/AudioEngine.hpp similarity index 100% rename from ege/AudioEngine.h rename to ege/AudioEngine.hpp diff --git a/ege/CollisionShapeCreator.cpp b/ege/CollisionShapeCreator.cpp index 0e6b51c..9607f83 100644 --- a/ege/CollisionShapeCreator.cpp +++ b/ege/CollisionShapeCreator.cpp @@ -4,20 +4,20 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include // Documentetion of bullet library : // http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_Shapes diff --git a/ege/CollisionShapeCreator.h b/ege/CollisionShapeCreator.hpp similarity index 85% rename from ege/CollisionShapeCreator.h rename to ege/CollisionShapeCreator.hpp index f6b03f7..acb2371 100644 --- a/ege/CollisionShapeCreator.h +++ b/ege/CollisionShapeCreator.hpp @@ -5,8 +5,8 @@ */ #pragma once -#include -#include +#include +#include #include namespace ege { diff --git a/ege/Environement.cpp b/ege/Environement.cpp index 2661b12..23e3d42 100644 --- a/ege/Environement.cpp +++ b/ege/Environement.cpp @@ -4,13 +4,13 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include #include diff --git a/ege/Environement.h b/ege/Environement.hpp similarity index 95% rename from ege/Environement.h rename to ege/Environement.hpp index 44f0d1b..ca9dc09 100644 --- a/ege/Environement.h +++ b/ege/Environement.hpp @@ -9,23 +9,23 @@ namespace ege { class Environement; class ElementInteraction; }; -#include -#include +#include +#include -#include +#include #include class btDynamicsWorld; #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ege { class Element; diff --git a/ege/Game.h b/ege/Game.hpp similarity index 71% rename from ege/Game.h rename to ege/Game.hpp index 9da9c0d..cd15083 100644 --- a/ege/Game.h +++ b/ege/Game.hpp @@ -5,17 +5,17 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include class btBroadphaseInterface; class btCollisionShape; @@ -27,7 +27,7 @@ class btDefaultCollisionConfiguration; class btDynamicsWorld; #include class btVector3; -#include +#include namespace ege { enum gameStatus { diff --git a/ege/Light.cpp b/ege/Light.cpp index 1a7051e..492189d 100644 --- a/ege/Light.cpp +++ b/ege/Light.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include ege::Light::Light() : m_direction(0,0,0), diff --git a/ege/Light.h b/ege/Light.hpp similarity index 90% rename from ege/Light.h rename to ege/Light.hpp index f7f07b3..a80226f 100644 --- a/ege/Light.h +++ b/ege/Light.hpp @@ -5,10 +5,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace ege { class Light { diff --git a/ege/Material.cpp b/ege/Material.cpp index 619cbe7..d6b18ad 100644 --- a/ege/Material.cpp +++ b/ege/Material.cpp @@ -4,9 +4,9 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include +#include +#include +#include ege::MaterialGlId::MaterialGlId() : m_GL_ambientFactor(0), diff --git a/ege/Material.h b/ege/Material.hpp similarity index 92% rename from ege/Material.h rename to ege/Material.hpp index 42b24e1..229852f 100644 --- a/ege/Material.h +++ b/ege/Material.hpp @@ -5,11 +5,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace ege { /** diff --git a/ege/Particule.cpp b/ege/Particule.cpp index 49df96e..0667376 100644 --- a/ege/Particule.cpp +++ b/ege/Particule.cpp @@ -4,9 +4,9 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include +#include +#include +#include ege::Particule::Particule(ege::ParticuleEngine* _particuleEngine, const char* _particuleType) : m_particuleEngine(_particuleEngine), diff --git a/ege/Particule.h b/ege/Particule.hpp similarity index 95% rename from ege/Particule.h rename to ege/Particule.hpp index 6a2d436..968daa5 100644 --- a/ege/Particule.h +++ b/ege/Particule.hpp @@ -9,9 +9,9 @@ namespace ege { class ParticuleEngine; }; -#include -#include -#include +#include +#include +#include namespace ege { diff --git a/ege/ParticuleEngine.cpp b/ege/ParticuleEngine.cpp index c0043be..d9c0e42 100644 --- a/ege/ParticuleEngine.cpp +++ b/ege/ParticuleEngine.cpp @@ -4,10 +4,10 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include +#include +#include +#include +#include ege::ParticuleEngine::ParticuleEngine(ege::Environement* _env) : m_env(_env) { diff --git a/ege/ParticuleEngine.h b/ege/ParticuleEngine.hpp similarity index 97% rename from ege/ParticuleEngine.h rename to ege/ParticuleEngine.hpp index 05cef1d..aa49895 100644 --- a/ege/ParticuleEngine.h +++ b/ege/ParticuleEngine.hpp @@ -8,9 +8,9 @@ namespace ege { class Environement; class Particule; }; -#include +#include #include -#include +#include namespace ege { class ParticuleEngine { diff --git a/ege/ParticuleSimple.cpp b/ege/ParticuleSimple.cpp index 306bbd4..cd379f4 100644 --- a/ege/ParticuleSimple.cpp +++ b/ege/ParticuleSimple.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include ege::ParticuleSimple::ParticuleSimple(ege::ParticuleEngine* _particuleEngine, const char* _particuleType) : Particule(_particuleEngine, _particuleType) { diff --git a/ege/ParticuleSimple.h b/ege/ParticuleSimple.hpp similarity index 89% rename from ege/ParticuleSimple.h rename to ege/ParticuleSimple.hpp index 964a967..ead7a06 100644 --- a/ege/ParticuleSimple.h +++ b/ege/ParticuleSimple.hpp @@ -9,12 +9,12 @@ namespace ege { class ParticuleSimple; }; -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ege { diff --git a/ege/Ray.cpp b/ege/Ray.cpp index 8005222..04a9f67 100644 --- a/ege/Ray.cpp +++ b/ege/Ray.cpp @@ -3,10 +3,10 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/ege/Ray.h b/ege/Ray.hpp similarity index 94% rename from ege/Ray.h rename to ege/Ray.hpp index 585c223..59478fc 100644 --- a/ege/Ray.h +++ b/ege/Ray.hpp @@ -5,13 +5,13 @@ */ #pragma once -#include +#include namespace ege { class Ray; class Element; }; -#include -#include +#include +#include namespace ege { class Ray { diff --git a/ege/camera/Camera.cpp b/ege/camera/Camera.cpp index a4695a4..9fe3939 100644 --- a/ege/camera/Camera.cpp +++ b/ege/camera/Camera.cpp @@ -5,10 +5,10 @@ */ -#include -#include +#include +#include -#include +#include ege::Camera::Camera() : m_aspectRatio(0.5), diff --git a/ege/camera/Camera.h b/ege/camera/Camera.hpp similarity index 96% rename from ege/camera/Camera.h rename to ege/camera/Camera.hpp index 7149bf6..a427418 100644 --- a/ege/camera/Camera.h +++ b/ege/camera/Camera.hpp @@ -6,12 +6,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace ege { diff --git a/ege/camera/FPS.h b/ege/camera/FPS.hpp similarity index 100% rename from ege/camera/FPS.h rename to ege/camera/FPS.hpp diff --git a/ege/camera/View.cpp b/ege/camera/View.cpp index 12284f4..7f19f52 100644 --- a/ege/camera/View.cpp +++ b/ege/camera/View.cpp @@ -5,9 +5,9 @@ */ -#include -#include -#include +#include +#include +#include void ege::camera::View::update() { //m_matrix = etk::matLookAt(m_eye, m_target, m_up); diff --git a/ege/camera/View.h b/ege/camera/View.hpp similarity index 98% rename from ege/camera/View.h rename to ege/camera/View.hpp index 54f448d..d99b9da 100644 --- a/ege/camera/View.h +++ b/ege/camera/View.hpp @@ -5,7 +5,7 @@ */ #pragma once -#include +#include namespace ege { namespace camera { diff --git a/ege/debug.cpp b/ege/debug.cpp index 8cbc451..ff2efc2 100644 --- a/ege/debug.cpp +++ b/ege/debug.cpp @@ -4,7 +4,7 @@ * @license APACHE v2.0 (see license file) */ -#include +#include int32_t ege::getLogId() { static int32_t g_val = elog::registerInstance("ege"); diff --git a/ege/debug.h b/ege/debug.hpp similarity index 97% rename from ege/debug.h rename to ege/debug.hpp index f611f49..64c0d57 100644 --- a/ege/debug.h +++ b/ege/debug.hpp @@ -5,7 +5,7 @@ */ #pragma once -#include +#include namespace ege { int32_t getLogId(); diff --git a/ege/elements/Element.cpp b/ege/elements/Element.cpp index cfdca36..7a7077e 100644 --- a/ege/elements/Element.cpp +++ b/ege/elements/Element.cpp @@ -4,10 +4,10 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -21,7 +21,7 @@ #include #include -#include +#include const std::string& ege::Element::getType() const { diff --git a/ege/elements/Element.h b/ege/elements/Element.hpp similarity index 95% rename from ege/elements/Element.h rename to ege/elements/Element.hpp index 70aac08..b563833 100644 --- a/ege/elements/Element.h +++ b/ege/elements/Element.hpp @@ -5,18 +5,18 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #define INDEX_RIGHT_AXIS (0) #define INDEX_FORWARD_AXIS (1) diff --git a/ege/elements/ElementBase.cpp b/ege/elements/ElementBase.cpp index 7f666bb..e6aa063 100644 --- a/ege/elements/ElementBase.cpp +++ b/ege/elements/ElementBase.cpp @@ -5,8 +5,8 @@ */ -#include -#include +#include +#include ege::ElementBase::ElementBase(const ememory::SharedPtr& _env) : ege::Element(_env), diff --git a/ege/elements/ElementBase.h b/ege/elements/ElementBase.hpp similarity index 96% rename from ege/elements/ElementBase.h rename to ege/elements/ElementBase.hpp index 2da3e10..62047a0 100644 --- a/ege/elements/ElementBase.h +++ b/ege/elements/ElementBase.hpp @@ -5,7 +5,7 @@ */ #pragma once -#include +#include namespace ege { diff --git a/ege/elements/ElementPhysic.cpp b/ege/elements/ElementPhysic.cpp index 472abc0..45cfaa1 100644 --- a/ege/elements/ElementPhysic.cpp +++ b/ege/elements/ElementPhysic.cpp @@ -4,10 +4,10 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -21,7 +21,7 @@ #include #include -#include +#include const std::string& ege::ElementPhysic::getType() const { static const std::string nameType("----"); diff --git a/ege/elements/ElementPhysic.h b/ege/elements/ElementPhysic.hpp similarity index 93% rename from ege/elements/ElementPhysic.h rename to ege/elements/ElementPhysic.hpp index 602a3a2..8466800 100644 --- a/ege/elements/ElementPhysic.h +++ b/ege/elements/ElementPhysic.hpp @@ -5,19 +5,19 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/ege/physics/Engine.cpp b/ege/physics/Engine.cpp index a335f75..41f1984 100644 --- a/ege/physics/Engine.cpp +++ b/ege/physics/Engine.cpp @@ -4,12 +4,12 @@ * @license APACHE v2.0 (see license file) */ -#include +#include -#include +#include -#include -#include +#include +#include #include #include #include @@ -23,7 +23,7 @@ #include #include -#include +#include // unique callback function : diff --git a/ege/physics/Engine.h b/ege/physics/Engine.hpp similarity index 90% rename from ege/physics/Engine.h rename to ege/physics/Engine.hpp index 7b4ea88..22130bd 100644 --- a/ege/physics/Engine.h +++ b/ege/physics/Engine.hpp @@ -10,16 +10,16 @@ namespace ege { class Engine; }; }; -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class btBroadphaseInterface; diff --git a/ege/physicsShape/PhysicsBox.cpp b/ege/physicsShape/PhysicsBox.cpp index 660ac7f..b540ac4 100644 --- a/ege/physicsShape/PhysicsBox.cpp +++ b/ege/physicsShape/PhysicsBox.cpp @@ -3,8 +3,8 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include bool ege::PhysicsBox::parse(const char* _line) { diff --git a/ege/physicsShape/PhysicsBox.h b/ege/physicsShape/PhysicsBox.hpp similarity index 92% rename from ege/physicsShape/PhysicsBox.h rename to ege/physicsShape/PhysicsBox.hpp index e0831d7..0ff0609 100644 --- a/ege/physicsShape/PhysicsBox.h +++ b/ege/physicsShape/PhysicsBox.hpp @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include +#include namespace ege { class PhysicsBox : public ege::PhysicsShape { diff --git a/ege/physicsShape/PhysicsCapsule.cpp b/ege/physicsShape/PhysicsCapsule.cpp index 828383d..64ec2bf 100644 --- a/ege/physicsShape/PhysicsCapsule.cpp +++ b/ege/physicsShape/PhysicsCapsule.cpp @@ -3,8 +3,8 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include diff --git a/ege/physicsShape/PhysicsCapsule.h b/ege/physicsShape/PhysicsCapsule.hpp similarity index 92% rename from ege/physicsShape/PhysicsCapsule.h rename to ege/physicsShape/PhysicsCapsule.hpp index 42858e2..2b92a98 100644 --- a/ege/physicsShape/PhysicsCapsule.h +++ b/ege/physicsShape/PhysicsCapsule.hpp @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include +#include namespace ege { diff --git a/ege/physicsShape/PhysicsCone.cpp b/ege/physicsShape/PhysicsCone.cpp index 0e950e3..968105e 100644 --- a/ege/physicsShape/PhysicsCone.cpp +++ b/ege/physicsShape/PhysicsCone.cpp @@ -3,8 +3,8 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include diff --git a/ege/physicsShape/PhysicsCone.h b/ege/physicsShape/PhysicsCone.hpp similarity index 92% rename from ege/physicsShape/PhysicsCone.h rename to ege/physicsShape/PhysicsCone.hpp index d888597..0583e04 100644 --- a/ege/physicsShape/PhysicsCone.h +++ b/ege/physicsShape/PhysicsCone.hpp @@ -5,8 +5,8 @@ */ #pragma once -#include -#include +#include +#include namespace ege { class PhysicsCone : public ege::PhysicsShape { diff --git a/ege/physicsShape/PhysicsConvexHull.cpp b/ege/physicsShape/PhysicsConvexHull.cpp index c9400a6..c785ff6 100644 --- a/ege/physicsShape/PhysicsConvexHull.cpp +++ b/ege/physicsShape/PhysicsConvexHull.cpp @@ -3,8 +3,8 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include diff --git a/ege/physicsShape/PhysicsConvexHull.h b/ege/physicsShape/PhysicsConvexHull.hpp similarity index 92% rename from ege/physicsShape/PhysicsConvexHull.h rename to ege/physicsShape/PhysicsConvexHull.hpp index dbd7592..238e30a 100644 --- a/ege/physicsShape/PhysicsConvexHull.h +++ b/ege/physicsShape/PhysicsConvexHull.hpp @@ -5,8 +5,8 @@ */ #pragma once -#include -#include +#include +#include namespace ege { class PhysicsConvexHull : public ege::PhysicsShape { diff --git a/ege/physicsShape/PhysicsCylinder.cpp b/ege/physicsShape/PhysicsCylinder.cpp index 28bb27e..1dccedb 100644 --- a/ege/physicsShape/PhysicsCylinder.cpp +++ b/ege/physicsShape/PhysicsCylinder.cpp @@ -3,8 +3,8 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include bool ege::PhysicsCylinder::parse(const char* _line) { diff --git a/ege/physicsShape/PhysicsCylinder.h b/ege/physicsShape/PhysicsCylinder.hpp similarity index 91% rename from ege/physicsShape/PhysicsCylinder.h rename to ege/physicsShape/PhysicsCylinder.hpp index 7d07fac..3876e68 100644 --- a/ege/physicsShape/PhysicsCylinder.h +++ b/ege/physicsShape/PhysicsCylinder.hpp @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include +#include namespace ege { diff --git a/ege/physicsShape/PhysicsShape.cpp b/ege/physicsShape/PhysicsShape.cpp index 4a4f12a..f5c7504 100644 --- a/ege/physicsShape/PhysicsShape.cpp +++ b/ege/physicsShape/PhysicsShape.cpp @@ -3,14 +3,14 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include ememory::SharedPtr ege::PhysicsShape::create(const std::string& _name) { diff --git a/ege/physicsShape/PhysicsShape.h b/ege/physicsShape/PhysicsShape.hpp similarity index 94% rename from ege/physicsShape/PhysicsShape.h rename to ege/physicsShape/PhysicsShape.hpp index 3f70b71..2f52862 100644 --- a/ege/physicsShape/PhysicsShape.h +++ b/ege/physicsShape/PhysicsShape.hpp @@ -5,11 +5,10 @@ */ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include namespace ege { diff --git a/ege/physicsShape/PhysicsSphere.cpp b/ege/physicsShape/PhysicsSphere.cpp index ed7d07d..5a09178 100644 --- a/ege/physicsShape/PhysicsSphere.cpp +++ b/ege/physicsShape/PhysicsSphere.cpp @@ -3,8 +3,8 @@ * @copyright 2011, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include diff --git a/ege/physicsShape/PhysicsSphere.h b/ege/physicsShape/PhysicsSphere.hpp similarity index 92% rename from ege/physicsShape/PhysicsSphere.h rename to ege/physicsShape/PhysicsSphere.hpp index d135404..425422f 100644 --- a/ege/physicsShape/PhysicsSphere.h +++ b/ege/physicsShape/PhysicsSphere.hpp @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include +#include namespace ege { diff --git a/ege/resource/Mesh.cpp b/ege/resource/Mesh.cpp index 3034f02..4c10e33 100644 --- a/ege/resource/Mesh.cpp +++ b/ege/resource/Mesh.cpp @@ -4,14 +4,14 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include ege::resource::Mesh::Mesh() : m_normalMode(normalModeNone), diff --git a/ege/resource/Mesh.h b/ege/resource/Mesh.hpp similarity index 96% rename from ege/resource/Mesh.h rename to ege/resource/Mesh.hpp index fce6c61..d2c0983 100644 --- a/ege/resource/Mesh.h +++ b/ege/resource/Mesh.hpp @@ -5,19 +5,19 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include // VBO table property: #define MESH_VBO_VERTICES (0) #define MESH_VBO_TEXTURE (1) diff --git a/ege/resource/MeshCube.cpp b/ege/resource/MeshCube.cpp index 5b676d2..eefddd0 100644 --- a/ege/resource/MeshCube.cpp +++ b/ege/resource/MeshCube.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include ememory::SharedPtr ege::resource::Mesh::createCube(float _size, const std::string& _materialName, const etk::Color& _color) { EGE_ERROR(" create a cube _size=" << _size << " _materialName=" << _materialName << " _color=" << _color); diff --git a/ege/resource/MeshEmf.cpp b/ege/resource/MeshEmf.cpp index a4e680e..ed3deff 100644 --- a/ege/resource/MeshEmf.cpp +++ b/ege/resource/MeshEmf.cpp @@ -4,9 +4,9 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include +#include +#include +#include diff --git a/ege/resource/MeshGird.cpp b/ege/resource/MeshGird.cpp index 3fe8f8c..054bbb1 100644 --- a/ege/resource/MeshGird.cpp +++ b/ege/resource/MeshGird.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include ememory::SharedPtr ege::resource::Mesh::createGrid(int32_t _lineCount, const vec3& _position, float _size, const std::string& _materialName) { ememory::SharedPtr out = ege::resource::Mesh::create("---", "DATA:color3.prog"); diff --git a/ege/resource/MeshObj.cpp b/ege/resource/MeshObj.cpp index 76b8969..d361fed 100644 --- a/ege/resource/MeshObj.cpp +++ b/ege/resource/MeshObj.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include bool ege::resource::Mesh::loadOBJ(const std::string& _fileName) { diff --git a/ege/resource/ParticuleMesh.cpp b/ege/resource/ParticuleMesh.cpp index cdb4ff1..6d22132 100644 --- a/ege/resource/ParticuleMesh.cpp +++ b/ege/resource/ParticuleMesh.cpp @@ -4,10 +4,10 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include +#include +#include +#include +#include ege::resource::ParticuleMesh::ParticuleMesh() { addResourceType("ege::resource::ParticuleMesh"); diff --git a/ege/resource/ParticuleMesh.h b/ege/resource/ParticuleMesh.hpp similarity index 95% rename from ege/resource/ParticuleMesh.h rename to ege/resource/ParticuleMesh.hpp index 5a45162..641e582 100644 --- a/ege/resource/ParticuleMesh.h +++ b/ege/resource/ParticuleMesh.hpp @@ -5,7 +5,7 @@ */ #pragma once -#include +#include namespace ege { namespace resource { diff --git a/ege/resource/tools/Face.h b/ege/resource/tools/Face.hpp similarity index 100% rename from ege/resource/tools/Face.h rename to ege/resource/tools/Face.hpp diff --git a/ege/resource/tools/FaceIndexing.h b/ege/resource/tools/FaceIndexing.hpp similarity index 100% rename from ege/resource/tools/FaceIndexing.h rename to ege/resource/tools/FaceIndexing.hpp diff --git a/ege/resource/tools/icoSphere.cpp b/ege/resource/tools/icoSphere.cpp index 5d37487..ed2bc80 100644 --- a/ege/resource/tools/icoSphere.cpp +++ b/ege/resource/tools/icoSphere.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include #include // return index of point in the middle of p1 and p2 diff --git a/ege/resource/tools/icoSphere.h b/ege/resource/tools/icoSphere.hpp similarity index 76% rename from ege/resource/tools/icoSphere.h rename to ege/resource/tools/icoSphere.hpp index bb18dda..5c55d11 100644 --- a/ege/resource/tools/icoSphere.h +++ b/ege/resource/tools/icoSphere.hpp @@ -5,10 +5,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace ege { namespace icoSphere { diff --git a/ege/resource/tools/isoSphere.cpp b/ege/resource/tools/isoSphere.cpp index ecb1f59..a8ee687 100644 --- a/ege/resource/tools/isoSphere.cpp +++ b/ege/resource/tools/isoSphere.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include void ege::isoSphere::create(etk::Hash>& _materials, etk::Hash& _listFaces, std::vector& _listVertex, std::vector& _listUV, const std::string& _materialName, int32_t _recursionLevel) { diff --git a/ege/resource/tools/isoSphere.h b/ege/resource/tools/isoSphere.hpp similarity index 76% rename from ege/resource/tools/isoSphere.h rename to ege/resource/tools/isoSphere.hpp index acea0d3..fcd1dae 100644 --- a/ege/resource/tools/isoSphere.h +++ b/ege/resource/tools/isoSphere.hpp @@ -5,10 +5,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace ege { namespace isoSphere { diff --git a/ege/resource/tools/viewBox.cpp b/ege/resource/tools/viewBox.cpp index fd0fba2..a421e93 100644 --- a/ege/resource/tools/viewBox.cpp +++ b/ege/resource/tools/viewBox.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include diff --git a/ege/resource/tools/viewBox.h b/ege/resource/tools/viewBox.hpp similarity index 75% rename from ege/resource/tools/viewBox.h rename to ege/resource/tools/viewBox.hpp index e36fba2..fbf8371 100644 --- a/ege/resource/tools/viewBox.h +++ b/ege/resource/tools/viewBox.hpp @@ -5,10 +5,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace ege { namespace viewBox { diff --git a/ege/widget/Mesh.cpp b/ege/widget/Mesh.cpp index f549985..b83a5ce 100644 --- a/ege/widget/Mesh.cpp +++ b/ege/widget/Mesh.cpp @@ -4,10 +4,10 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include +#include +#include +#include +#include ege::widget::Mesh::Mesh(): signalPressed(this, "pressed", ""), diff --git a/ege/widget/Mesh.h b/ege/widget/Mesh.hpp similarity index 94% rename from ege/widget/Mesh.h rename to ege/widget/Mesh.hpp index fc16503..798ece2 100644 --- a/ege/widget/Mesh.h +++ b/ege/widget/Mesh.hpp @@ -5,9 +5,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include namespace ege { namespace widget { diff --git a/ege/widget/Scene.cpp b/ege/widget/Scene.cpp index 4d7081b..5c89397 100644 --- a/ege/widget/Scene.cpp +++ b/ege/widget/Scene.cpp @@ -4,14 +4,14 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/ege/widget/Scene.h b/ege/widget/Scene.hpp similarity index 86% rename from ege/widget/Scene.h rename to ege/widget/Scene.hpp index 872405a..aced1ac 100644 --- a/ege/widget/Scene.h +++ b/ege/widget/Scene.hpp @@ -5,17 +5,17 @@ */ #pragma once -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include class btBroadphaseInterface; class btCollisionShape; @@ -27,8 +27,8 @@ class btDefaultCollisionConfiguration; class btDynamicsWorld; #include class btVector3; -#include -#include +#include +#include namespace ege { namespace widget { diff --git a/lutin_ege.py b/lutin_ege.py index 925ce82..8d9c826 100644 --- a/lutin_ege.py +++ b/lutin_ege.py @@ -71,40 +71,40 @@ def create(target, module_name): '-Wmissing-field-initializers', '-Wall']) my_module.add_header_file([ - 'ege/debug.h', - 'ege/AudioElement.h', - 'ege/AudioEngine.h', - 'ege/camera/Camera.h', - 'ege/camera/View.h', - 'ege/camera/FPS.h', - 'ege/CollisionShapeCreator.h', - 'ege/physics/Engine.h', - 'ege/elements/Element.h', - 'ege/elements/ElementBase.h', - 'ege/elements/ElementPhysic.h', - 'ege/Particule.h', - 'ege/ParticuleEngine.h', - 'ege/ParticuleSimple.h', - 'ege/widget/Mesh.h', - 'ege/widget/Scene.h', - 'ege/Environement.h', - 'ege/resource/Mesh.h', - 'ege/resource/ParticuleMesh.h', - 'ege/resource/tools/icoSphere.h', - 'ege/resource/tools/isoSphere.h', - 'ege/resource/tools/viewBox.h', - 'ege/resource/tools/Face.h', - 'ege/resource/tools/FaceIndexing.h', - 'ege/Light.h', - 'ege/Material.h', - 'ege/physicsShape/PhysicsShape.h', - 'ege/physicsShape/PhysicsBox.h', - 'ege/physicsShape/PhysicsCapsule.h', - 'ege/physicsShape/PhysicsCone.h', - 'ege/physicsShape/PhysicsConvexHull.h', - 'ege/physicsShape/PhysicsCylinder.h', - 'ege/physicsShape/PhysicsSphere.h', - 'ege/Ray.h', + 'ege/debug.hpp', + 'ege/AudioElement.hpp', + 'ege/AudioEngine.hpp', + 'ege/camera/Camera.hpp', + 'ege/camera/View.hpp', + 'ege/camera/FPS.hpp', + 'ege/CollisionShapeCreator.hpp', + 'ege/physics/Engine.hpp', + 'ege/elements/Element.hpp', + 'ege/elements/ElementBase.hpp', + 'ege/elements/ElementPhysic.hpp', + 'ege/Particule.hpp', + 'ege/ParticuleEngine.hpp', + 'ege/ParticuleSimple.hpp', + 'ege/widget/Mesh.hpp', + 'ege/widget/Scene.hpp', + 'ege/Environement.hpp', + 'ege/resource/Mesh.hpp', + 'ege/resource/ParticuleMesh.hpp', + 'ege/resource/tools/icoSphere.hpp', + 'ege/resource/tools/isoSphere.hpp', + 'ege/resource/tools/viewBox.hpp', + 'ege/resource/tools/Face.hpp', + 'ege/resource/tools/FaceIndexing.hpp', + 'ege/Light.hpp', + 'ege/Material.hpp', + 'ege/physicsShape/PhysicsShape.hpp', + 'ege/physicsShape/PhysicsBox.hpp', + 'ege/physicsShape/PhysicsCapsule.hpp', + 'ege/physicsShape/PhysicsCone.hpp', + 'ege/physicsShape/PhysicsConvexHull.hpp', + 'ege/physicsShape/PhysicsCylinder.hpp', + 'ege/physicsShape/PhysicsSphere.hpp', + 'ege/Ray.hpp', ]) my_module.add_path(tools.get_current_path(__file__)) return my_module diff --git a/sample/CameraPosition/appl/Windows.cpp b/sample/CameraPosition/appl/Windows.cpp index a29c8d1..014eabb 100644 --- a/sample/CameraPosition/appl/Windows.cpp +++ b/sample/CameraPosition/appl/Windows.cpp @@ -6,16 +6,16 @@ * @license APACHE-2 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include appl::Windows::Windows() { addObjectType("appl::Windows"); diff --git a/sample/CameraPosition/appl/Windows.h b/sample/CameraPosition/appl/Windows.hpp similarity index 84% rename from sample/CameraPosition/appl/Windows.h rename to sample/CameraPosition/appl/Windows.hpp index 8bdb00c..e7fc7da 100644 --- a/sample/CameraPosition/appl/Windows.h +++ b/sample/CameraPosition/appl/Windows.hpp @@ -7,9 +7,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include namespace appl { class Windows : public ewol::widget::Windows { diff --git a/sample/CameraPosition/appl/debug.cpp b/sample/CameraPosition/appl/debug.cpp index 283ee11..8b5c12c 100644 --- a/sample/CameraPosition/appl/debug.cpp +++ b/sample/CameraPosition/appl/debug.cpp @@ -7,7 +7,7 @@ */ -#include +#include int32_t appl::getLogId() { static int32_t g_val = elog::registerInstance("GP-spaceShip"); diff --git a/sample/Collision/appl/debug.h b/sample/CameraPosition/appl/debug.hpp similarity index 97% rename from sample/Collision/appl/debug.h rename to sample/CameraPosition/appl/debug.hpp index 3c863ac..34796be 100644 --- a/sample/Collision/appl/debug.h +++ b/sample/CameraPosition/appl/debug.hpp @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); diff --git a/sample/CameraPosition/appl/main.cpp b/sample/CameraPosition/appl/main.cpp index e0b1f4c..6ffe844 100644 --- a/sample/CameraPosition/appl/main.cpp +++ b/sample/CameraPosition/appl/main.cpp @@ -7,15 +7,15 @@ */ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class MainApplication : public ewol::context::Application { diff --git a/sample/CameraPosition/appl/main.h b/sample/CameraPosition/appl/main.hpp similarity index 100% rename from sample/CameraPosition/appl/main.h rename to sample/CameraPosition/appl/main.hpp diff --git a/sample/Collision/appl/Windows.cpp b/sample/Collision/appl/Windows.cpp index b76b71a..f616430 100644 --- a/sample/Collision/appl/Windows.cpp +++ b/sample/Collision/appl/Windows.cpp @@ -6,19 +6,19 @@ * @license APACHE-2 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include appl::Windows::Windows() { addObjectType("appl::Windows"); diff --git a/sample/Collision/appl/Windows.h b/sample/Collision/appl/Windows.hpp similarity index 81% rename from sample/Collision/appl/Windows.h rename to sample/Collision/appl/Windows.hpp index 78df1fc..5c77c4c 100644 --- a/sample/Collision/appl/Windows.h +++ b/sample/Collision/appl/Windows.hpp @@ -7,10 +7,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace appl { class Windows : public ewol::widget::Windows { diff --git a/sample/Collision/appl/debug.cpp b/sample/Collision/appl/debug.cpp index 283ee11..8b5c12c 100644 --- a/sample/Collision/appl/debug.cpp +++ b/sample/Collision/appl/debug.cpp @@ -7,7 +7,7 @@ */ -#include +#include int32_t appl::getLogId() { static int32_t g_val = elog::registerInstance("GP-spaceShip"); diff --git a/sample/DoubleView/appl/debug.h b/sample/Collision/appl/debug.hpp similarity index 97% rename from sample/DoubleView/appl/debug.h rename to sample/Collision/appl/debug.hpp index 3c863ac..34796be 100644 --- a/sample/DoubleView/appl/debug.h +++ b/sample/Collision/appl/debug.hpp @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); diff --git a/sample/Collision/appl/main.cpp b/sample/Collision/appl/main.cpp index e0b1f4c..6ffe844 100644 --- a/sample/Collision/appl/main.cpp +++ b/sample/Collision/appl/main.cpp @@ -7,15 +7,15 @@ */ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class MainApplication : public ewol::context::Application { diff --git a/sample/Collision/appl/main.h b/sample/Collision/appl/main.hpp similarity index 100% rename from sample/Collision/appl/main.h rename to sample/Collision/appl/main.hpp diff --git a/sample/DoubleView/appl/Windows.cpp b/sample/DoubleView/appl/Windows.cpp index b31436f..da5d0c0 100644 --- a/sample/DoubleView/appl/Windows.cpp +++ b/sample/DoubleView/appl/Windows.cpp @@ -6,19 +6,19 @@ * @license APACHE-2 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include appl::Windows::Windows() { addObjectType("appl::Windows"); diff --git a/sample/DoubleView/appl/Windows.h b/sample/DoubleView/appl/Windows.hpp similarity index 80% rename from sample/DoubleView/appl/Windows.h rename to sample/DoubleView/appl/Windows.hpp index 5857749..31f3c25 100644 --- a/sample/DoubleView/appl/Windows.h +++ b/sample/DoubleView/appl/Windows.hpp @@ -7,10 +7,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace appl { class Windows : public ewol::widget::Windows { diff --git a/sample/DoubleView/appl/debug.cpp b/sample/DoubleView/appl/debug.cpp index 283ee11..8b5c12c 100644 --- a/sample/DoubleView/appl/debug.cpp +++ b/sample/DoubleView/appl/debug.cpp @@ -7,7 +7,7 @@ */ -#include +#include int32_t appl::getLogId() { static int32_t g_val = elog::registerInstance("GP-spaceShip"); diff --git a/sample/CameraPosition/appl/debug.h b/sample/DoubleView/appl/debug.hpp similarity index 97% rename from sample/CameraPosition/appl/debug.h rename to sample/DoubleView/appl/debug.hpp index 3c863ac..34796be 100644 --- a/sample/CameraPosition/appl/debug.h +++ b/sample/DoubleView/appl/debug.hpp @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); diff --git a/sample/DoubleView/appl/main.cpp b/sample/DoubleView/appl/main.cpp index e0b1f4c..6ffe844 100644 --- a/sample/DoubleView/appl/main.cpp +++ b/sample/DoubleView/appl/main.cpp @@ -7,15 +7,15 @@ */ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class MainApplication : public ewol::context::Application { diff --git a/sample/DoubleView/appl/main.h b/sample/DoubleView/appl/main.hpp similarity index 100% rename from sample/DoubleView/appl/main.h rename to sample/DoubleView/appl/main.hpp diff --git a/sample/MeshCreator/appl/Windows.cpp b/sample/MeshCreator/appl/Windows.cpp index cc176fe..9a5c88c 100644 --- a/sample/MeshCreator/appl/Windows.cpp +++ b/sample/MeshCreator/appl/Windows.cpp @@ -6,16 +6,16 @@ * @license APACHE-2 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include appl::Windows::Windows() { addObjectType("appl::Windows"); diff --git a/sample/MeshCreator/appl/Windows.h b/sample/MeshCreator/appl/Windows.hpp similarity index 84% rename from sample/MeshCreator/appl/Windows.h rename to sample/MeshCreator/appl/Windows.hpp index 8bdb00c..e7fc7da 100644 --- a/sample/MeshCreator/appl/Windows.h +++ b/sample/MeshCreator/appl/Windows.hpp @@ -7,9 +7,9 @@ */ #pragma once -#include -#include -#include +#include +#include +#include namespace appl { class Windows : public ewol::widget::Windows { diff --git a/sample/MeshCreator/appl/debug.cpp b/sample/MeshCreator/appl/debug.cpp index 283ee11..8b5c12c 100644 --- a/sample/MeshCreator/appl/debug.cpp +++ b/sample/MeshCreator/appl/debug.cpp @@ -7,7 +7,7 @@ */ -#include +#include int32_t appl::getLogId() { static int32_t g_val = elog::registerInstance("GP-spaceShip"); diff --git a/sample/MeshCreator/appl/debug.h b/sample/MeshCreator/appl/debug.hpp similarity index 97% rename from sample/MeshCreator/appl/debug.h rename to sample/MeshCreator/appl/debug.hpp index 3c863ac..34796be 100644 --- a/sample/MeshCreator/appl/debug.h +++ b/sample/MeshCreator/appl/debug.hpp @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); diff --git a/sample/MeshCreator/appl/main.cpp b/sample/MeshCreator/appl/main.cpp index e0b1f4c..6ffe844 100644 --- a/sample/MeshCreator/appl/main.cpp +++ b/sample/MeshCreator/appl/main.cpp @@ -7,15 +7,15 @@ */ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class MainApplication : public ewol::context::Application { diff --git a/sample/MeshCreator/appl/main.h b/sample/MeshCreator/appl/main.hpp similarity index 100% rename from sample/MeshCreator/appl/main.h rename to sample/MeshCreator/appl/main.hpp diff --git a/sample/RayTest/appl/Windows.cpp b/sample/RayTest/appl/Windows.cpp index 8a2b1ea..33673f6 100644 --- a/sample/RayTest/appl/Windows.cpp +++ b/sample/RayTest/appl/Windows.cpp @@ -6,18 +6,18 @@ * @license APACHE-2 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include appl::Windows::Windows() : m_angleTetha(0), diff --git a/sample/RayTest/appl/Windows.h b/sample/RayTest/appl/Windows.hpp similarity index 83% rename from sample/RayTest/appl/Windows.h rename to sample/RayTest/appl/Windows.hpp index 65e8481..5b0035a 100644 --- a/sample/RayTest/appl/Windows.h +++ b/sample/RayTest/appl/Windows.hpp @@ -7,10 +7,10 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace appl { class Windows : public ewol::widget::Windows { diff --git a/sample/RayTest/appl/debug.cpp b/sample/RayTest/appl/debug.cpp index 283ee11..8b5c12c 100644 --- a/sample/RayTest/appl/debug.cpp +++ b/sample/RayTest/appl/debug.cpp @@ -7,7 +7,7 @@ */ -#include +#include int32_t appl::getLogId() { static int32_t g_val = elog::registerInstance("GP-spaceShip"); diff --git a/sample/RayTest/appl/debug.h b/sample/RayTest/appl/debug.hpp similarity index 97% rename from sample/RayTest/appl/debug.h rename to sample/RayTest/appl/debug.hpp index 28cd11d..c173858 100644 --- a/sample/RayTest/appl/debug.h +++ b/sample/RayTest/appl/debug.hpp @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); diff --git a/sample/RayTest/appl/main.cpp b/sample/RayTest/appl/main.cpp index e0b1f4c..6ffe844 100644 --- a/sample/RayTest/appl/main.cpp +++ b/sample/RayTest/appl/main.cpp @@ -7,15 +7,15 @@ */ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class MainApplication : public ewol::context::Application { diff --git a/sample/RayTest/appl/main.h b/sample/RayTest/appl/main.hpp similarity index 100% rename from sample/RayTest/appl/main.h rename to sample/RayTest/appl/main.hpp