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

make rendering code more reusable, update testbed

Browse Source
This commit is contained in:
Irlan
2018-09-23 13:22:21 -03:00
parent e2a9084df1
commit 0fbd543d96
5 changed files with 118 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,12 @@
Camera* g_camera = nullptr;
Draw* g_draw = nullptr;
u32 g_drawFlags = 0;
bool g_glDrawPoints;
bool g_glDrawLines;
bool g_glDrawTriangles;
b3Mat44 g_glViewMatrix;
b3Mat44 g_glProjectionMatrix;
Camera::Camera()
{
@ -76,7 +81,7 @@ b3Transform Camera::BuildWorldTransform() const
b3Mat44 Camera::BuildWorldMatrix() const
{
b3Transform xf = BuildWorldTransform();
return MakeMat44(xf);
return b3TransformMat44(xf);
}
b3Transform Camera::BuildViewTransform() const
@ -90,7 +95,7 @@ b3Transform Camera::BuildViewTransform() const
b3Mat44 Camera::BuildViewMatrix() const
{
b3Transform xf = BuildViewTransform();
return MakeMat44(xf);
return b3TransformMat44(xf);
}
b3Vec2 Camera::ConvertWorldToScreen(const b3Vec3& pw3) const
@ -142,6 +147,12 @@ b3Ray3 Camera::ConvertScreenToWorld(const b3Vec2& ps) const
Draw::Draw()
{
g_glViewMatrix.SetZero();
g_glProjectionMatrix.SetZero();
g_glDrawPoints = true;
g_glDrawLines = true;
g_glDrawTriangles = true;
m_points = new DrawPoints();
m_lines = new DrawLines();
m_triangles = new DrawTriangles();
@ -158,6 +169,31 @@ Draw::~Draw()
delete m_solid;
}
void Draw::SetViewMatrix(const b3Mat44& m)
{
g_glViewMatrix = m;
}
void Draw::SetProjectionMatrix(const b3Mat44& m)
{
g_glProjectionMatrix = m;
}
void Draw::EnableDrawPoints(bool flag)
{
g_glDrawPoints = flag;
}
void Draw::EnableDrawLines(bool flag)
{
g_glDrawLines = flag;
}
void Draw::EnableDrawTriangles(bool flag)
{
g_glDrawTriangles = flag;
}
void Draw::DrawPoint(const b3Vec3& p, float32 size, const b3Color& color)
{
m_points->Vertex(p, size, color);