cosmetic to MainWindow,
drop does not work for widget, fixed offset problem, add esc key
This commit is contained in:
@@ -15,7 +15,7 @@ GeometryEngine::GeometryEngine()
|
||||
m_indexBuf.create();
|
||||
|
||||
// Initializes cube geometry and transfers it to VBOs
|
||||
loadFile("..\\Release\\Msh\\triClothMan.msh");
|
||||
loadFile("..\\Release\\Msh\\ic_helmet.msh");
|
||||
}
|
||||
|
||||
GeometryEngine::~GeometryEngine()
|
||||
@@ -50,21 +50,22 @@ void GeometryEngine::loadFile(const char* filePath)
|
||||
textureNames = file.getTextureNames();
|
||||
|
||||
// collect data
|
||||
unsigned int offsetCount(0);
|
||||
unsigned int indexOffset(0);
|
||||
unsigned int vertexOffset(0);
|
||||
for (auto& modelIterator : *models)
|
||||
{
|
||||
for (auto& segmentIterator : modelIterator->segmList)
|
||||
{
|
||||
// get draw information
|
||||
DrawInformation new_info;
|
||||
new_info.offset = offsetCount;
|
||||
new_info.offset = indexOffset;
|
||||
new_info.size = segmentIterator->indices.size();
|
||||
new_info.textureIndex = segmentIterator->textureIndex;
|
||||
new_info.modelMatrix = modelIterator->m4x4Translation;
|
||||
|
||||
// add offset to indices
|
||||
for (auto& it : segmentIterator->indices)
|
||||
it += new_info.offset;
|
||||
it += vertexOffset;
|
||||
|
||||
// save data
|
||||
vertexData += segmentIterator->vertices;
|
||||
@@ -72,7 +73,8 @@ void GeometryEngine::loadFile(const char* filePath)
|
||||
m_drawList.push_back(new_info);
|
||||
|
||||
// update offset
|
||||
offsetCount += new_info.size;
|
||||
indexOffset += new_info.size;
|
||||
vertexOffset += segmentIterator->vertices.size();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user