From abda6f7c098a0818c0f33a83735515629684cae8 Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 7 Nov 2022 20:46:23 +0100 Subject: Renamed SkyboxTest to Battle --- kurator/CMakeLists.txt | 2 +- kurator/src/Battle.cpp | 45 +++++++++++++++++++++++++++++++++++++++++++++ kurator/src/Battle.h | 29 +++++++++++++++++++++++++++++ kurator/src/SkyboxTest.cpp | 45 --------------------------------------------- kurator/src/SkyboxTest.h | 29 ----------------------------- kurator/src/Title.cpp | 4 ++-- 6 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 kurator/src/Battle.cpp create mode 100644 kurator/src/Battle.h delete mode 100644 kurator/src/SkyboxTest.cpp delete mode 100644 kurator/src/SkyboxTest.h diff --git a/kurator/CMakeLists.txt b/kurator/CMakeLists.txt index 0aa2712..f506621 100644 --- a/kurator/CMakeLists.txt +++ b/kurator/CMakeLists.txt @@ -1,10 +1,10 @@ project(kurator) add_executable( ${PROJECT_NAME} + src/Battle.cpp src/main.cpp src/Session.cpp src/Skybox.cpp - src/SkyboxTest.cpp src/Title.cpp src/Window.cpp ) diff --git a/kurator/src/Battle.cpp b/kurator/src/Battle.cpp new file mode 100644 index 0000000..109478d --- /dev/null +++ b/kurator/src/Battle.cpp @@ -0,0 +1,45 @@ +#include "Battle.h" + +#include +#include + +#include + +#include "Session.h" +#include "Title.h" + + +namespace kurator +{ + + +Battle::Battle(std::shared_ptr _session) : + session {std::move(_session)}, + camera {{1.f, 1.f, 1.f}, {4.f, 1.f, 4.f}, {0.f, 1.f, 0.f}, 45.f, 0}, + skybox {"resources/skybox.png"} +{ + SetCameraMode(camera, CAMERA_FIRST_PERSON); +} + + +void +Battle::update(const float) +{ + UpdateCamera(&camera); + if (IsKeyPressed(KEY_SPACE)) + session->set(std::make_shared(session)); +} + + +void +Battle::draw() const +{ + ClearBackground(BLACK); + BeginMode3D(camera); + skybox.draw(); + DrawGrid(10, 1.f); + EndMode3D(); +} + + +} // namespace kurator diff --git a/kurator/src/Battle.h b/kurator/src/Battle.h new file mode 100644 index 0000000..333f2f3 --- /dev/null +++ b/kurator/src/Battle.h @@ -0,0 +1,29 @@ +#pragma once + +#include <memory> + +#include <raylib.h> + +#include "Scene.h" +#include "Session.h" +#include "Skybox.h" + + +namespace kurator +{ + + +class Battle : public Scene +{ +public: + explicit Battle(std::shared_ptr<Session> _session); + void update(float dt) override; + void draw() const override; +private: + std::shared_ptr<Session> session; + Camera camera; + Skybox skybox; +}; + + +} // namespace kurator diff --git a/kurator/src/SkyboxTest.cpp b/kurator/src/SkyboxTest.cpp deleted file mode 100644 index 3d8241e..0000000 --- a/kurator/src/SkyboxTest.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "SkyboxTest.h" - -#include <memory> -#include <utility> - -#include <raylib.h> - -#include "Session.h" -#include "Title.h" - - -namespace kurator -{ - - -SkyboxTest::SkyboxTest(std::shared_ptr<Session> _session) : - session {std::move(_session)}, - camera {{1.f, 1.f, 1.f}, {4.f, 1.f, 4.f}, {0.f, 1.f, 0.f}, 45.f, 0}, - skybox {"resources/skybox.png"} -{ - SetCameraMode(camera, CAMERA_FIRST_PERSON); -} - - -void -SkyboxTest::update(const float) -{ - UpdateCamera(&camera); - if (IsKeyPressed(KEY_SPACE)) - session->set(std::make_shared<Title>(session)); -} - - -void -SkyboxTest::draw() const -{ - ClearBackground(BLACK); - BeginMode3D(camera); - skybox.draw(); - DrawGrid(10, 1.f); - EndMode3D(); -} - - -} // namespace kurator diff --git a/kurator/src/SkyboxTest.h b/kurator/src/SkyboxTest.h deleted file mode 100644 index f1ec06b..0000000 --- a/kurator/src/SkyboxTest.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include <memory> - -#include <raylib.h> - -#include "Scene.h" -#include "Session.h" -#include "Skybox.h" - - -namespace kurator -{ - - -class SkyboxTest : public Scene -{ -public: - explicit SkyboxTest(std::shared_ptr<Session> _session); - void update(float dt) override; - void draw() const override; -private: - std::shared_ptr<Session> session; - Camera camera; - Skybox skybox; -}; - - -} // namespace kurator diff --git a/kurator/src/Title.cpp b/kurator/src/Title.cpp index 1ff5a12..5778ac8 100644 --- a/kurator/src/Title.cpp +++ b/kurator/src/Title.cpp @@ -6,7 +6,7 @@ #include <raylib.h> #include "Session.h" -#include "SkyboxTest.h" +#include "Battle.h" namespace kurator @@ -23,7 +23,7 @@ void Title::update(const float) { if (IsKeyPressed(KEY_SPACE)) - session->set(std::make_shared<SkyboxTest>(session)); + session->set(std::make_shared<Battle>(session)); } -- cgit v1.1