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

Merged KRMesh into KRModel

Browse Source 
--HG--
extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%40113
This commit is contained in:
kearwood
2012-10-03 19:55:34 +00:00
parent e6e90c1945
commit b13de25a4c
9 changed files with 391 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
KREngine/KREngine/Classes/KRModelManager.cpp
View File

@@ -187,41 +187,41 @@ void KRModelManager::configureAttribs(bool enable_vertex, bool enable_normal, bo
if(reconfigured || true) {
int data_size = 0;
if(enable_vertex) {
data_size += sizeof(KRMesh::KRVector3D);
data_size += sizeof(KRModel::KRVector3D);
}
if(enable_normal) {
data_size += sizeof(KRMesh::KRVector3D);
data_size += sizeof(KRModel::KRVector3D);
}
if(enable_tangent) {
data_size += sizeof(KRMesh::KRVector3D);
data_size += sizeof(KRModel::KRVector3D);
}
if(enable_uva) {
data_size += sizeof(KRMesh::TexCoord);
data_size += sizeof(KRModel::TexCoord);
}
if(enable_uvb) {
data_size += sizeof(KRMesh::TexCoord);
data_size += sizeof(KRModel::TexCoord);
}
int offset = 0;
if(enable_vertex) {
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_VERTEX, 3, GL_FLOAT, 0, data_size, BUFFER_OFFSET(offset)));
offset += sizeof(KRMesh::KRVector3D);
offset += sizeof(KRModel::KRVector3D);
}
if(enable_normal) {
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_NORMAL, 3, GL_FLOAT, 0, data_size, BUFFER_OFFSET(offset)));
offset += sizeof(KRMesh::KRVector3D);
offset += sizeof(KRModel::KRVector3D);
}
if(enable_tangent) {
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_TANGENT, 3, GL_FLOAT, 0, data_size, BUFFER_OFFSET(offset)));
offset += sizeof(KRMesh::KRVector3D);
offset += sizeof(KRModel::KRVector3D);
}
if(enable_uva) {
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_TEXUVA, 2, GL_FLOAT, 0, data_size, BUFFER_OFFSET(offset)));
offset += sizeof(KRMesh::TexCoord);
offset += sizeof(KRModel::TexCoord);
}
if(enable_uvb) {
GLDEBUG(glVertexAttribPointer(KRShader::KRENGINE_ATTRIB_TEXUVB, 2, GL_FLOAT, 0, data_size, BUFFER_OFFSET(offset)));
offset += sizeof(KRMesh::TexCoord);
offset += sizeof(KRModel::TexCoord);
}
}
}