Skip to content

Move tests to GTest #631 #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 2 commits into from
Dec 13, 2023
Merged

Move tests to GTest #631 #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a142de
Move tests to GTest #631
eprikazchikov Dec 13, 2023
5c0e324
update
eprikazchikov Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Thunder.qbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Project {
"builder/builder.qbs",
"build/install.qbs",
"build/qbsinstall.qbs",
"build/tests.qbs"
"tests/tests.qbs"
]
}

5 changes: 0 additions & 5 deletions build/tests.cpp
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions builder/builder.qbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import qbs
Project {
id: builder
property stringList srcFiles: [
"**/*.cpp",
"**/*.h",
"../develop/**/*.cpp",
"../develop/**/*.h"
"*.cpp",
"*.h",
]

property stringList incPaths: [
Expand All @@ -21,8 +19,7 @@ Project {
"../thirdparty/next/inc/core",
"../thirdparty/next/inc/anim",
"../thirdparty/zlib/src",
"../thirdparty/quazip/src",
"../modules/editor/grapheditor"
"../thirdparty/quazip/src"
]

QtApplication {
Expand All @@ -35,7 +32,6 @@ Project {
Depends { name: "zlib-editor" }
Depends { name: "next-editor" }
Depends { name: "engine-editor" }
Depends { name: "graph-editor" }
Depends { name: "Qt"; submodules: ["core", "gui", "widgets", "xml"]; }

bundle.isBundle: false
Expand Down
2 changes: 1 addition & 1 deletion engine/includes/editor/editorplatform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ENGINE_EXPORT EditorPlatform : public PlatformAdaptor {

string locationLocalDir() const override;

private slots:
private:
void onGamepadConnected(bool value);

protected:
Expand Down
2 changes: 1 addition & 1 deletion engine/src/editor/converters/assimpconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ Mesh *AssimpConverter::importMesh(const aiScene *scene, const aiNode *element, A
for(uint32_t i = 0; i < item->mNumFaces; i++) {
aiFace *face = &item->mFaces[i];

uint32_t v_index = total_i + i * 3;
size_t v_index = total_i + i * 3;

indices[v_index+0] = total_v + face->mIndices[0];
indices[v_index+1] = total_v + face->mIndices[1];
Expand Down
4 changes: 2 additions & 2 deletions engine/src/gizmos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void Gizmos::drawSphere(const Vector3 &center, float radius, const Vector4 &colo
void Gizmos::drawDisk(const Vector3 &center, float radius, float start, float angle, const Vector4 &color, const Matrix4 &transform) {
Mesh mesh;
mesh.setVertices(Mathf::pointsArc(Quaternion(), radius, start, angle, 180, true));
uint32_t size = mesh.vertices().size();
size_t size = mesh.vertices().size();

IndexVector indices;
indices.resize((size - 1) * 3);
Expand Down Expand Up @@ -191,7 +191,7 @@ void Gizmos::drawLines(const Vector3Vector &points, const IndexVector &indices,
void Gizmos::drawArc(const Vector3 &center, float radius, float from, float to, const Vector4 &color, const Matrix4 &transform) {
Mesh mesh;
mesh.setVertices(Mathf::pointsArc(Quaternion(), radius, from, to, 180));
uint32_t size = mesh.vertices().size();
size_t size = mesh.vertices().size();

IndexVector indices;
indices.resize((size - 1) * 2);
Expand Down
4 changes: 2 additions & 2 deletions engine/src/resources/mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ void Mesh::batchMesh(Mesh &mesh, const Matrix4 *transform) {
}

// Indices
uint32_t size = vertices().size();
size_t size = vertices().size();
auto indexVector = mesh.indices();
for(auto &it : indexVector) {
it += size;
Expand Down Expand Up @@ -486,7 +486,7 @@ VariantMap Mesh::saveUserData() const {
mesh.push_back(materials);

// Push geometry
uint32_t vCount = m_vertices.size();
size_t vCount = m_vertices.size();
mesh.push_back(static_cast<int32_t>(vCount));
mesh.push_back(static_cast<int32_t>(m_indices.size() / 3));

Expand Down
2 changes: 1 addition & 1 deletion engine/src/resources/rendertarget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RenderTarget::~RenderTarget() {
Returns the number of attached color textures.
*/
uint32_t RenderTarget::colorAttachmentCount() const {
uint32_t result = p_ptr->m_color.size();
size_t result = p_ptr->m_color.size();
if(result == 0 && p_ptr->m_native) {
++result;
}
Expand Down
Loading