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

[TEST] basic real display

Browse Source
This commit is contained in:
Edouard DUPIN 2013-01-14 23:27:10 +01:00
parent 38932b616b
commit 24e562454c
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sources/ewol/widget/Scene.cpp
View File

@ -9,6 +9,7 @@
#include <ewol/widget/Scene.h> #include <ewol/widget/Scene.h>
#include <math.h> #include <math.h>
#include <ewol/renderer/openGL.h> #include <ewol/renderer/openGL.h>
#include <ewol/renderer/ResourceManager.h>
#include <etk/math/Matrix4.h> #include <etk/math/Matrix4.h>
#include <BulletDynamics/Dynamics/btRigidBody.h> #include <BulletDynamics/Dynamics/btRigidBody.h>
#include <LinearMath/btDefaultMotionState.h> #include <LinearMath/btDefaultMotionState.h>
@ -32,6 +33,34 @@
#define WALK_FLAG_CAUTION (1<<4) #define WALK_FLAG_CAUTION (1<<4)
class GameElement : public btRigidBody
{
ewol::MeshObj * m_mesh;
public :
GameElement(btRigidBody::btRigidBodyConstructionInfo info, etk::UString elementName) :
btRigidBody(info),
m_mesh(NULL)
{
ewol::resource::Keep(elementName, m_mesh);
}
~GameElement(void)
{
ewol::resource::Release(m_mesh);
}
void Draw(mat4& transformMatrix)
{
if (NULL != m_mesh) {
m_mesh->Draw(transformMatrix);
}
}
};
class SceneDebugDrawer : public btIDebugDraw class SceneDebugDrawer : public btIDebugDraw
{ {
int m_debugMode; int m_debugMode;
@ -200,12 +229,12 @@ widget::Scene::Scene(btDynamicsWorld* gameEngine) :
// Create The ground // Create The ground
btBoxShape* groundShape = new btBoxShape(btVector3(btScalar(50.),btScalar(50.),btScalar(5.))); btBoxShape* groundShape = new btBoxShape(btVector3(btScalar(100.),btScalar(100.),btScalar(0.1)));
m_collisionShapes.PushBack(groundShape); m_collisionShapes.PushBack(groundShape);
btTransform groundTransform; btTransform groundTransform;
groundTransform.setIdentity(); groundTransform.setIdentity();
groundTransform.setOrigin(btVector3(0,0,-5)); groundTransform.setOrigin(btVector3(0,0,-0.1));
btScalar mass(0.0); btScalar mass(0.0);
btVector3 localInertia(0,0,0); btVector3 localInertia(0,0,0);
//rigidbody is dynamic if and only if mass is non zero, otherwise static //rigidbody is dynamic if and only if mass is non zero, otherwise static
@ -215,7 +244,7 @@ widget::Scene::Scene(btDynamicsWorld* gameEngine) :
//using motionstate is recommended, it provides interpolation capabilities, and only synchronizes 'active' objects //using motionstate is recommended, it provides interpolation capabilities, and only synchronizes 'active' objects
btDefaultMotionState* myMotionState = new btDefaultMotionState(groundTransform); btDefaultMotionState* myMotionState = new btDefaultMotionState(groundTransform);
btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,groundShape,localInertia); btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,groundShape,localInertia);
btRigidBody* body = new btRigidBody(rbInfo); GameElement* body = new GameElement(rbInfo, "DATA:grass.obj");
//add the body to the dynamics world //add the body to the dynamics world
m_dynamicsWorld->addRigidBody(body); m_dynamicsWorld->addRigidBody(body);
@ -257,11 +286,11 @@ widget::Scene::Scene(btDynamicsWorld* gameEngine) :
btDefaultMotionState* myMotionState = new btDefaultMotionState(startTransform); btDefaultMotionState* myMotionState = new btDefaultMotionState(startTransform);
if(jjj%2==0) { if(jjj%2==0) {
btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colBoxShape,localInertia); btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colBoxShape,localInertia);
btRigidBody* body = new btRigidBody(rbInfo); GameElement* body = new GameElement(rbInfo, "DATA:cube.obj");
m_dynamicsWorld->addRigidBody(body); m_dynamicsWorld->addRigidBody(body);
} else { } else {
btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colSphereShape,localInertia); btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colSphereShape,localInertia);
btRigidBody* body = new btRigidBody(rbInfo); GameElement* body = new GameElement(rbInfo, "DATA:sphere.obj");
m_dynamicsWorld->addRigidBody(body); m_dynamicsWorld->addRigidBody(body);
} }
} }
@ -781,6 +810,13 @@ void widget::Scene::renderscene(int pass)
colObj->getWorldTransform().getOpenGLMatrix(mmm); colObj->getWorldTransform().getOpenGLMatrix(mmm);
rot=colObj->getWorldTransform().getBasis(); // ==> for the sun ... rot=colObj->getWorldTransform().getBasis(); // ==> for the sun ...
} }
GameElement* tmpGameElement = static_cast<GameElement*>(body);
if (NULL != tmpGameElement) {
mat4 transformationMatrix(mmm);
transformationMatrix.Transpose();
tmpGameElement->Draw(transformationMatrix);
}
/*
btVector3 wireColor(1.f,1.0f,0.5f); //wants deactivation btVector3 wireColor(1.f,1.0f,0.5f); //wants deactivation
if(iii&1) { if(iii&1) {
wireColor=btVector3(0.f,0.0f,1.f); wireColor=btVector3(0.f,0.0f,1.f);
@ -839,6 +875,7 @@ void widget::Scene::renderscene(int pass)
break; break;
} }
} }
*/
} }
//glPopMatrix(); //glPopMatrix();
} }