atria-soft/ege
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update of the ewol modifications

Browse Source
This commit is contained in:
Edouard DUPIN 2013-09-02 21:07:07 +02:00
parent c213ebb32b
commit 7f28ae22f2
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ege/CollisionShapeCreator.cpp
View File

@ -13,13 +13,13 @@
#include <BulletCollision/CollisionShapes/btConvexPolyhedron.h> #include <BulletCollision/CollisionShapes/btConvexPolyhedron.h>
#include <BulletCollision/CollisionShapes/btShapeHull.h> #include <BulletCollision/CollisionShapes/btShapeHull.h>
#include <BulletCollision/CollisionDispatch/btCollisionObject.h> #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
#include <ewol/renderer/resources/physicsShape/PhysicsShape.h> #include <ewol/physicsShape/PhysicsShape.h>
#include <ewol/renderer/resources/physicsShape/PhysicsBox.h> #include <ewol/physicsShape/PhysicsBox.h>
#include <ewol/renderer/resources/physicsShape/PhysicsCapsule.h> #include <ewol/physicsShape/PhysicsCapsule.h>
#include <ewol/renderer/resources/physicsShape/PhysicsCone.h> #include <ewol/physicsShape/PhysicsCone.h>
#include <ewol/renderer/resources/physicsShape/PhysicsConvexHull.h> #include <ewol/physicsShape/PhysicsConvexHull.h>
#include <ewol/renderer/resources/physicsShape/PhysicsCylinder.h> #include <ewol/physicsShape/PhysicsCylinder.h>
#include <ewol/renderer/resources/physicsShape/PhysicsSphere.h> #include <ewol/physicsShape/PhysicsSphere.h>
// Documentetion of bullet library : // Documentetion of bullet library :
// http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_Shapes // http://bulletphysics.org/mediawiki-1.5.8/index.php/Collision_Shapes

2
ege/CollisionShapeCreator.h
View File

@ -11,7 +11,7 @@
#define __EGE_COLLISION_SHAPE_CREATOR_H__ #define __EGE_COLLISION_SHAPE_CREATOR_H__
#include <etk/types.h> #include <etk/types.h>
#include <ewol/renderer/resources/Mesh.h> #include <ewol/resources/Mesh.h>
#include <BulletCollision/CollisionShapes/btCollisionShape.h> #include <BulletCollision/CollisionShapes/btCollisionShape.h>
namespace ege { namespace ege {

4
ege/ElementGame.cpp
View File

@ -10,7 +10,7 @@
#include <ege/debug.h> #include <ege/debug.h>
#include <ege/ElementGame.h> #include <ege/ElementGame.h>
#include <ege/Environement.h> #include <ege/Environement.h>
#include <ewol/renderer/ResourceManager.h> #include <ewol/resources/ResourceManager.h>
#include <BulletDynamics/Dynamics/btRigidBody.h> #include <BulletDynamics/Dynamics/btRigidBody.h>
#include <LinearMath/btDefaultMotionState.h> #include <LinearMath/btDefaultMotionState.h>
#include <BulletDynamics/Dynamics/btDynamicsWorld.h> #include <BulletDynamics/Dynamics/btDynamicsWorld.h>
@ -53,6 +53,7 @@ ege::ElementGame::ElementGame(ege::Environement& _env) :
static uint32_t unique=0; static uint32_t unique=0;
m_uID = unique; m_uID = unique;
EGE_DEBUG("Create element : uId=" << m_uID); EGE_DEBUG("Create element : uId=" << m_uID);
m_debugText.SetFontSize(12);
unique++; unique++;
} }
@ -462,7 +463,6 @@ static void DrawShape(const btCollisionShape* _shape,
void ege::ElementGame::DrawDebug(ewol::Colored3DObject* _draw, const ege::Camera& _camera) void ege::ElementGame::DrawDebug(ewol::Colored3DObject* _draw, const ege::Camera& _camera)
{ {
m_debugText.Clear(); m_debugText.Clear();
m_debugText.SetFontSize(12);
m_debugText.SetColor(0x00FF00FF); m_debugText.SetColor(0x00FF00FF);
m_debugText.SetPos(vec3(-20,32,0)); m_debugText.SetPos(vec3(-20,32,0));
m_debugText.Print(GetType()); m_debugText.Print(GetType());

2
ege/ElementGame.h
View File

@ -16,7 +16,7 @@
#include <ewol/debug.h> #include <ewol/debug.h>
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/renderer/openGL.h> #include <ewol/renderer/openGL.h>
#include <ewol/renderer/ResourceManager.h> #include <ewol/resources/ResourceManager.h>
#include <ege/Camera.h> #include <ege/Camera.h>
#include <ewol/compositing/Text.h> #include <ewol/compositing/Text.h>
#include <ege/Environement.h> #include <ege/Environement.h>

2
ege/Scene.h
View File

@ -17,7 +17,7 @@
#include <ege/Camera.h> #include <ege/Camera.h>
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
#include <ewol/renderer/openGL.h> #include <ewol/renderer/openGL.h>
#include <ewol/renderer/ResourceManager.h> #include <ewol/resources/ResourceManager.h>
#include <ege/ElementGame.h> #include <ege/ElementGame.h>
#include <ewol/Dimension.h> #include <ewol/Dimension.h>