CTravels replaces Sticky = true. Put "Travels" component on anything that should be moved down during travel sequences.

include/Core/CTransform.h

@@ -41,9 +41,6 @@ struct Transform : public Component
 	glm::vec3 Velocity;
 	/** Physical scale multiplier. */
 	glm::vec3 Scale;
-
-	// Sticky is if it sticks with the player or not. True means it will follow the camera.
-	bool Sticky = true;
 };
 
 }

include/Core/Engine.h

@@ -49,6 +49,7 @@
 #include "Game/CBrick.h"
 #include "Game/CWall.h"
 #include "Game/CBackground.h"
+#include "Game/CTravels.h"
 #include "Game/CStickyAim.h"
 #include "Game/BallSystem.h"
 #include "Game/HitLagSystem.h"
@@ -128,6 +129,7 @@ public:
 		m_World->ComponentFactory.Register<Components::Lifebuoy>();
 		m_World->ComponentFactory.Register<Components::Projectile>();
 		m_World->ComponentFactory.Register<Components::StickyAim>();
+		m_World->ComponentFactory.Register<Components::Travels>();
 
 		m_World->ComponentFactory.Register<Components::PowerUp>();
 		m_World->ComponentFactory.Register<Components::PowerUpBrick>();

include/Game/BallSystem.h

@@ -93,7 +93,7 @@ public:
 
 private:
     float m_XMovementMultiplier = 2.f;
-    float m_EdgeX = 3.2f;
+    float m_EdgeX = 3.4f; //Actually 3.2, but anyways.
     float m_EdgeY = 5.2f;
     int m_MultiBalls = 0;
     int m_Lives = 3;

include/Game/CTravels.h

@@ -0,0 +1,26 @@
+//
+// Created by Adniklastrator on 2015-10-15.
+//
+
+#ifndef DAYDREAM_CTRAVELS_H
+#define DAYDREAM_CTRAVELS_H
+
+#include "Core/Component.h"
+
+namespace dd
+{
+
+namespace Components
+{
+
+struct Travels : Component 
+{
+	//This indicates that the object moves upon moving to the next stage. Place this on an object that is to move.
+	//The camera does not move. Things that are to follow the camera should not have this component.
+};
+
+}
+
+}
+
+#endif //DAYDREAM_CTRAVELS_H

include/Game/LevelSystem.h

@@ -25,6 +25,7 @@
 #include "Game/CBackground.h"
 #include "Game/CProjectile.h"
 #include "Game/CPowerUp.h"
+#include "Game/CTravels.h"
 
 #include "Game/BrickComponents.h"
 

include/Game/TravellingSystem.h

@@ -13,6 +13,7 @@
 #include "Game/EPause.h"
 #include "Game/EArrivedAtNewStage.h"
 #include "Game/EStageCleared.h"
+#include "Game/CTravels.h"
 
 
 namespace dd

src/game/Game/BallSystem.cpp

@@ -47,7 +47,6 @@ void dd::Systems::BallSystem::Initialize()
         physics->Category = CollisionLayer::Type::Ball;
 		physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Type::Pad | CollisionLayer::Type::Brick | CollisionLayer::Type::Wall | CollisionLayer::LifeBuoy);
         physics->Calculate = true;
-        transform->Sticky = true;
 
         m_World->CommitEntity(ent);
 
@@ -168,7 +167,7 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
                 return;
             }
         } //Removing this made the wall collisions work again
-         /*else if (transformBall->Position.x > EdgeX()) {
+         else if (transformBall->Position.x > EdgeX()) {
             if (transformBall->Velocity.x > 0) {
                 glm::vec2 reflectedVelocity = glm::reflect(glm::vec2(transformBall->Velocity.x, transformBall->Velocity.y), glm::vec2(1, 0));
                 transformBall->Velocity = glm::vec3(reflectedVelocity, 0.f);
@@ -178,7 +177,7 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
                 glm::vec2 reflectedVelocity = glm::reflect(glm::vec2(transformBall->Velocity.x, transformBall->Velocity.y), glm::vec2(-1, 0));
                 transformBall->Velocity = glm::vec3(reflectedVelocity, 0.f);
             }
-        } else if (transformBall->Position.y > EdgeY()) {
+        } /*else if (transformBall->Position.y > EdgeY()) {
             if (transformBall->Velocity.y > 0) {
                 glm::vec2 reflectedVelocity = glm::reflect(glm::vec2(transformBall->Velocity.x, transformBall->Velocity.y), glm::vec2(0, 1));
                 transformBall->Velocity = glm::vec3(reflectedVelocity, 0.f);
@@ -419,7 +418,6 @@ void dd::Systems::BallSystem::CreateLife(int number)
     std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(life);
     transform->Position = glm::vec3(-1.5f + number * 0.15f, -2.f, -5.f);
     transform->Scale = glm::vec3(0.1f, 0.1f, 0.1f);
-    transform->Sticky = true;
 
     std::shared_ptr<Components::Life> lifeNr = m_World->AddComponent<Components::Life>(life);
     lifeNr->Number = number;

src/game/Game/LevelSystem.cpp

@@ -26,7 +26,6 @@ void dd::Systems::LevelSystem::Initialize()
 		auto t_Light = m_World->CreateEntity();
 		auto transform = m_World->AddComponent<Components::Transform>(t_Light);
 		transform->Position = glm::vec3(-3.f, 6.f, -5.f);
-		transform->Sticky = true;
 		auto pl = m_World->AddComponent<Components::PointLight>(t_Light);
 		pl->Radius = 20.f;
 		pl->Diffuse = glm::vec3(0.8f, 0.7f, 0.05f);
@@ -38,7 +37,6 @@ void dd::Systems::LevelSystem::Initialize()
 		auto t_Light = m_World->CreateEntity();
 		auto transform = m_World->AddComponent<Components::Transform>(t_Light);
 		transform->Position = glm::vec3(3.f, -5.f, -5.f);
-			transform->Sticky = true;
 		auto pl = m_World->AddComponent<Components::PointLight>(t_Light);
 		pl->Radius = 15.f;
 		pl->Diffuse = glm::vec3(0.1f, 0.5f, 0.8f);
@@ -51,24 +49,18 @@ void dd::Systems::LevelSystem::Initialize()
 	{
 		auto t_halfPipe = m_World->CreateEntity();
 		auto transform = m_World->AddComponent<Components::Transform>(t_halfPipe);
+		auto background = m_World->AddComponent<Components::Background>(t_halfPipe);
 		transform->Position = glm::vec3(0.f, 0.f, -15.f);
 		transform->Scale = glm::vec3(6.f, 6.f, 10.f);
-			transform->Sticky = false;
+		auto travels = m_World->AddComponent<Components::Travels>(t_halfPipe);
-			auto model = m_World->AddComponent<Components::Model>(t_halfPipe);
-			model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj";
-			model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 0.3f);
-			m_World->CommitEntity(t_halfPipe);
-		}
-		{
-			auto t_halfPipe = m_World->CreateEntity();
-			auto transform = m_World->AddComponent<Components::Transform>(t_halfPipe);
-			transform->Position = glm::vec3(0.f, 34.6f, -15.f);
-			transform->Scale = glm::vec3(6.f, 6.f, 10.f);
-			transform->Sticky = false;
 		auto model = m_World->AddComponent<Components::Model>(t_halfPipe);
 		model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj";
 		model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 0.3f);
 		m_World->CommitEntity(t_halfPipe);
+
+		auto t_halfPipe2 = m_World->CloneEntity(t_halfPipe);
+		auto transform2 = m_World->GetComponent<Components::Transform>(t_halfPipe);
+		transform2->Position = glm::vec3(0.f, 34.6f, -15.f);
 	}
 
 	//Background
@@ -76,6 +68,8 @@ void dd::Systems::LevelSystem::Initialize()
 	{
 		auto background = m_World->CreateEntity();
 		auto transform = m_World->AddComponent<Components::Transform>(background);
+		auto travels = m_World->AddComponent<Components::Travels>(background);
+		auto backgroundComponent = m_World->AddComponent<Components::Background>(background);
 		transform->Position = glm::vec3(0.f, 0.f, -30.f);
 		transform->Scale = glm::vec3(2681.f / 50.f, 1080.f / 50.f, 1.f);
 		auto sprite = m_World->AddComponent<Components::Sprite>(background);
@@ -90,7 +84,6 @@ void dd::Systems::LevelSystem::Initialize()
 		auto transform = m_World->AddComponent<Components::Transform>(t_waterBody);
 		transform->Position = glm::vec3(0.f, -3.5f, -10.f);
 		transform->Scale = glm::vec3(7.0f, 1.5f, 1.f);
-			transform->Sticky = true;
 		auto water = m_World->AddComponent<Components::WaterVolume>(t_waterBody);
 		auto body = m_World->AddComponent<Components::RectangleShape>(t_waterBody);
 		m_World->CommitEntity(t_waterBody);
@@ -137,6 +130,7 @@ void dd::Systems::LevelSystem::Initialize()
 	{
 		auto BottomWall = m_World->CreateEntity();
 		auto transform = m_World->AddComponent<Components::Transform>(BottomWall);
+		auto wall = m_World->AddComponent<Components::Wall>(BottomWall);
 		transform->Position = glm::vec3(0.f, -6.f, -10.f);
 		transform->Scale = glm::vec3(20.f, 0.5f, 1.f);
 		//std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(BottomWall);
@@ -147,7 +141,6 @@ void dd::Systems::LevelSystem::Initialize()
 		physics->CollisionType = CollisionType::Type::Static;
 		physics->Category = CollisionLayer::Wall;
 		physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::LifeBuoy);
-			transform->Sticky = true;
 		m_World->CommitEntity(BottomWall);
 	}
 
@@ -157,6 +150,8 @@ void dd::Systems::LevelSystem::Initialize()
 		transform->Position = glm::vec3(0.f, 6.f, -10.f);
 		transform->Scale = glm::vec3(20.f, 0.5f, 1.f);
 
+		auto wall = m_World->AddComponent<Components::Wall>(topWall);
+
 		//std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(topWall);
 		//sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
 
@@ -167,7 +162,6 @@ void dd::Systems::LevelSystem::Initialize()
 		physics->CollisionType = CollisionType::Type::Static;
 		physics->Category = CollisionLayer::Wall;
 		physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::Brick);
-			transform->Sticky = true;
 
 		m_World->CommitEntity(topWall);
 	}
@@ -179,6 +173,8 @@ void dd::Systems::LevelSystem::Initialize()
 		transform->Position = glm::vec3(-4.f, 1.f, -10.f);
 		transform->Scale = glm::vec3(0.5f, 20.f, 1.f);
 
+		auto wall = m_World->AddComponent<Components::Wall>(leftWall);
+
 		//std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(leftWall);
 		//sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
 
@@ -188,8 +184,7 @@ void dd::Systems::LevelSystem::Initialize()
 		std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(leftWall);
 		physics->CollisionType = CollisionType::Type::Static;
 		physics->Category = CollisionLayer::Wall;
-			physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::Brick);
+		physics->Mask = static_cast<CollisionLayer::Type>(/*CollisionLayer::Ball |*/ CollisionLayer::Brick);
-			transform->Sticky = true;
 
 		m_World->CommitEntity(leftWall);
 	}
@@ -201,6 +196,8 @@ void dd::Systems::LevelSystem::Initialize()
 		transform->Position = glm::vec3(4.f, 1.f, -10.f);
 		transform->Scale = glm::vec3(0.5f, 20.f, 1.f);
 
+		auto wall = m_World->AddComponent<Components::Wall>(rightWall);
+
 		//std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(rightWall);
 		//sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
 
@@ -210,8 +207,7 @@ void dd::Systems::LevelSystem::Initialize()
 		std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(rightWall);
 		physics->CollisionType = CollisionType::Type::Static;
 		physics->Category = CollisionLayer::Wall;
-			physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::Brick);
+		physics->Mask = static_cast<CollisionLayer::Type>(/*CollisionLayer::Ball |*/ CollisionLayer::Brick);
-			transform->Sticky = true;
 
 		m_World->CommitEntity(rightWall);
 	}
@@ -224,11 +220,13 @@ void dd::Systems::LevelSystem::Initialize()
     cRec->Dimensions = glm::vec2(0.9f, 0.35f);
     std::shared_ptr<Components::Physics> cPhys = m_World->AddComponent<Components::Physics>(m_BrickTemplate);
     std::shared_ptr<Components::Template> cTemplate = m_World->AddComponent<Components::Template>(m_BrickTemplate);
+
+	auto travels = m_World->AddComponent<Components::Travels>(m_BrickTemplate);
+
     cPhys->CollisionType = CollisionType::Type::Static;
     cPhys->GravityScale = 0.f;
     cPhys->Category = CollisionLayer::Type::Brick;
     cPhys->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Type::Ball | CollisionLayer::Type::Projectile | CollisionLayer::Type::Wall | CollisionLayer::LifeBuoy);
-    transform->Sticky = false;
 
     model->ModelFile = "Models/Brick/WhiteBrick.obj";
 	transform->Position = glm::vec3(50, 50, -10);
@@ -633,7 +631,6 @@ bool dd::Systems::LevelSystem::OnCreatePowerUp(const dd::Events::CreatePowerUp &
     cPhys->CollisionType = CollisionType::Type::Dynamic;
     cPhys->Category = CollisionLayer::Type::PowerUp;
     cPhys->Mask = CollisionLayer::Type::Pad;
-    transform->Sticky = false;
 
     std::shared_ptr<Components::PowerUp> cPow = m_World->AddComponent<Components::PowerUp>(powerUp);
 

src/game/Game/LifebuoySystem.cpp

@@ -29,7 +29,6 @@ void dd::Systems::LifebuoySystem::Initialize()
 		physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::Brick | CollisionLayer::LifeBuoy | CollisionLayer::Pad | CollisionLayer::Water);
 		physics->Density = 1.0f;
 		physics->GravityScale = 1;
-		ctransform->Sticky = true;
 		auto cModel = m_World->AddComponent<Components::Model>(ent);
 		cModel->ModelFile = "Models/Lifebuoy/Lifebuoy1.obj";
 		auto lifebuoy = m_World->AddComponent<Components::Lifebuoy>(ent);

src/game/Game/PadSystem.cpp

@@ -49,7 +49,6 @@ void dd::Systems::PadSystem::Initialize()
         physics->Category = CollisionLayer::Type::Pad;
 		physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::PowerUp | CollisionLayer::LifeBuoy);
         physics->Calculate = true;
-        ctransform->Sticky = true;
         auto cModel = m_World->AddComponent<Components::Model>(ent);
         cModel->ModelFile = "Models/Ship/Ship.obj";
 
@@ -396,7 +395,6 @@ bool dd::Systems::PadSystem::OnRaiseWater(const dd::Events::RaiseWater &event)
 		auto transform = m_World->AddComponent<Components::Transform>(t_waterBody);
 		transform->Position = glm::vec3(0.f, -3.5f, -10.f);
 		transform->Scale = glm::vec3(7.0f, event.Amount * 1.6f, 1.f);
-		transform->Sticky = true;
 		auto water = m_World->AddComponent<Components::WaterVolume>(t_waterBody);
 		auto body = m_World->AddComponent<Components::RectangleShape>(t_waterBody);
 		m_World->CommitEntity(t_waterBody);

src/game/Game/ProjectileSystem.cpp

@@ -29,7 +29,6 @@ void dd::Systems::ProjectileSystem::Initialize()
 		physics->Category = CollisionLayer::Type::Projectile;
 		physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Type::Pad | CollisionLayer::Type::Brick | CollisionLayer::Type::Wall);
 		physics->Calculate = true;
-		ctransform->Sticky = true;
 		ctransform->Position = glm::vec3(0.f, 0.f, -10.f);
 		ctransform->Scale = glm::vec3(0.1f, 0.1f, 0.1f);
 		auto cModel = m_World->AddComponent<Components::Model>(ent);

src/game/Game/TravellingSystem.cpp

@@ -31,15 +31,13 @@ void dd::Systems::TravellingSystem::Update(double dt)
 void dd::Systems::TravellingSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
 {
 	if (m_Travelling) {
+		auto travels = m_World->GetComponent<Components::Travels>(entity);
+		if (travels != nullptr) {
 			auto transform = m_World->GetComponent<Components::Transform>(entity);
 			if (transform != nullptr) {
-			if (!transform->Sticky) {
 				transform->Position.y -= 6.0f * dt;
 			}
 		}
-		else {
-			transform->Position.y -= 6.0f * dt;
-		}
 	}
 }