AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

controllers, ray3

Browse Source
This commit is contained in:
Irlan
2018-06-29 15:40:12 -03:00
parent 8ebdb67a75
commit b18654c7a5
10 changed files with 413 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/testbed/framework/draw.cpp
View File

@ -116,7 +116,7 @@ b3Vec2 Camera::ConvertWorldToScreen(const b3Vec3& pw3) const
return ps;
}
Ray3 Camera::ConvertScreenToWorld(const b3Vec2& ps) const
b3Ray3 Camera::ConvertScreenToWorld(const b3Vec2& ps) const
{
float32 w = m_width, h = m_height;
@ -133,7 +133,7 @@ Ray3 Camera::ConvertScreenToWorld(const b3Vec2& ps) const
b3Vec3 vw = xf.rotation * vv;
vw.Normalize();
Ray3 rw;
b3Ray3 rw;
rw.direction = vw;
rw.origin = xf.position;
rw.fraction = m_zFar;

23
examples/testbed/framework/draw.h
View File

@ -27,27 +27,6 @@ struct DrawTriangles;
struct DrawWire;
struct DrawSolid;
//
struct Ray3
{
b3Vec3 A() const;
b3Vec3 B() const;
b3Vec3 direction;
b3Vec3 origin;
float32 fraction;
};
inline b3Vec3 Ray3::A() const
{
return origin;
}
inline b3Vec3 Ray3::B() const
{
return origin + fraction * direction;
}
//
class Camera
{
@ -61,7 +40,7 @@ public:
b3Transform BuildWorldTransform() const;
b3Vec2 ConvertWorldToScreen(const b3Vec3& pw) const;
Ray3 ConvertScreenToWorld(const b3Vec2& ps) const;
b3Ray3 ConvertScreenToWorld(const b3Vec2& ps) const;
float32 m_zoom;
b3Vec3 m_center;

6
examples/testbed/framework/model.cpp
View File

@ -76,21 +76,21 @@ void Model::Command_Release_Key(int button)
void Model::Command_Press_Mouse_Left(const b3Vec2& ps)
{
Ray3 pw = m_camera.ConvertScreenToWorld(ps);
b3Ray3 pw = m_camera.ConvertScreenToWorld(ps);
m_test->MouseLeftDown(pw);
}
void Model::Command_Release_Mouse_Left(const b3Vec2& ps)
{
Ray3 pw = m_camera.ConvertScreenToWorld(ps);
b3Ray3 pw = m_camera.ConvertScreenToWorld(ps);
m_test->MouseLeftUp(pw);
}
void Model::Command_Move_Cursor(const b3Vec2& ps)
{
Ray3 pw = m_camera.ConvertScreenToWorld(ps);
b3Ray3 pw = m_camera.ConvertScreenToWorld(ps);
m_test->MouseMove(pw);
}

6
examples/testbed/framework/test.cpp
View File

@ -115,7 +115,7 @@ void Test::Step()
}
}
void Test::MouseMove(const Ray3& pw)
void Test::MouseMove(const b3Ray3& pw)
{
m_bodyRay = pw;
@ -125,7 +125,7 @@ void Test::MouseMove(const Ray3& pw)
}
}
void Test::MouseLeftDown(const Ray3& pw)
void Test::MouseLeftDown(const b3Ray3& pw)
{
if (m_bodyDragger.IsSelected() == false)
{
@ -136,7 +136,7 @@ void Test::MouseLeftDown(const Ray3& pw)
}
}
void Test::MouseLeftUp(const Ray3& pw)
void Test::MouseLeftUp(const b3Ray3& pw)
{
if (m_bodyDragger.IsSelected() == true)
{

114
examples/testbed/framework/test.h
View File

@ -48,110 +48,6 @@ public:
b3RayCastSingleOutput hit;
};
class BodyDragger
{
public:
BodyDragger(Ray3* ray, b3World* world)
{
m_ray = ray;
m_world = world;
m_shape = nullptr;
m_mouseJoint = nullptr;
}
~BodyDragger()
{
}
bool StartDragging()
{
B3_ASSERT(m_mouseJoint == nullptr);
b3RayCastSingleOutput out;
if (m_world->RayCastSingle(&out, m_ray->A(), m_ray->B()) == false)
{
return false;
}
m_x = out.fraction;
m_shape = out.shape;
b3BodyDef bd;
b3Body* groundBody = m_world->CreateBody(bd);
b3Body* body = m_shape->GetBody();
body->SetAwake(true);
b3MouseJointDef jd;
jd.bodyA = groundBody;
jd.bodyB = body;
jd.target = out.point;
jd.maxForce = 2000.0f * body->GetMass();
m_mouseJoint = (b3MouseJoint*)m_world->CreateJoint(jd);
m_p = body->GetLocalPoint(out.point);
return true;
}
void Drag()
{
B3_ASSERT(m_mouseJoint);
m_mouseJoint->SetTarget(GetPointB());
}
void StopDragging()
{
B3_ASSERT(m_mouseJoint);
b3Body* groundBody = m_mouseJoint->GetBodyA();
m_world->DestroyJoint(m_mouseJoint);
m_mouseJoint = nullptr;
m_world->DestroyBody(groundBody);
m_shape = nullptr;
}
bool IsSelected() const
{
return m_mouseJoint != nullptr;
}
Ray3* GetRay() const
{
return m_ray;
}
b3Body* GetBody() const
{
B3_ASSERT(m_shape);
return m_shape->GetBody();
}
b3Vec3 GetPointA() const
{
B3_ASSERT(m_shape);
return m_shape->GetBody()->GetWorldPoint(m_p);
}
b3Vec3 GetPointB() const
{
B3_ASSERT(m_mouseJoint);
return (1.0f - m_x) * m_ray->A() + m_x * m_ray->B();
}
private:
Ray3* m_ray;
float32 m_x;
b3World* m_world;
b3Shape* m_shape;
b3Vec3 m_p;
b3MouseJoint* m_mouseJoint;
};
class Test : public b3ContactListener
{
public:
@ -162,9 +58,9 @@ public:
virtual void Step();
virtual void MouseMove(const Ray3& pw);
virtual void MouseLeftDown(const Ray3& pw);
virtual void MouseLeftUp(const Ray3& pw);
virtual void MouseMove(const b3Ray3& pw);
virtual void MouseLeftDown(const b3Ray3& pw);
virtual void MouseLeftUp(const b3Ray3& pw);
virtual void KeyDown(int button) { }
virtual void KeyUp(int button) { }
@ -177,8 +73,8 @@ public:
b3World m_world;
Ray3 m_bodyRay;
BodyDragger m_bodyDragger;
b3Ray3 m_bodyRay;
b3BodyDragger m_bodyDragger;
b3BoxHull m_groundHull;
b3GridMesh<50, 50> m_groundMesh;