diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6a2dc7..757315e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,12 @@ build: # Set the VCPKG_TOOLCHAIN environment variable - export VCPKG_TOOLCHAIN=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake - cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE=$VCPKG_TOOLCHAIN - - cmake --build build \ No newline at end of file + - cmake --build build + +run_tests: + stage: test + script: + - cd build + - timeout 30s ./TerraVisor + only: + main \ No newline at end of file diff --git a/source/callbacks.cpp b/source/callbacks.cpp index f1c30f9..936259b 100644 --- a/source/callbacks.cpp +++ b/source/callbacks.cpp @@ -1,7 +1,6 @@ #include #include "callbacks.h" -//#include "platform_utils.h" namespace Callbacks { Scene* scene_ = nullptr; diff --git a/source/scene.cpp b/source/scene.cpp index ffbfc82..38e4879 100644 --- a/source/scene.cpp +++ b/source/scene.cpp @@ -72,8 +72,6 @@ Scene::~Scene() { void Scene::Init() { glewInit(); - // GL_DEPTH_TEST causes artifacts in meshes made up of multiple triangles - // disabling for now glEnable(GL_DEPTH_TEST); glEnable(GL_CULL_FACE);