AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-10 14:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for model importing using assimp

Browse Source
This commit is contained in:
parax0
2015-08-10 09:47:00 -04:00
parent 4fc83f735b
commit 2967a483d9
11 changed files with 222 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Resource/model/CModel.cpp
View File

@@ -10,6 +10,17 @@ CModel::CModel() : CBasicModel()
mTriangleCount = 0;
}
CModel::CModel(CMaterialSet *pSet, bool ownsMatSet)
{
mHasOwnMaterials = ownsMatSet;
mHasOwnSurfaces = true;
mVertexCount = 0;
mTriangleCount = 0;
mMaterialSets.resize(1);
mMaterialSets[0] = pSet;
}
CModel::~CModel()
{
if (mHasOwnMaterials)
@@ -99,6 +110,7 @@ void CModel::DrawSurface(ERenderOptions Options, u32 Surface, u32 MatSet)
// Draw IBOs
mVBO.Bind();
glLineWidth(1.f);
for (u32 iIBO = 0; iIBO < mSubmeshIndexBuffers[Surface].size(); iIBO++)
{

2
Resource/model/CModel.h
View File

@@ -20,7 +20,7 @@ class CModel : public CBasicModel
public:
CModel();
CModel(CMaterialSet *pSet);
CModel(CMaterialSet *pSet, bool ownsMatSet);
~CModel();
void BufferGL();