mirror of
https://github.com/redstrate/Novus.git
synced 2025-04-28 06:37:44 +00:00
Fix more petty warnings
This commit is contained in:
parent
b897b70105
commit
2ac5eb6498
10 changed files with 11 additions and 16 deletions
|
@ -18,7 +18,7 @@ inline char GetChecksum(unsigned int key)
|
||||||
|
|
||||||
uint32_t TickCount();
|
uint32_t TickCount();
|
||||||
|
|
||||||
inline QString encryptGameArg(QString arg)
|
inline QString encryptGameArg(const QString &arg)
|
||||||
{
|
{
|
||||||
unsigned int rawTicks = TickCount();
|
unsigned int rawTicks = TickCount();
|
||||||
unsigned int ticks = rawTicks & 0xFFFFFFFFu;
|
unsigned int ticks = rawTicks & 0xFFFFFFFFu;
|
||||||
|
|
|
@ -15,5 +15,5 @@ public:
|
||||||
explicit BoneEditor(GearView *gearView, QWidget *parent = nullptr);
|
explicit BoneEditor(GearView *gearView, QWidget *parent = nullptr);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
GearView *gearView;
|
GearView *gearView = nullptr;
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,9 +96,9 @@ private:
|
||||||
|
|
||||||
struct LoadedGear {
|
struct LoadedGear {
|
||||||
GearInfo info;
|
GearInfo info;
|
||||||
physis_MDL mdl;
|
physis_MDL mdl{};
|
||||||
QLatin1String path;
|
QLatin1String path;
|
||||||
int bodyId;
|
int bodyId = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::vector<LoadedGear> loadedGears;
|
std::vector<LoadedGear> loadedGears;
|
||||||
|
|
|
@ -4,12 +4,10 @@
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
|
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
#include <QLineEdit>
|
|
||||||
#include <QListWidget>
|
#include <QListWidget>
|
||||||
#include <QTableWidget>
|
#include <QTableWidget>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
#include <KAboutData>
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
|
|
|
@ -13,7 +13,7 @@ class Vector3Edit : public QWidget
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit Vector3Edit(glm::vec3 &vec, QWidget *parent = nullptr);
|
explicit Vector3Edit(glm::vec3 &vec, QWidget *parent = nullptr);
|
||||||
~Vector3Edit();
|
~Vector3Edit() override;
|
||||||
|
|
||||||
void setVector(glm::vec3 &vec);
|
void setVector(glm::vec3 &vec);
|
||||||
|
|
||||||
|
@ -22,9 +22,9 @@ Q_SIGNALS:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct {
|
struct {
|
||||||
QDoubleSpinBox *x, *y, *z;
|
QDoubleSpinBox *x = nullptr, *y = nullptr, *z = nullptr;
|
||||||
} spinBoxes;
|
} spinBoxes;
|
||||||
|
|
||||||
glm::vec3 &vec;
|
glm::vec3 &vec;
|
||||||
QTimer *updateTimer;
|
QTimer *updateTimer = nullptr;
|
||||||
};
|
};
|
||||||
|
|
2
extern/dxbc
vendored
2
extern/dxbc
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 190c185d983609b0887c5d2d8f0e8af84d507ee7
|
Subproject commit 9db12735951da73adb2818c492ce70c80b663f75
|
|
@ -74,7 +74,7 @@ void importModel(physis_MDL &existingModel, const QString &filename)
|
||||||
+ vertexAccessor.byteOffset);
|
+ vertexAccessor.byteOffset);
|
||||||
|
|
||||||
// Replace position data
|
// Replace position data
|
||||||
Vertex vertex;
|
Vertex vertex{};
|
||||||
if (i < existingModel.lods[lodNumber].parts[partNumber].num_vertices) {
|
if (i < existingModel.lods[lodNumber].parts[partNumber].num_vertices) {
|
||||||
vertex = existingModel.lods[lodNumber].parts[partNumber].vertices[i];
|
vertex = existingModel.lods[lodNumber].parts[partNumber].vertices[i];
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,9 +13,9 @@ class VulkanWindow : public QWindow
|
||||||
public:
|
public:
|
||||||
VulkanWindow(MDLPart *part, Renderer *renderer, QVulkanInstance *instance);
|
VulkanWindow(MDLPart *part, Renderer *renderer, QVulkanInstance *instance);
|
||||||
|
|
||||||
void exposeEvent(QExposeEvent *);
|
void exposeEvent(QExposeEvent *) override;
|
||||||
|
|
||||||
bool event(QEvent *e);
|
bool event(QEvent *e) override;
|
||||||
|
|
||||||
void render();
|
void render();
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
|
|
||||||
class Renderer;
|
class Renderer;
|
||||||
struct RenderTarget;
|
|
||||||
|
|
||||||
class ImGuiPass
|
class ImGuiPass
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,8 +18,6 @@ public:
|
||||||
MainWindow(const QString &gamePath, GameData *data);
|
MainWindow(const QString &gamePath, GameData *data);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QMdiArea *mdiArea = nullptr;
|
|
||||||
|
|
||||||
GameData *data = nullptr;
|
GameData *data = nullptr;
|
||||||
QTabWidget *partHolder = nullptr;
|
QTabWidget *partHolder = nullptr;
|
||||||
FileCache fileCache;
|
FileCache fileCache;
|
||||||
|
|
Loading…
Add table
Reference in a new issue