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

Brownian motion particle system implementation in progress (for dust environment effects)

Browse Source 
Fixed bug in KRImport that caused long material names to become corrupted

--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%40150
This commit is contained in:
kearwood
2012-11-02 20:50:45 +00:00
parent 87b7877958
commit e5febf7e60
20 changed files with 391 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ void KRModel::loadPack(KRDataBlock *data) {
void KRModel::render(KRCamera *pCamera, KRContext *pContext, const KRViewport &viewport, KRMat4 &matModel, KRVector3 &lightDirection, KRMat4 *pShadowMatrices, GLuint *shadowDepthTextures, int cShadowBuffers, KRTexture *pLightMap, KRNode::RenderPass renderPass) {
//fprintf(stderr, "Rendering model: %s\n", m_name.c_str());
if(renderPass != KRNode::RENDER_PASS_FLARES) {
if(renderPass != KRNode::RENDER_PASS_ADDITIVE_PARTICLES) {
if(m_materials.size() == 0) {
vector<KRModel::Submesh *> submeshes = getSubmeshes();
@@ -303,7 +303,7 @@ void KRModel::LoadData(std::vector<KRVector3> vertices, std::vector<KRVector2> u
pack_material *pPackMaterial = pPackMaterials + iMaterial;
pPackMaterial->start_vertex = submesh_starts[iMaterial];
pPackMaterial->vertex_count = submesh_lengths[iMaterial];
strncpy(pPackMaterial->szName, material_names[iMaterial].c_str(), 63);
strncpy(pPackMaterial->szName, material_names[iMaterial].c_str(), 256);
}
bool bFirstVertex = true;