From 060228bcfa0d953427aac3da6eaa6bfcf17768c6 Mon Sep 17 00:00:00 2001 From: George Fotopoulos Date: Sat, 20 Jan 2024 20:08:50 +0200 Subject: [PATCH] Rename SandboxLayer to World --- CMakeLists.txt | 2 +- include/{SandboxLayer.hpp => World.hpp} | 4 ++-- src/Application.cpp | 4 ++-- src/{SandboxLayer.cpp => World.cpp} | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) rename include/{SandboxLayer.hpp => World.hpp} (85%) rename src/{SandboxLayer.cpp => World.cpp} (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45e85a4..735aa1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(SOURCES src/Application.cpp src/Logging.cpp src/Main.cpp src/Particle.cpp - src/SandboxLayer.cpp + src/World.cpp src/SoftBody1.cpp src/SoftBody2.cpp src/SoftBody3.cpp diff --git a/include/SandboxLayer.hpp b/include/World.hpp similarity index 85% rename from include/SandboxLayer.hpp rename to include/World.hpp index 1903dc2..8179765 100644 --- a/include/SandboxLayer.hpp +++ b/include/World.hpp @@ -6,9 +6,9 @@ #include #include -class SandboxLayer : public Layer { +class World : public Layer { public: - explicit SandboxLayer(std::string name); + explicit World(std::string name); void OnAttach() override; void OnDetach() override; void OnFixedUpdate(float dt) override; diff --git a/src/Application.cpp b/src/Application.cpp index b389f71..b440755 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -1,5 +1,5 @@ #include "Application.hpp" -#include "SandboxLayer.hpp" +#include "World.hpp" #include #include @@ -14,7 +14,7 @@ #include Application::Application(ApplicationSettings applicationSettings) : mApplicationSettings(std::move(applicationSettings)) { - PushLayer(std::make_unique("SandboxLayer")); + PushLayer(std::make_unique("World")); } void Application::PushLayer(std::unique_ptr layer) { diff --git a/src/SandboxLayer.cpp b/src/World.cpp similarity index 90% rename from src/SandboxLayer.cpp rename to src/World.cpp index bbbff69..6182fe8 100644 --- a/src/SandboxLayer.cpp +++ b/src/World.cpp @@ -1,4 +1,4 @@ -#include "SandboxLayer.hpp" +#include "World.hpp" #include "Particle.hpp" #include "Spring.hpp" #include "DoubleSpringPendulum.hpp" @@ -16,9 +16,9 @@ #include -SandboxLayer::SandboxLayer(std::string name) : Layer(std::move(name)) {} +World::World(std::string name) : Layer(std::move(name)) {} -void SandboxLayer::OnAttach() { +void World::OnAttach() { mSoftBodies.emplace_back(std::make_unique(glm::vec2(100.0f, 100.0f), 50.0f, 2.0f, 4.0f)); mSoftBodies.emplace_back(std::make_unique(glm::vec2(300.0f, 200.0f), 50.0f, 2.0f, 4.0f)); mSoftBodies.emplace_back(std::make_unique(glm::vec2(500.0f, 300.0f), 50.0f, 2.0f, 4.0f, 8)); @@ -26,11 +26,11 @@ void SandboxLayer::OnAttach() { mSoftBodies.emplace_back(std::make_unique(glm::vec2(200.0f, 0.0f), 50.0f, 2.0f, 4.0f)); } -void SandboxLayer::OnDetach() { +void World::OnDetach() { mSoftBodies.clear(); } -void SandboxLayer::OnFixedUpdate(float dt) { +void World::OnFixedUpdate(float dt) { for (const std::unique_ptr &softBody: mSoftBodies) { for (Spring &spring: softBody->springs) { const glm::vec2 dPosition = spring.mParticle2.position - spring.mParticle1.position; @@ -55,15 +55,15 @@ void SandboxLayer::OnFixedUpdate(float dt) { } } -void SandboxLayer::OnUpdate(float dt) { +void World::OnUpdate(float dt) { // ... } -void SandboxLayer::OnLateUpdate(float dt) { +void World::OnLateUpdate(float dt) { // ... } -void SandboxLayer::OnRender(sf::RenderWindow &window) { +void World::OnRender(sf::RenderWindow &window) { for (const std::unique_ptr &softBody: mSoftBodies) { for (const Spring &spring: softBody->springs) { sf::VertexArray line(sf::Lines, 2);