kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implementation of FBX import workflow in progress

Browse Source 
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4018
This commit is contained in:
kearwood
2012-03-23 02:28:46 +00:00
parent d305bd1438
commit 67fee4a291
15 changed files with 1112 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
KREngine/KREngine/Classes/KRModel.cpp
View File

@@ -50,9 +50,10 @@ KRModel::KRModel(std::string path, KRMaterialManager *pMaterialManager) {
}
void KRModel::loadPack(std::string path, KRMaterialManager *pMaterialManager) {
m_mesh.loadPack(path);
m_pMesh = new KRMesh(KRResource::GetFileBase(path));
m_pMesh->loadPack(path);
vector<KRMesh::Submesh *> submeshes = m_mesh.getSubmeshes();
vector<KRMesh::Submesh *> submeshes = m_pMesh->getSubmeshes();
for(std::vector<KRMesh::Submesh *>::iterator itr = submeshes.begin(); itr != submeshes.end(); itr++) {
KRMaterial *pMaterial = pMaterialManager->getMaterial((*itr)->szMaterialName);
@@ -70,7 +71,7 @@ void KRModel::render(KRCamera *pCamera, KRMaterialManager *pMaterialManager, boo
int iPrevBuffer = -1;
char szPrevShaderKey[128];
szPrevShaderKey[0] = '\0';
int cSubmeshes = m_mesh.getSubmeshes().size();
int cSubmeshes = m_pMesh->getSubmeshes().size();
if(bRenderShadowMap) {
for(int iSubmesh=0; iSubmesh<cSubmeshes; iSubmesh++) {
KRMaterial *pMaterial = m_materials[iSubmesh];
@@ -79,7 +80,7 @@ void KRModel::render(KRCamera *pCamera, KRMaterialManager *pMaterialManager, boo
if(pMaterial->isTransparent()) {
// Exclude transparent and semi-transparent meshes from shadow maps
m_mesh.renderSubmesh(iSubmesh, &iPrevBuffer);
m_pMesh->renderSubmesh(iSubmesh, &iPrevBuffer);
}
}
@@ -92,7 +93,7 @@ void KRModel::render(KRCamera *pCamera, KRMaterialManager *pMaterialManager, boo
if(pMaterial != NULL && pMaterial == (*mat_itr)) {
pMaterial->bind(&pPrevBoundMaterial, szPrevShaderKey, pCamera, mvpMatrix, cameraPosition, lightDirection, pShadowMatrices, shadowDepthTextures, cShadowBuffers);
m_mesh.renderSubmesh(iSubmesh, &iPrevBuffer);
m_pMesh->renderSubmesh(iSubmesh, &iPrevBuffer);
}
}
}
@@ -101,5 +102,7 @@ void KRModel::render(KRCamera *pCamera, KRMaterialManager *pMaterialManager, boo
}
KRMesh *KRModel::getMesh() {
return &m_mesh;
return m_pMesh;
}