From 1372ac4a6bf879b3045a4181106c873ea938b484 Mon Sep 17 00:00:00 2001
From: Fredrick Johansson <fredrick@loopaware.com>
Date: Sat, 29 Aug 2020 15:49:18 +0200
Subject: [PATCH] Updated the out-of-bounds reset

- Now resets to initial position, and not a random one.
---
 src/entities/KartPhysicsComponent.cpp | 8 ++++----
 src/entities/KartPhysicsComponent.h   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/entities/KartPhysicsComponent.cpp b/src/entities/KartPhysicsComponent.cpp
index d2af911..c25e89a 100644
--- a/src/entities/KartPhysicsComponent.cpp
+++ b/src/entities/KartPhysicsComponent.cpp
@@ -20,7 +20,8 @@ KartPhysicsComponent::KartPhysicsComponent(mat4 transform,
                          physicsSystem,
                          physicsCollisionSubSystem,
                          physicsColliderQuerySubSystem,
-                         collider)
+                         collider),
+        mInitialTransform(transform)
 {}
 
 KartPhysicsComponent::~KartPhysicsComponent()
@@ -33,9 +34,8 @@ void KartPhysicsComponent::update(const milliseconds dtms)
 
     if (getPosition().y < -100.0f)
     {
-    	setPosition(vec3(getFloatInRange(-10.0f, 10.0f),
-                		 10, /// above the ball
-						 getFloatInRange(-10.0f, 10.0f)));
+    	setPosition(vec3(0, 0, 0), true);
+    	setTransform(mInitialTransform);
     }
 
     if (glm::length(mDirection) > 0)
diff --git a/src/entities/KartPhysicsComponent.h b/src/entities/KartPhysicsComponent.h
index 4dd6eac..31b7017 100644
--- a/src/entities/KartPhysicsComponent.h
+++ b/src/entities/KartPhysicsComponent.h
@@ -77,6 +77,7 @@ class KartPhysicsComponent:
 {
 private:
     vec3 mDirection;
+    mat4 mInitialTransform; ///< Used for reset.
 
 public:
     KartPhysicsComponent(mat4 transform,