AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wireframe render functions for CModel and CStaticModel added

This commit is contained in:
parax0 2015-11-24 08:42:01 -07:00
parent 901ae6a832
commit 4cd9220763
5 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/ERenderOptions.h
View File

@ -5,6 +5,7 @@
enum ERenderOptions
{
eNoRenderOptions = 0x0,
eDrawWorld = 0x1,
eDrawWorldCollision = 0x2,
eDrawObjects = 0x4,

24
Resource/model/CModel.cpp
View File

@ -1,4 +1,5 @@
#include "CModel.h"
#include <Core/CDrawUtil.h>
#include <Core/CRenderer.h>
#include <OpenGL/GLCommon.h>
@ -97,11 +98,11 @@ void CModel::DrawSurface(ERenderOptions Options, u32 Surface, u32 MatSet)
MatSet = mMaterialSets.size() - 1;
// Bind material
SSurface *pSurf = mSurfaces[Surface];
CMaterial *pMat = mMaterialSets[MatSet]->MaterialByIndex(pSurf->MaterialID);
if ((Options & eNoMaterialSetup) == 0)
{
SSurface *pSurf = mSurfaces[Surface];
CMaterial *pMat = mMaterialSets[MatSet]->MaterialByIndex(pSurf->MaterialID);
if ((!(Options & eEnableOccluders)) && (pMat->Options() & CMaterial::eOccluder))
return;
@ -121,6 +122,23 @@ void CModel::DrawSurface(ERenderOptions Options, u32 Surface, u32 MatSet)
mVBO.Unbind();
}
void CModel::DrawWireframe(ERenderOptions Options, const CColor& WireColor)
{
if (!mBuffered) BufferGL();
// Set up wireframe
CDrawUtil::UseColorShader(WireColor);
Options |= eNoMaterialSetup;
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
// Draw surfaces
for (u32 iSurf = 0; iSurf < mSurfaces.size(); iSurf++)
DrawSurface(Options, iSurf, 0);
// Cleanup
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}
u32 CModel::GetMatSetCount()
{
return mMaterialSets.size();

1
Resource/model/CModel.h
View File

@ -27,6 +27,7 @@ public:
void ClearGLBuffer();
void Draw(ERenderOptions Options, u32 MatSet);
void DrawSurface(ERenderOptions Options, u32 Surface, u32 MatSet);
void DrawWireframe(ERenderOptions Options, const CColor& WireColor = CColor::skWhite);
u32 GetMatSetCount();
u32 GetMatCount();

20
Resource/model/CStaticModel.cpp
View File

@ -1,4 +1,5 @@
#include "CStaticModel.h"
#include <Core/CDrawUtil.h>
#include <Core/CRenderer.h>
#include <OpenGL/GLCommon.h>
@ -104,6 +105,7 @@ void CStaticModel::Draw(ERenderOptions Options)
// Draw IBOs
mVBO.Bind();
glLineWidth(1.f);
for (u32 iIBO = 0; iIBO < mIBOs.size(); iIBO++)
{
@ -122,6 +124,7 @@ void CStaticModel::DrawSurface(ERenderOptions Options, u32 Surface)
if (!mBuffered) BufferGL();
mVBO.Bind();
glLineWidth(1.f);
if ((Options & eNoMaterialSetup) == 0) mpMaterial->SetCurrent(Options);
for (u32 iIBO = 0; iIBO < mIBOs.size(); iIBO++)
@ -141,6 +144,23 @@ void CStaticModel::DrawSurface(ERenderOptions Options, u32 Surface)
mVBO.Unbind();
}
void CStaticModel::DrawWireframe(ERenderOptions Options, const CColor& WireColor)
{
if (!mBuffered) BufferGL();
// Set up wireframe
CDrawUtil::UseColorShader(WireColor);
Options |= eNoMaterialSetup;
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
// Draw surfaces
for (u32 iSurf = 0; iSurf < mSurfaces.size(); iSurf++)
DrawSurface(Options, iSurf);
// Cleanup
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}
CMaterial* CStaticModel::GetMaterial()
{
return mpMaterial;

1
Resource/model/CStaticModel.h
View File

@ -26,6 +26,7 @@ public:
void ClearGLBuffer();
void Draw(ERenderOptions Options);
void DrawSurface(ERenderOptions Options, u32 Surface);
void DrawWireframe(ERenderOptions Options, const CColor& WireColor);
CMaterial* GetMaterial();
void SetMaterial(CMaterial *pMat);