Remove unused component

Hjaltesorgenfrei · Feb 2, 2024 · ca109cd · ca109cd
1 parent e01c8c2
commit ca109cd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 32 deletions.
diff --git a/src/client/Application.cpp b/src/client/Application.cpp
@@ -277,7 +277,6 @@ entt::entity App::addPlayer(T input) {
 	auto color = Color::playerColor(playerId);
 	registry.emplace<Player>(entity, playerId, color);
 	registry.emplace<Transform>(entity);
-	registry.emplace<CarStateLastUpdate>(entity);
 	registry.emplace<CarControl>(entity);
 	registry.emplace<std::shared_ptr<RenderObject>>(entity, std::make_shared<RenderObject>(meshes["car"], carMaterial));
 	registry.emplace<SelectedTag>(entity);

diff --git a/src/engine/Components.hpp b/src/engine/Components.hpp
@@ -77,13 +77,6 @@ struct CarControl {
 	float desiredBrake = 0.0f;
 };
 
-// Struct to store speed, direction and position of a car for the last frame.
-struct CarStateLastUpdate {
-	float speed;
-	glm::vec3 direction;
-	glm::vec3 position;
-};
-
 // TODO: Organize the values better. And add the rest of the values.
 // TODO: Add a short description of each value and its unit
 struct CarSettings {

diff --git a/src/engine/systems/CarSystem.cpp b/src/engine/systems/CarSystem.cpp
@@ -19,7 +19,7 @@ inline glm::quat toGlm(JPH::Quat quat) {
 }
 
 void CarSystem::update(entt::registry &registry, float delta, entt::entity ent, CarControl const &carControl,
-					   CarPhysics &car, CarStateLastUpdate &lastState) const {
+					   CarPhysics &car) const {
 	using namespace JPH;
 
 	WheeledVehicleController *controller = static_cast<WheeledVehicleController *>(car.constraint->GetController());
@@ -32,7 +32,7 @@ void CarSystem::update(entt::registry &registry, float delta, entt::entity ent,
 }
 
 void CarKeyboardSystem::update(entt::registry &registry, float delta, entt::entity ent, KeyboardInput const &input,
-							   CarStateLastUpdate const &lastState, CarControl &carControl) const {
+							   CarControl &carControl) const {
 	carControl.desiredAcceleration = 0.0f;
 	carControl.desiredBrake = 0.0f;
 
@@ -52,19 +52,13 @@ void CarKeyboardSystem::update(entt::registry &registry, float delta, entt::enti
 		carControl.desiredAcceleration = 0.0f;
 	}
 
-	if (lastState.speed >= 15.0f && input.keys[GLFW_KEY_DOWN]) {
-		carControl.desiredBrake = 1.0f;
-	} else if (lastState.speed <= -15.0f && input.keys[GLFW_KEY_UP]) {
-		carControl.desiredBrake = 1.0f;
-	}
-
 	if (input.keys[GLFW_KEY_SPACE]) {
 		carControl.desiredBrake = 1.0f;
 	}
 }
 
 void CarJoystickSystem::update(entt::registry &registry, float delta, entt::entity ent, GamepadInput const &input,
-							   CarStateLastUpdate const &lastState, CarControl &carControl) const {
+							   CarControl &carControl) const {
 	carControl.desiredAcceleration = 0.0f;
 	carControl.desiredBrake = 0.0f;
 
@@ -74,11 +68,5 @@ void CarJoystickSystem::update(entt::registry &registry, float delta, entt::enti
 	carControl.desiredAcceleration += -input.leftTrigger * 1.0f;
 	carControl.desiredAcceleration = std::clamp(carControl.desiredAcceleration, -1.0f, 1.0f);
 
-	if (lastState.speed >= 15.0f) {
-		carControl.desiredBrake = input.leftTrigger * 1.0f;
-	} else if (lastState.speed <= -15.0f) {
-		carControl.desiredBrake = input.rightTrigger * 1.0f;
-	}
-
 	// TODO: Right now you have to stop completely before you can reverse. fix this
 }
diff --git a/src/engine/systems/CarSystem.hpp b/src/engine/systems/CarSystem.hpp
@@ -3,19 +3,17 @@
 #include "../DependentSystem.hpp"
 #include "../PhysicsBody.hpp"
 
-struct CarSystem : System<CarSystem, Reads<CarControl>, Writes<CarPhysics>, Others<CarStateLastUpdate>> {
-	void update(entt::registry &registry, float delta, entt::entity ent, CarControl const &carControl, CarPhysics &car,
-				CarStateLastUpdate &lastState) const;
+struct CarSystem : System<CarSystem, Reads<CarControl>, Writes<CarPhysics>, Others<>> {
+	void update(entt::registry &registry, float delta, entt::entity ent, CarControl const &carControl,
+				CarPhysics &car) const;
 };
 
-struct CarKeyboardSystem
-	: System<CarKeyboardSystem, Reads<KeyboardInput, CarStateLastUpdate>, Writes<CarControl>, Others<>> {
+struct CarKeyboardSystem : System<CarKeyboardSystem, Reads<KeyboardInput>, Writes<CarControl>, Others<>> {
 	void update(entt::registry &registry, float delta, entt::entity ent, KeyboardInput const &input,
-				CarStateLastUpdate const &lastState, CarControl &carControl) const;
+				CarControl &carControl) const;
 };
 
-struct CarJoystickSystem
-	: System<CarJoystickSystem, Reads<GamepadInput, CarStateLastUpdate>, Writes<CarControl>, Others<>> {
+struct CarJoystickSystem : System<CarJoystickSystem, Reads<GamepadInput>, Writes<CarControl>, Others<>> {
 	void update(entt::registry &registry, float delta, entt::entity ent, GamepadInput const &input,
-				CarStateLastUpdate const &lastState, CarControl &carControl) const;
+				CarControl &carControl) const;
 };