Merge branch 'master' into Sound

src/game/Game/BallSystem.cpp

@@ -307,7 +307,7 @@ bool dd::Systems::BallSystem::Contact(const Events::Contact &event)
 			} else if (ballTransform->Position.x <= -2.7f) {
 				particleEvent.Position = glm::vec3(-2.7f, -3.f, -3.f);
 			}
-			particleEvent.Radius = 1.f;
+			particleEvent.ScaleValues.push_back(glm::vec3(1.f));
 			particleEvent.Color = glm::vec4(1.f);
 			particleEvent.Speed = 0;
 

src/game/Game/LevelSystem.cpp

@@ -286,6 +286,7 @@ bool dd::Systems::LevelSystem::OnContact(const dd::Events::Contact &event)
 		brick->Removed = true;
 		m_World->RemoveEntity(entityShot);
 		BrickHit(entityShot, entityBrick, 1);
+		//ep.Radius = 0.05;
 
 		return true;
 	}
@@ -393,6 +394,45 @@ void dd::Systems::LevelSystem::BrickHit(EntityID entityHitter, EntityID entityBr
 		m_World->RemoveComponent<Components::Template>(b);
 		m_World->SetEntityParent(b, 0);
 		m_World->CommitEntity(b);
+
+		//Particle trail
+		Events::CreateParticleSequence trail;
+		trail.parent = b;
+		trail.AlphaValues.push_back(1.f);
+		trail.AlphaValues.push_back(0.f);
+		trail.ScaleValues.push_back(glm::vec3(0.08f));
+		trail.ScaleValues.push_back(glm::vec3(0.f));
+		trail.RadiusDistribution = 1;
+		trail.EmitterLifeTime = 2.f;
+		trail.ParticleLifeTime = 1.f;
+		trail.ParticlesPerTick = 1;
+		trail.SpawnRate = 0.1f;
+		trail.Speed = 10.f;
+		trail.EmittingAngle = glm::half_pi<float>();
+		trail.SpriteFile = "Textures/Particles/FadeBall.png";
+		trail.Color = brickModel->Color;
+		//p.Spread = ...
+		EventBroker->Publish(trail);
+
+		//ParticlePoof
+		Events::CreateParticleSequence poof;
+		poof.EmitterLifeTime = 4;
+		poof.EmittingAngle = glm::half_pi<float>();
+		poof.Spread = 0.5f;
+		poof.NumberOfTicks = 1;
+		poof.ParticleLifeTime = 1.5f;
+		poof.ParticlesPerTick = 1;
+		poof.Position = cTransform->Position;
+		poof.ScaleValues.clear();
+		poof.ScaleValues.push_back(glm::vec3(0.5f));
+		poof.ScaleValues.push_back(glm::vec3(2.f, 2.f, 0.2f));
+		poof.SpriteFile = "Textures/Particles/Cloud_Particle.png";
+		poof.Color = brickModel->Color;
+		poof.AlphaValues.clear();
+		poof.AlphaValues.push_back(1.f);
+		poof.AlphaValues.push_back(0.f);
+		poof.Speed = 10;
+		EventBroker->Publish(poof);
 	}