Using QString now,
fileinfo works now
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include "..\Header\MainWindow.h"
|
||||
#include "..\Header\tga.h"
|
||||
#include <cmath>
|
||||
#include <QRegExp>
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
@@ -25,106 +26,19 @@ GeometryEngine::~GeometryEngine()
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// private functions
|
||||
|
||||
void GeometryEngine::loadFile(const char* filePath)
|
||||
{
|
||||
// cleanup old stuff and recreate buffers
|
||||
clearData();
|
||||
m_arrayBuf.create();
|
||||
m_indexBuf.create();
|
||||
|
||||
//reset view
|
||||
emit requestResetView();
|
||||
emit sendMessage("loading file..", 0);
|
||||
|
||||
try
|
||||
{
|
||||
QVector<Model*>* models;
|
||||
QVector<std::string>* textureNames;
|
||||
QVector<VertexData> vertexData;
|
||||
QVector<GLuint> indexData;
|
||||
|
||||
// open file and get the information
|
||||
MshFile file(filePath, this);
|
||||
|
||||
models = file.getModels();
|
||||
textureNames = file.getTextureNames();
|
||||
m_boundings = file.getBoundingBox();
|
||||
|
||||
// collect data
|
||||
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 = indexOffset;
|
||||
new_info.size = segmentIterator->indices.size();
|
||||
new_info.textureIndex = segmentIterator->textureIndex;
|
||||
new_info.modelMatrix = modelIterator->m4x4Translation;
|
||||
new_info.modelMatrix.rotate(modelIterator->quadRotation);
|
||||
|
||||
// add offset to indices, no need to do it for the first one (maybe it's very big)
|
||||
if(vertexOffset != 0)
|
||||
for (auto& it : segmentIterator->indices)
|
||||
it += vertexOffset;
|
||||
|
||||
// save data
|
||||
vertexData += segmentIterator->vertices;
|
||||
indexData += segmentIterator->indices;
|
||||
m_drawList.push_back(new_info);
|
||||
|
||||
// update offset
|
||||
indexOffset += new_info.size;
|
||||
vertexOffset += segmentIterator->vertices.size();
|
||||
}
|
||||
}
|
||||
|
||||
// Transfer vertex data to VBO 0
|
||||
m_arrayBuf.bind();
|
||||
m_arrayBuf.allocate(vertexData.data(), vertexData.size() * sizeof(VertexData));
|
||||
|
||||
// Transfer index data to VBO 1
|
||||
m_indexBuf.bind();
|
||||
m_indexBuf.allocate(indexData.data(), indexData.size() * sizeof(GLuint));
|
||||
|
||||
// get textures path
|
||||
std::string path = filePath;
|
||||
|
||||
while (path.back() != '/' && path.back() != '\\')
|
||||
path.pop_back();
|
||||
|
||||
emit sendMessage("loading textures..", 0);
|
||||
// load the textures
|
||||
for(auto& it : *textureNames)
|
||||
loadTexture(path.c_str(), it.c_str());
|
||||
|
||||
loadTexture("", "");
|
||||
|
||||
emit requestUpdate();
|
||||
emit sendMessage("done..", 0);
|
||||
}
|
||||
catch (std::invalid_argument e)
|
||||
{
|
||||
clearData();
|
||||
emit sendMessage(QString(e.what()), 2);
|
||||
}
|
||||
}
|
||||
|
||||
void GeometryEngine::loadTexture(const char* filePath, const char* fileName)
|
||||
void GeometryEngine::loadTexture(QString filePath, QString fileName)
|
||||
{
|
||||
bool loadSuccess(false);
|
||||
QImage img;
|
||||
|
||||
if (!strcmp(fileName, ""))
|
||||
if (fileName.isEmpty())
|
||||
{
|
||||
loadSuccess = true;
|
||||
img = QImage(1, 1, QImage::Format_RGB32);
|
||||
img.fill(Qt::red);
|
||||
}
|
||||
else
|
||||
img = loadTga((std::string(filePath) + std::string(fileName)).c_str(), loadSuccess);
|
||||
img = loadTga(filePath + "/" + fileName, loadSuccess);
|
||||
|
||||
if (!loadSuccess)
|
||||
emit sendMessage("WARNING: texture not found or corrupted: " + QString(fileName), 1);
|
||||
@@ -160,7 +74,91 @@ void GeometryEngine::clearData()
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// public functions
|
||||
// public slots
|
||||
|
||||
void GeometryEngine::loadFile(QString filePath)
|
||||
{
|
||||
// cleanup old stuff and recreate buffers
|
||||
clearData();
|
||||
m_arrayBuf.create();
|
||||
m_indexBuf.create();
|
||||
|
||||
//reset view
|
||||
emit requestResetView();
|
||||
emit sendMessage("loading file..", 0);
|
||||
|
||||
try
|
||||
{
|
||||
QVector<Model*>* models;
|
||||
QStringList* textureNames;
|
||||
QVector<VertexData> vertexData;
|
||||
QVector<GLuint> indexData;
|
||||
|
||||
// open file and get the information
|
||||
MshFile file(filePath, this);
|
||||
|
||||
models = file.getModels();
|
||||
textureNames = file.getTextureNames();
|
||||
m_boundings = file.getBoundingBox();
|
||||
|
||||
// collect data
|
||||
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 = indexOffset;
|
||||
new_info.size = segmentIterator->indices.size();
|
||||
new_info.textureIndex = segmentIterator->textureIndex;
|
||||
new_info.modelMatrix = modelIterator->m4x4Translation;
|
||||
new_info.modelMatrix.rotate(modelIterator->quadRotation);
|
||||
|
||||
// add offset to indices, no need to do it for the first one (maybe it's very big)
|
||||
if (vertexOffset != 0)
|
||||
for (auto& it : segmentIterator->indices)
|
||||
it += vertexOffset;
|
||||
|
||||
// save data
|
||||
vertexData += segmentIterator->vertices;
|
||||
indexData += segmentIterator->indices;
|
||||
m_drawList.push_back(new_info);
|
||||
|
||||
// update offset
|
||||
indexOffset += new_info.size;
|
||||
vertexOffset += segmentIterator->vertices.size();
|
||||
}
|
||||
}
|
||||
|
||||
// Transfer vertex data to VBO 0
|
||||
m_arrayBuf.bind();
|
||||
m_arrayBuf.allocate(vertexData.data(), vertexData.size() * sizeof(VertexData));
|
||||
|
||||
// Transfer index data to VBO 1
|
||||
m_indexBuf.bind();
|
||||
m_indexBuf.allocate(indexData.data(), indexData.size() * sizeof(GLuint));
|
||||
|
||||
emit sendMessage("loading textures..", 0);
|
||||
|
||||
// load the textures
|
||||
int split = filePath.lastIndexOf(QRegExp("/|\\\\"));
|
||||
for (auto& it : *textureNames)
|
||||
loadTexture(filePath.left(split), it);
|
||||
|
||||
loadTexture("", "");
|
||||
|
||||
emit requestUpdate();
|
||||
emit sendMessage("done..", 0);
|
||||
emit sendFileInfo(filePath.right(filePath.size() - split - 1), QStringList(*textureNames), vertexData.size(), indexData.size() / 3);
|
||||
}
|
||||
catch (std::invalid_argument e)
|
||||
{
|
||||
clearData();
|
||||
emit sendMessage(QString(e.what()), 2);
|
||||
}
|
||||
}
|
||||
|
||||
void GeometryEngine::drawGeometry(QOpenGLShaderProgram *program)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user