Commit 1d5d20cf authored by Anakin's avatar Anakin

trying to fix the crash

parent 0bbc0da3
......@@ -29,7 +29,7 @@ private:
QVector<DrawInformation> m_drawList;
BoundingBox m_boundings;
void loadTexture(const char* filePath);
void loadTexture(const char* filePath, const char* fileName);
void clearData();
public slots:
......
......@@ -98,7 +98,7 @@ void GeometryEngine::loadFile(const char* filePath)
emit sendMessage("loading textures..", 0);
// load the textures
for(auto& it : *textureNames)
loadTexture(std::string(path + it).c_str());
loadTexture(path.c_str(), it.c_str());
emit requestUpdate();
emit sendMessage("done..", 0);
......@@ -109,11 +109,26 @@ void GeometryEngine::loadFile(const char* filePath)
}
}
void GeometryEngine::loadTexture(const char* filePath)
void GeometryEngine::loadTexture(const char* filePath, const char* fileName)
{
bool loadSuccess;
QImage img = loadTga(filePath, loadSuccess);
bool loadSuccess(false);
QImage img;
//if (!strcmp(fileName, ""))
//{
// img = QImage(1, 1, QImage::Format_RGB32);
// img.fill(Qt::red);
//}
//else
img = loadTga((std::string(filePath) + std::string(fileName)).c_str(), loadSuccess);
//TODO: emit if not successfull
if (!loadSuccess)
{
QString msg = "WARNING: texture not found or corrupted: ";
msg += QString(fileName);
emit sendMessage(msg, 1);
}
// Load image to OglTexture
QOpenGLTexture* new_texture = new QOpenGLTexture(img.mirrored());
......
......@@ -13,7 +13,9 @@ Feel free to use my code the way you like. But remember i used some public libra
licence, too.
### To Do
- tga with RLE cannot be opend
- loading 2 corrupted tga files => crash
- every mesh has empty tga => corrupted
- add default texture at the end
- optional display bones, shadow, collision,...
- integrate into a software:
-> list all msh under a directory,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment