spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port cmod tools to Qt5

pull/3/head
Hleb Valoshka 2019-04-04 17:35:11 +03:00
parent 20365410c9
commit d846eb0ef3
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/cmod/cmodview/mainwindow.cpp
View File

@ -8,7 +8,6 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
#include <QtGui>
#include "mainwindow.h"
#include "materialwidget.h"
#include "convert3ds.h"
@ -16,6 +15,21 @@
#include "cmodops.h"
#include <cel3ds/3dsread.h>
#include <celmodel/modelfile.h>
#include <QStatusBar>
#include <QMenuBar>
#include <QSettings>
#include <QDockWidget>
#include <QEvent>
#include <QMessageBox>
#include <QCloseEvent>
#include <QFileOpenEvent>
#include <QFileInfo>
#include <QVBoxLayout>
#include <QDialogButtonBox>
#include <QColorDialog>
#include <QDir>
#include <QFileDialog>
#include <QFormLayout>
using namespace cmod;
using namespace std;

1
src/tools/cmod/cmodview/mainwindow.h
View File

@ -16,6 +16,7 @@
#include <QMainWindow>
#include <QString>
#include <QLabel>
#include <QAction>
class MainWindow : public QMainWindow

8
src/tools/cmod/cmodview/materialwidget.cpp
View File

@ -282,28 +282,28 @@ MaterialWidget::changeMaterialParameters()
m_material.maps[Material::DiffuseMap] = 0;
if (!m_baseTexture->itemData(m_baseTexture->currentIndex()).isNull())
{
m_material.maps[Material::DiffuseMap] = new Material::DefaultTextureResource(m_baseTexture->currentText().toAscii().data());
m_material.maps[Material::DiffuseMap] = new Material::DefaultTextureResource(m_baseTexture->currentText().toStdString());
}
delete m_material.maps[Material::SpecularMap];
m_material.maps[Material::SpecularMap] = 0;
if (!m_specularMap->itemData(m_specularMap->currentIndex()).isNull())
{
m_material.maps[Material::SpecularMap] = new Material::DefaultTextureResource(m_specularMap->currentText().toAscii().data());
m_material.maps[Material::SpecularMap] = new Material::DefaultTextureResource(m_specularMap->currentText().toStdString());
}
delete m_material.maps[Material::NormalMap];
m_material.maps[Material::NormalMap] = 0;
if (!m_normalMap->itemData(m_normalMap->currentIndex()).isNull())
{
m_material.maps[Material::NormalMap] = new Material::DefaultTextureResource(m_normalMap->currentText().toAscii().data());
m_material.maps[Material::NormalMap] = new Material::DefaultTextureResource(m_normalMap->currentText().toStdString());
}
delete m_material.maps[Material::EmissiveMap];
m_material.maps[Material::EmissiveMap] = 0;
if (!m_emissiveMap->itemData(m_emissiveMap->currentIndex()).isNull())
{
m_material.maps[Material::EmissiveMap] = new Material::DefaultTextureResource(m_emissiveMap->currentText().toAscii().data());
m_material.maps[Material::EmissiveMap] = new Material::DefaultTextureResource(m_emissiveMap->currentText().toStdString());
}
emit materialEdited(m_material);

10
src/tools/cmod/cmodview/modelviewwidget.cpp
View File

@ -100,7 +100,7 @@ public:
texId = loadTexture(m_modelDirPath + "/../textures/medres/" + resourceName);
}
std::cout << "Load " << resourceName.toAscii().data() << ", texId = " << texId << std::endl;
std::cout << "Load " << resourceName.toStdString() << ", texId = " << texId << std::endl;
m_textures[resourceName] = texId;
return texId;
}
@ -1508,19 +1508,19 @@ ModelViewWidget::createShader(const ShaderKey& shaderKey)
auto* glShader = new GLShaderProgram();
auto* vertexShader = new GLVertexShader();
if (!vertexShader->compile(vertexShaderSource.toAscii().data()))
if (!vertexShader->compile(vertexShaderSource.toStdString()))
{
qWarning("Vertex shader error: %s", vertexShader->log().c_str());
std::cerr << vertexShaderSource.toAscii().data() << std::endl;
std::cerr << vertexShaderSource.toStdString() << std::endl;
delete glShader;
return nullptr;
}
auto* fragmentShader = new GLFragmentShader();
if (!fragmentShader->compile(fragmentShaderSource.toAscii().data()))
if (!fragmentShader->compile(fragmentShaderSource.toStdString()))
{
qWarning("Fragment shader error: %s", fragmentShader->log().c_str());
std::cerr << fragmentShaderSource.toAscii().data() << std::endl;
std::cerr << fragmentShaderSource.toStdString() << std::endl;
delete glShader;
return nullptr;
}