sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Readded DebugDrawer::Draw[Binormals|Normals|Tangent] 

Former-commit-id: 7e5f98670914da0618d40b2e5fcf49b66f0627a1
This commit is contained in:
Lynix 2013-06-25 00:31:31 +02:00
parent 3b88cd936c
commit 0bd70f8df1
2 changed files with 66 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/Nazara/Renderer/DebugDrawer.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/Math/Box.hpp> #include <Nazara/Math/Box.hpp>
#include <Nazara/Math/Frustum.hpp> #include <Nazara/Math/Frustum.hpp>
#include <Nazara/Math/OrientedBox.hpp> #include <Nazara/Math/OrientedBox.hpp>
#include <Nazara/Utility/SubMesh.hpp> #include <Nazara/Utility/StaticMesh.hpp>
class NzSkeleton; class NzSkeleton;
@ -27,8 +27,9 @@ class NAZARA_API NzDebugDrawer
static void Draw(const NzFrustumf& frustum); static void Draw(const NzFrustumf& frustum);
static void Draw(const NzOrientedBoxf& orientedBox); static void Draw(const NzOrientedBoxf& orientedBox);
static void Draw(const NzSkeleton* skeleton); static void Draw(const NzSkeleton* skeleton);
//static void DrawNormals(const NzSubMesh* subMesh); static void DrawBinormals(const NzStaticMesh* subMesh);
//static void DrawTangents(const NzSubMesh* subMesh); static void DrawNormals(const NzStaticMesh* subMesh);
static void DrawTangents(const NzStaticMesh* subMesh);
static void EnableDepthBuffer(bool depthBuffer); static void EnableDepthBuffer(bool depthBuffer);

108
src/Nazara/Renderer/DebugDrawer.cpp
View File

@ -317,7 +317,7 @@ void NzDebugDrawer::Draw(const NzSkeleton* skeleton)
unsigned int jointCount = skeleton->GetJointCount(); unsigned int jointCount = skeleton->GetJointCount();
if (vertexBuffer->GetVertexCount() < jointCount*2) if (vertexBuffer->GetVertexCount() < jointCount*2)
{ {
NazaraError("Debug buffer not length enougth to draw object"); NazaraError("Debug buffer not large enougth to draw object");
return; return;
} }
@ -356,8 +356,8 @@ void NzDebugDrawer::Draw(const NzSkeleton* skeleton)
NzRenderer::DrawPrimitives(nzPrimitiveMode_PointList, 0, vertexCount); NzRenderer::DrawPrimitives(nzPrimitiveMode_PointList, 0, vertexCount);
} }
} }
/*
void NzDebugDrawer::DrawNormals(const NzSubMesh* subMesh) void NzDebugDrawer::DrawBinormals(const NzStaticMesh* subMesh)
{ {
if (!initialized) if (!initialized)
{ {
@ -369,7 +369,7 @@ void NzDebugDrawer::DrawNormals(const NzSubMesh* subMesh)
unsigned int vertexCount = normalCount*2; unsigned int vertexCount = normalCount*2;
if (vertexBuffer->GetVertexCount() < vertexCount) if (vertexBuffer->GetVertexCount() < vertexCount)
{ {
NazaraError("Debug buffer not length enougth to draw object"); NazaraError("Debug buffer not large enougth to draw object");
return; return;
} }
@ -384,7 +384,7 @@ void NzDebugDrawer::DrawNormals(const NzSubMesh* subMesh)
outputVertex->position = inputVertex->position; outputVertex->position = inputVertex->position;
outputVertex++; outputVertex++;
outputVertex->position = inputVertex->position + inputVertex->normal; outputVertex->position = inputVertex->position + NzVector3f::CrossProduct(inputVertex->normal, inputVertex->tangent)*0.01f;
outputVertex++; outputVertex++;
inputVertex++; inputVertex++;
@ -395,37 +395,63 @@ void NzDebugDrawer::DrawNormals(const NzSubMesh* subMesh)
if (vertexCount > 0) if (vertexCount > 0)
{ {
const NzShader* oldShader = NzRenderer::GetShader(); NzRenderer::SetRenderStates(renderStates);
NzRenderer::SetShader(shader);
NzRenderer::SetVertexBuffer(vertexBuffer);
if (!NzRenderer::SetShader(shader)) shader->SendColor(colorLocation, primaryColor);
NzRenderer::DrawPrimitives(nzPrimitiveMode_LineList, 0, vertexCount);
}
}
void NzDebugDrawer::DrawNormals(const NzStaticMesh* subMesh)
{ {
NazaraError("Failed to set debug shader"); if (!initialized)
{
NazaraError("Debug drawer is not initialized");
return; return;
} }
bool depthTestActive = NzRenderer::IsEnabled(nzRendererParameter_DepthTest); unsigned int normalCount = subMesh->GetVertexCount();
if (depthTestActive != depthTest) unsigned int vertexCount = normalCount*2;
NzRenderer::Enable(nzRendererParameter_DepthTest, depthTest); if (vertexBuffer->GetVertexCount() < vertexCount)
{
NazaraError("Debug buffer not large enougth to draw object");
return;
}
NzBufferMapper<NzVertexBuffer> inputMapper(subMesh->GetVertexBuffer(), nzBufferAccess_ReadOnly);
NzBufferMapper<NzVertexBuffer> outputMapper(vertexBuffer, nzBufferAccess_DiscardAndWrite, 0, vertexCount);
NzMeshVertex* inputVertex = reinterpret_cast<NzMeshVertex*>(inputMapper.GetPointer());
NzVertexStruct_XYZ* outputVertex = reinterpret_cast<NzVertexStruct_XYZ*>(outputMapper.GetPointer());
for (unsigned int i = 0; i < normalCount; ++i)
{
outputVertex->position = inputVertex->position;
outputVertex++;
outputVertex->position = inputVertex->position + inputVertex->normal*0.01f;
outputVertex++;
inputVertex++;
}
inputMapper.Unmap();
outputMapper.Unmap();
if (vertexCount > 0)
{
NzRenderer::SetRenderStates(renderStates);
NzRenderer::SetShader(shader);
NzRenderer::SetVertexBuffer(vertexBuffer); NzRenderer::SetVertexBuffer(vertexBuffer);
float oldLineWidth = NzRenderer::GetLineWidth();
NzRenderer::SetLineWidth(lineWidth);
shader->SendColor(colorLocation, primaryColor); shader->SendColor(colorLocation, primaryColor);
NzRenderer::DrawPrimitives(nzPrimitiveType_LineList, 0, vertexCount); NzRenderer::DrawPrimitives(nzPrimitiveMode_LineList, 0, vertexCount);
NzRenderer::SetLineWidth(oldLineWidth);
if (depthTestActive != depthTest)
NzRenderer::Enable(nzRendererParameter_DepthTest, depthTestActive);
if (!NzRenderer::SetShader(oldShader))
NazaraWarning("Failed to reset shader");
} }
} }
void NzDebugDrawer::DrawTangents(const NzSubMesh* subMesh) void NzDebugDrawer::DrawTangents(const NzStaticMesh* subMesh)
{ {
if (!initialized) if (!initialized)
{ {
@ -437,7 +463,7 @@ void NzDebugDrawer::DrawTangents(const NzSubMesh* subMesh)
unsigned int vertexCount = tangentCount*2; unsigned int vertexCount = tangentCount*2;
if (vertexBuffer->GetVertexCount() < vertexCount) if (vertexBuffer->GetVertexCount() < vertexCount)
{ {
NazaraError("Debug buffer not length enougth to draw object"); NazaraError("Debug buffer not large enougth to draw object");
return; return;
} }
@ -452,7 +478,7 @@ void NzDebugDrawer::DrawTangents(const NzSubMesh* subMesh)
outputVertex->position = inputVertex->position; outputVertex->position = inputVertex->position;
outputVertex++; outputVertex++;
outputVertex->position = inputVertex->position + inputVertex->tangent; outputVertex->position = inputVertex->position + inputVertex->tangent*0.01f;
outputVertex++; outputVertex++;
inputVertex++; inputVertex++;
@ -463,36 +489,14 @@ void NzDebugDrawer::DrawTangents(const NzSubMesh* subMesh)
if (vertexCount > 0) if (vertexCount > 0)
{ {
const NzShader* oldShader = NzRenderer::GetShader(); NzRenderer::SetRenderStates(renderStates);
NzRenderer::SetShader(shader);
if (!NzRenderer::SetShader(shader))
{
NazaraError("Failed to set debug shader");
return;
}
bool depthTestActive = NzRenderer::IsEnabled(nzRendererParameter_DepthTest);
if (depthTestActive != depthTest)
NzRenderer::Enable(nzRendererParameter_DepthTest, depthTest);
NzRenderer::SetVertexBuffer(vertexBuffer); NzRenderer::SetVertexBuffer(vertexBuffer);
float oldLineWidth = NzRenderer::GetLineWidth();
NzRenderer::SetLineWidth(lineWidth);
shader->SendColor(colorLocation, primaryColor); shader->SendColor(colorLocation, primaryColor);
NzRenderer::DrawPrimitives(nzPrimitiveType_LineList, 0, vertexCount); NzRenderer::DrawPrimitives(nzPrimitiveMode_LineList, 0, vertexCount);
NzRenderer::SetLineWidth(oldLineWidth);
if (depthTestActive != depthTest)
NzRenderer::Enable(nzRendererParameter_DepthTest, depthTestActive);
if (!NzRenderer::SetShader(oldShader))
NazaraWarning("Failed to reset shader");
} }
} }
*/
void NzDebugDrawer::EnableDepthBuffer(bool depthBuffer) void NzDebugDrawer::EnableDepthBuffer(bool depthBuffer)
{ {
@ -554,7 +558,7 @@ bool NzDebugDrawer::Initialize()
// VertexBuffer (Nécessite la déclaration) // VertexBuffer (Nécessite la déclaration)
{ {
vertexBuffer = new NzVertexBuffer(vertexDeclaration, 1024, nzBufferStorage_Hardware, nzBufferUsage_Dynamic); vertexBuffer = new NzVertexBuffer(vertexDeclaration, 65365, nzBufferStorage_Hardware, nzBufferUsage_Dynamic);
if (!vertexBuffer->GetBuffer()->IsValid()) if (!vertexBuffer->GetBuffer()->IsValid())
{ {
NazaraError("Failed to create buffer"); NazaraError("Failed to create buffer");