SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some warnings

Browse Source
This commit is contained in:
Бычков Андрей
2020-09-08 15:10:26 +03:00
parent 17e38bc821
commit 9f15039f64
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/glshaders.cpp
View File

@@ -74,7 +74,7 @@ bool QGLEngineShaders::loadShadersMulti(QOpenGLShaderProgram *& prog, const QStr
} }
QTextStream ts(&f); QTextStream ts(&f);
QString cur_shader, line, pl, defs = prepareDefines(defines); QString cur_shader, line, pl, defs = prepareDefines(defines);
QOpenGLShader::ShaderType type = 0; QOpenGLShader::ShaderType type = QOpenGLShader::ShaderType();
while (!ts.atEnd()) { while (!ts.atEnd()) {
line = ts.readLine(); line = ts.readLine();
pl = line.trimmed().remove(' ').remove('\t').mid(2).toLower(); pl = line.trimmed().remove(' ').remove('\t').mid(2).toLower();
@@ -124,7 +124,7 @@ bool QGLEngineShaders::loadShaders(QOpenGLShaderProgram *& prog, const QStringLi
QString cur_shader, defs = prepareDefines(defines); QString cur_shader, defs = prepareDefines(defines);
foreach (QString f, files) { foreach (QString f, files) {
QFileInfo fi(f); QFileInfo fi(f);
QOpenGLShader::ShaderType type = 0; QOpenGLShader::ShaderType type = QOpenGLShader::ShaderType();
if (fi.suffix().toLower() == "vert") type = QOpenGLShader::Vertex ; if (fi.suffix().toLower() == "vert") type = QOpenGLShader::Vertex ;
if (fi.suffix().toLower() == "frag") type = QOpenGLShader::Fragment; if (fi.suffix().toLower() == "frag") type = QOpenGLShader::Fragment;
if (fi.suffix().toLower() == "geom") type = QOpenGLShader::Geometry; if (fi.suffix().toLower() == "geom") type = QOpenGLShader::Geometry;

4
qglview.h
View File

@@ -27,7 +27,7 @@
#include "glscene.h" #include "glscene.h"
#include "renderer.h" #include "renderer.h"
#include "mouse_controller.h" #include "mouse_controller.h"
#include <QTime> #include <QElapsedTimer>
#include <QMenu> #include <QMenu>
@@ -220,7 +220,7 @@ private:
QMenu context_menu; QMenu context_menu;
QSet<int> keys_; QSet<int> keys_;
QColor backColor_, fogColor_, ambientColor_, hoverHaloColor_, selectionHaloColor_; QColor backColor_, fogColor_, ambientColor_, hoverHaloColor_, selectionHaloColor_;
QTime time, ktm_; QElapsedTimer time, ktm_;
GLint max_anisotropic, max_texture_chanels; GLint max_anisotropic, max_texture_chanels;
ObjectBase::RenderMode rmode; ObjectBase::RenderMode rmode;
GLRendererBase::RenderingParameters start_rp; GLRendererBase::RenderingParameters start_rp;

2
renderer_service.cpp
View File

@@ -30,7 +30,7 @@ using namespace QGLEngineShaders;
RendererService::RendererService(Renderer * r_): r(r_) { RendererService::RendererService(Renderer * r_): r(r_) {
line_width = 1; line_width = 1;
current_action = haNoAction; current_action = haNoAction;
current_handle = 0; current_handle = QFlags<HandleMesh>();
mat_xyz.resize(3); mat_ms2.resize(3); mat_xyz.resize(3); mat_ms2.resize(3);
color_xyz.resize(3); color_ms2.resize(3); color_xyz.resize(3); color_ms2.resize(3);
const QVector3D _rot [3] = {QVector3D(0,1,0), QVector3D(-1,0,0), QVector3D(0, 0,1)}; const QVector3D _rot [3] = {QVector3D(0,1,0), QVector3D(-1,0,0), QVector3D(0, 0,1)};

2
tonemapping_proc.h
View File

@@ -40,7 +40,7 @@ public:
float frameMax(); float frameMax();
protected: protected:
void timerEvent(QTimerEvent * e); void timerEvent(QTimerEvent * e) override;
void run() override; void run() override;
float calcHistogram(const QVector<QVector4D> & data); float calcHistogram(const QVector<QVector4D> & data);

6
widgets/propertyeditor.cpp
View File

@@ -249,11 +249,11 @@ void Delegate::changedFlag() {
int row = 0; int row = 0;
qulonglong val = 0; qulonglong val = 0;
QList<QModelIndex> chldr; QList<QModelIndex> chldr;
mi = p.child(row, 1); mi = model->index(row, 1, p);
while (mi.isValid()) { while (mi.isValid()) {
chldr << mi; chldr << mi;
model->setData(mi, !mi.data(Qt::UserRole + 4).toBool(), Qt::UserRole + 4); model->setData(mi, !mi.data(Qt::UserRole + 4).toBool(), Qt::UserRole + 4);
mi = p.child(++row, 1); mi = model->index(++row, 1, p);
} }
bool cc = cmi.data(Qt::UserRole + 3).toBool(); bool cc = cmi.data(Qt::UserRole + 3).toBool();
qulonglong cv = cmi.data(Qt::UserRole).toULongLong(); qulonglong cv = cmi.data(Qt::UserRole).toULongLong();
@@ -377,7 +377,7 @@ void PropertyEditor::rebuild() {
setItemBackColor(tli, Qt::darkGray); setItemBackColor(tli, Qt::darkGray);
setItemForeColor(tli, Qt::white); setItemForeColor(tli, Qt::white);
addTopLevelItem(tli); addTopLevelItem(tli);
setFirstItemColumnSpanned(tli, true); tli->setFirstColumnSpanned(true);
tli->setExpanded(true); tli->setExpanded(true);
for (int i = ps; i < pe; ++i) { for (int i = ps; i < pe; ++i) {
props << o->property(i); props << o->property(i);

2
widgets/propertyeditor.h
View File

@@ -76,7 +76,7 @@ protected:
private: private:
void configTree(); void configTree();
void setItemBackColor(QTreeWidgetItem * i, const QColor & c) {i->setBackgroundColor(0, c); i->setBackgroundColor(1, c);} void setItemBackColor(QTreeWidgetItem * i, const QColor & c) {i->setBackground(0, c); i->setBackground(1, c);}
void setItemForeColor(QTreeWidgetItem * i, const QColor & c) {i->setForeground(0, c); i->setForeground(1, c);} void setItemForeColor(QTreeWidgetItem * i, const QColor & c) {i->setForeground(0, c); i->setForeground(1, c);}
void rebuild(); void rebuild();
void refresh(); void refresh();