Tidy and format

This commit is contained in:
Shaun Reed 2022-11-24 16:01:38 -05:00
parent 42970781db
commit ee689a9645
10 changed files with 30 additions and 31 deletions

View File

@ -125,7 +125,6 @@ portability-simd-intrinsics,
readability-avoid-const-params-in-decls,
readability-const-return-type,
readability-container-size-empty,
readability-convert-member-functions-to-static,
readability-delete-null-pointer,
readability-deleted-default,
readability-inconsistent-declaration-parameter-name,

View File

@ -23,7 +23,7 @@ class QTK_WIDGET_EXPORT MainWindow
private:
Ui::MainWindow * ui {};
std::unordered_map<std::string, Qtk::Scene *> mScenes;
std::unordered_map<std::string, Qtk::Scene *> mScenes {};
};
#endif // MAINWINDOW_H

View File

@ -48,8 +48,8 @@ namespace Qtk {
protected:
Skybox * mSkybox {};
std::vector<MeshRenderer *> mMeshes;
std::vector<Model *> mModels;
std::vector<MeshRenderer *> mMeshes {};
std::vector<Model *> mModels {};
};
} // namespace Qtk

View File

@ -55,10 +55,10 @@ class MainWidget : public QOpenGLWidget, protected QOpenGLFunctions {
// Protected Helpers
protected:
void keyPressEvent(QKeyEvent * event);
void keyReleaseEvent(QKeyEvent * event);
void mousePressEvent(QMouseEvent * event);
void mouseReleaseEvent(QMouseEvent * event);
void keyPressEvent(QKeyEvent * event) override;
void keyReleaseEvent(QKeyEvent * event) override;
void mousePressEvent(QMouseEvent * event) override;
void mouseReleaseEvent(QMouseEvent * event) override;
private:
// Private helpers

View File

@ -124,11 +124,11 @@ namespace Qtk {
protected:
DrawMode mDrawMode;
Vertices mVertices;
Colors mColors;
Indices mIndices;
TexCoords mTexCoords;
Normals mNormals;
Vertices mVertices {};
Colors mColors {};
Indices mIndices {};
TexCoords mTexCoords {};
Normals mNormals {};
};
struct Shape : public ShapeBase {

View File

@ -122,8 +122,8 @@ namespace Qtk {
private:
static MeshManager sInstances;
int mDrawType;
std::string mVertexShader, mFragmentShader;
int mDrawType {};
std::string mVertexShader {}, mFragmentShader {};
};
} // namespace Qtk

View File

@ -37,10 +37,10 @@ namespace Qtk {
};
struct QTKAPI ModelTexture {
GLuint mID;
QOpenGLTexture * mTexture;
std::string mType;
std::string mPath;
GLuint mID {};
QOpenGLTexture * mTexture {};
std::string mType {};
std::string mPath {};
};
class Model;
@ -82,9 +82,9 @@ namespace Qtk {
void draw(QOpenGLShaderProgram & shader);
// ModelMesh Public Members
Vertices mVertices;
Indices mIndices;
Textures mTextures;
Vertices mVertices {};
Indices mIndices {};
Textures mTextures {};
Transform3D mTransform;
};
@ -136,9 +136,9 @@ namespace Qtk {
// Model Private Members
ModelMesh::Textures mTexturesLoaded;
std::vector<ModelMesh> mMeshes;
std::string mDirectory;
ModelMesh::Textures mTexturesLoaded {};
std::vector<ModelMesh> mMeshes {};
std::string mDirectory {};
const char *mVertexShader, *mFragmentShader, *mName;
};
} // namespace Qtk

View File

@ -40,8 +40,8 @@ namespace Qtk {
private:
void init();
Vertices mVertices;
Indices mIndices;
Vertices mVertices {};
Indices mIndices {};
QOpenGLShaderProgram mProgram;
QOpenGLVertexArrayObject mVAO;

View File

@ -55,8 +55,8 @@ QOpenGLTexture * OpenGLTextureFactory::initCubeMap(
}
QOpenGLTexture * OpenGLTextureFactory::initCubeMap(
QImage right, QImage top, QImage front, QImage left, QImage bottom,
QImage back) {
const QImage & right, const QImage & top, const QImage & front,
const QImage & left, const QImage & bottom, const QImage & back) {
auto texture = new QOpenGLTexture(QOpenGLTexture::TargetCubeMap);
std::vector<QImage> faceTextures = {std::move(right), std::move(top),
std::move(front), std::move(left),

View File

@ -29,8 +29,8 @@ namespace Qtk {
// Cube maps
static QOpenGLTexture * initCubeMap(
QImage right, QImage top, QImage front, QImage left, QImage bottom,
QImage back);
const QImage & right, const QImage & top, const QImage & front,
const QImage & left, const QImage & bottom, const QImage & back);
// Overloads for cube map initialization
static QOpenGLTexture * initCubeMap(const char * tile);
static QOpenGLTexture * initCubeMap(