From 96fe6b3d7b34798fded8ba18686821b11d28169e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Mon, 17 Sep 2018 17:25:14 -0700
Subject: [PATCH] debugdraw: Added quad.

---
 examples/common/debugdraw/debugdraw.cpp | 112 ++++++++++++++++++------
 examples/common/debugdraw/debugdraw.h   |   6 ++
 2 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/examples/common/debugdraw/debugdraw.cpp b/examples/common/debugdraw/debugdraw.cpp
index 8e9a91d6d..d5b5174b3 100644
--- a/examples/common/debugdraw/debugdraw.cpp
+++ b/examples/common/debugdraw/debugdraw.cpp
@@ -106,6 +106,21 @@ struct DebugMeshVertex
 
 bgfx::VertexDecl DebugMeshVertex::ms_decl;
 
+static DebugShapeVertex s_quadVertices[4] =
+{
+	{-1.0f, 0.0f,  1.0f, { 0, 0, 0, 0 } },
+	{ 1.0f, 0.0f,  1.0f, { 0, 0, 0, 0 } },
+	{-1.0f, 0.0f, -1.0f, { 0, 0, 0, 0 } },
+	{ 1.0f, 0.0f, -1.0f, { 0, 0, 0, 0 } },
+
+};
+
+static const uint16_t s_quadIndices[6] =
+{
+	0, 1, 2,
+	1, 3, 2,
+};
+
 static DebugShapeVertex s_cubeVertices[8] =
 {
 	{-1.0f,  1.0f,  1.0f, { 0, 0, 0, 0 } },
@@ -549,6 +564,8 @@ struct Mesh
 		Capsule2,
 		Capsule3,
 
+		Quad,
+
 		Cube,
 
 		Count,
@@ -895,6 +912,15 @@ struct DebugDrawShared
 			startIndex  += numIndices + numLineListIndices;
 		}
 
+		m_mesh[Mesh::Quad].m_startVertex = startVertex;
+		m_mesh[Mesh::Quad].m_numVertices = BX_COUNTOF(s_quadVertices);
+		m_mesh[Mesh::Quad].m_startIndex[0] = startIndex;
+		m_mesh[Mesh::Quad].m_numIndices[0] = BX_COUNTOF(s_quadIndices);
+		m_mesh[Mesh::Quad].m_startIndex[1] = 0;
+		m_mesh[Mesh::Quad].m_numIndices[1] = 0;
+		startVertex += BX_COUNTOF(s_quadVertices);
+		startIndex  += BX_COUNTOF(s_quadIndices);
+
 		m_mesh[Mesh::Cube].m_startVertex = startVertex;
 		m_mesh[Mesh::Cube].m_numVertices = BX_COUNTOF(s_cubeVertices);
 		m_mesh[Mesh::Cube].m_startIndex[0] = startIndex;
@@ -907,7 +933,7 @@ struct DebugDrawShared
 		const bgfx::Memory* vb = bgfx::alloc(startVertex*stride);
 		const bgfx::Memory* ib = bgfx::alloc(startIndex*sizeof(uint16_t) );
 
-		for (uint32_t mesh = Mesh::Sphere0; mesh < Mesh::Cube; ++mesh)
+		for (uint32_t mesh = Mesh::Sphere0; mesh < Mesh::Quad; ++mesh)
 		{
 			Mesh::Enum id = Mesh::Enum(mesh);
 			bx::memCopy(&vb->data[m_mesh[id].m_startVertex * stride]
@@ -924,6 +950,16 @@ struct DebugDrawShared
 			BX_FREE(m_allocator, indices[id]);
 		}
 
+		bx::memCopy(&vb->data[m_mesh[Mesh::Quad].m_startVertex * stride]
+			, s_quadVertices
+			, sizeof(s_quadVertices)
+			);
+
+		bx::memCopy(&ib->data[m_mesh[Mesh::Quad].m_startIndex[0] * sizeof(uint16_t)]
+			, s_quadIndices
+			, sizeof(s_quadIndices)
+			);
+
 		bx::memCopy(&vb->data[m_mesh[Mesh::Cube].m_startVertex * stride]
 			, s_cubeVertices
 			, sizeof(s_cubeVertices)
@@ -1793,45 +1829,53 @@ struct DebugDrawEncoderImpl
 	void drawQuad(const float* _normal, const float* _center, float _size)
 	{
 		const Attrib& attrib = m_attrib[m_stack];
+		if (attrib.m_wireframe)
+		{
+			float udir[3];
+			float vdir[3];
 
-		float udir[3];
-		float vdir[3];
+			bx::vec3TangentFrame(_normal, udir, vdir, attrib.m_spin);
 
-		bx::vec3TangentFrame(_normal, udir, vdir, attrib.m_spin);
+			const float halfExtent = _size*0.5f;
 
-		const float halfExtent = _size*0.5f;
+			float umin[3];
+			bx::vec3Mul(umin, udir, -halfExtent);
 
-		float umin[3];
-		bx::vec3Mul(umin, udir, -halfExtent);
+			float umax[3];
+			bx::vec3Mul(umax, udir,  halfExtent);
 
-		float umax[3];
-		bx::vec3Mul(umax, udir,  halfExtent);
+			float vmin[3];
+			bx::vec3Mul(vmin, vdir, -halfExtent);
 
-		float vmin[3];
-		bx::vec3Mul(vmin, vdir, -halfExtent);
+			float vmax[3];
+			bx::vec3Mul(vmax, vdir,  halfExtent);
 
-		float vmax[3];
-		bx::vec3Mul(vmax, vdir,  halfExtent);
+			float pt[3];
+			float tmp[3];
+			bx::vec3Add(tmp, umin, vmin);
+			bx::vec3Add(pt, _center, tmp);
+			moveTo(pt);
 
-		float pt[3];
-		float tmp[3];
-		bx::vec3Add(tmp, umin, vmin);
-		bx::vec3Add(pt, _center, tmp);
-		moveTo(pt);
+			bx::vec3Add(tmp, umax, vmin);
+			bx::vec3Add(pt, _center, tmp);
+			lineTo(pt);
 
-		bx::vec3Add(tmp, umax, vmin);
-		bx::vec3Add(pt, _center, tmp);
-		lineTo(pt);
+			bx::vec3Add(tmp, umax, vmax);
+			bx::vec3Add(pt, _center, tmp);
+			lineTo(pt);
 
-		bx::vec3Add(tmp, umax, vmax);
-		bx::vec3Add(pt, _center, tmp);
-		lineTo(pt);
+			bx::vec3Add(tmp, umin, vmax);
+			bx::vec3Add(pt, _center, tmp);
+			lineTo(pt);
 
-		bx::vec3Add(tmp, umin, vmax);
-		bx::vec3Add(pt, _center, tmp);
-		lineTo(pt);
-
-		close();
+			close();
+		}
+		else
+		{
+			float mtx[16];
+			bx::mtxFromNormal(mtx, _normal, _size*0.5f, _center);
+			draw(Mesh::Quad, mtx, 1, false);
+		}
 	}
 
 	void drawQuad(SpriteHandle _handle, const float* _normal, const float* _center, float _size)
@@ -2672,6 +2716,16 @@ void DebugDrawEncoder::setTranslate(float _x, float _y, float _z)
 	DEBUG_DRAW_ENCODER(setTranslate(_x, _y, _z) );
 }
 
+void DebugDrawEncoder::pushTransform(const void* _mtx)
+{
+	DEBUG_DRAW_ENCODER(pushTransform(_mtx, 1) );
+}
+
+void DebugDrawEncoder::popTransform()
+{
+	DEBUG_DRAW_ENCODER(popTransform() );
+}
+
 void DebugDrawEncoder::moveTo(float _x, float _y, float _z)
 {
 	DEBUG_DRAW_ENCODER(moveTo(_x, _y, _z) );
diff --git a/examples/common/debugdraw/debugdraw.h b/examples/common/debugdraw/debugdraw.h
index 0027e0198..fadcdfff5 100644
--- a/examples/common/debugdraw/debugdraw.h
+++ b/examples/common/debugdraw/debugdraw.h
@@ -98,6 +98,12 @@ struct DebugDrawEncoder
 	///
 	void setTranslate(float _x, float _y, float _z);
 
+	///
+	void pushTransform(const void* _mtx);
+
+	///
+	void popTransform();
+
 	///
 	void moveTo(float _x, float _y, float _z = 0.0f);