Skip to content

Commit

Permalink
Rename SandboxLayer to World
Browse files Browse the repository at this point in the history
  • Loading branch information
xorz57 committed Jan 20, 2024
1 parent 92a7762 commit 060228b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/SandboxLayer.hpp → include/World.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#include <memory>
#include <vector>

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;
Expand Down
4 changes: 2 additions & 2 deletions src/Application.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Application.hpp"
#include "SandboxLayer.hpp"
#include "World.hpp"

#include <SFML/Graphics/RenderWindow.hpp>
#include <SFML/System/Time.hpp>
Expand All @@ -14,7 +14,7 @@
#include <implot.h>

Application::Application(ApplicationSettings applicationSettings) : mApplicationSettings(std::move(applicationSettings)) {
PushLayer(std::make_unique<SandboxLayer>("SandboxLayer"));
PushLayer(std::make_unique<World>("World"));
}

void Application::PushLayer(std::unique_ptr<Layer> layer) {
Expand Down
16 changes: 8 additions & 8 deletions src/SandboxLayer.cpp → src/World.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "SandboxLayer.hpp"
#include "World.hpp"
#include "Particle.hpp"
#include "Spring.hpp"
#include "DoubleSpringPendulum.hpp"
Expand All @@ -16,21 +16,21 @@

#include <implot.h>

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<SoftBody1>(glm::vec2(100.0f, 100.0f), 50.0f, 2.0f, 4.0f));
mSoftBodies.emplace_back(std::make_unique<SoftBody2>(glm::vec2(300.0f, 200.0f), 50.0f, 2.0f, 4.0f));
mSoftBodies.emplace_back(std::make_unique<SoftBody3>(glm::vec2(500.0f, 300.0f), 50.0f, 2.0f, 4.0f, 8));
mSoftBodies.emplace_back(std::make_unique<SpringPendulum>(glm::vec2(400.0f, 0.0f), 100.0f, 2.0f, 4.0f));
mSoftBodies.emplace_back(std::make_unique<DoubleSpringPendulum>(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> &softBody: mSoftBodies) {
for (Spring &spring: softBody->springs) {
const glm::vec2 dPosition = spring.mParticle2.position - spring.mParticle1.position;
Expand All @@ -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> &softBody: mSoftBodies) {
for (const Spring &spring: softBody->springs) {
sf::VertexArray line(sf::Lines, 2);
Expand Down

0 comments on commit 060228b

Please sign in to comment.