Merge remote-tracking branch 'origin/master'

src/game/Game/KrakenSystem.cpp

@@ -20,31 +20,36 @@ void dd::Systems::KrakenSystem::Initialize()
 
 	EntityID ent = m_World->CreateEntity();
 	auto transform = m_World->AddComponent<Components::Transform>(ent);
+	transform->Position = glm::vec3(50, 50, -10);
 	auto model = m_World->AddComponent<Components::Model>(ent);
+	model->ModelFile = "Models/Kraken/Body.dae";
+	auto animationComponent = m_World->AddComponent<Components::Animation>(ent);
+	animationComponent->Speed = 0.6f;
+
 	auto kraken = m_World->AddComponent<Components::Kraken>(ent);
-	std::shared_ptr<Components::RectangleShape> cCircle = m_World->AddComponent<Components::RectangleShape>(ent);
-	cCircle->Dimensions = glm::vec2(2, 4);
+
+	std::shared_ptr<Components::RectangleShape> cRect = m_World->AddComponent<Components::RectangleShape>(ent);
+	cRect->Dimensions = glm::vec2(10.f, 4.f);
+
 	//cCircle->Radius = 2;
 	std::shared_ptr<Components::Physics> cPhys = m_World->AddComponent<Components::Physics>(ent);
-	std::shared_ptr<Components::Template> cTemplate = m_World->AddComponent<Components::Template>(ent);
-
-	auto travels = m_World->AddComponent<Components::Travels>(ent);
-	travels->CurrentlyTraveling = false;
-
 	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);
 
-	model->ModelFile = "Models/Test/Ball/Sid.obj";
-	transform->Position = glm::vec3(50, 50, -10);
+	std::shared_ptr<Components::Template> cTemplate = m_World->AddComponent<Components::Template>(ent);
+
+	auto travels = m_World->AddComponent<Components::Travels>(ent);
+	travels->CurrentlyTraveling = false;
+
+	
 	//sound
 	auto collisionSound = m_World->AddComponent<Components::CollisionSound>(ent);
 	collisionSound->FilePath = "Sounds/Brick/LTTP_Boss_Hit.wav";
 	m_World->CommitEntity(ent);
 
 	m_KrakenTemplate = ent;
-
 	InitializeObjects();
 }
 
@@ -227,6 +232,7 @@ bool dd::Systems::KrakenSystem::OnKrakenAppear(const dd::Events::KrakenAppear &e
 	m_World->RemoveComponent<Components::Template>(ent);
 	auto transform = m_World->GetComponent<Components::Transform>(ent);
 	transform->Position = event.Position;
+	transform->Position.y += 3.f;
 	m_KrakenBattle = true;
 	return true;
 }

src/game/Game/LevelSystem.cpp

@@ -61,8 +61,8 @@ void dd::Systems::LevelSystem::Initialize()
 		auto travels = m_World->AddComponent<Components::Travels>(t_halfPipe);
 		travels->CurrentlyTraveling = 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, 1.f);
+		model->ModelFile = "Models/Halfpipe.obj";
+		//model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 1.f);
 		m_World->CommitEntity(t_halfPipe);
 
 		auto t_halfPipe2 = m_World->CloneEntity(t_halfPipe);
@@ -441,12 +441,13 @@ EntityID dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spac
 	} else if (typeInt == InkBlasterBrick) {
 		cBrick->Type = InkBlasterBrick; 
 		auto type = m_World->AddComponent<Components::InkBlasterBrick>(brick);
-		//model->ModelFile = "Models/Brick/InkBrick.obj";
-		model->Color = glm::vec4(0.1f, 0.1f, 0.1f, 1.0f);
+		model->ModelFile = "Models/Brick/InkBrick.obj";
+		model->Color = glm::vec4(0.7f, 0.7f, 0.7f, 1.f);
 	} else if (typeInt == KrakenAttackBrick) {
 		cBrick->Type = KrakenAttackBrick;
 		auto type = m_World->AddComponent<Components::KrakenAttackBrick>(brick);
-		model->Color = glm::vec4(0.f, 0.5f, 1.0f, 1.0f);
+		model->ModelFile = "Models/Brick/KrakenBrick.obj";
+
 	} else if (typeInt == Kraken) {
 		Events::KrakenAppear e;
 		e.Position = transform->Position;
@@ -1174,11 +1175,11 @@ void dd::Systems::LevelSystem::GetNextLevel()
 		else if (m_CurrentLevel == 6) {
 					level =
 					{0, 0, 0, 0, 0, 0, 0,
-					 0, 0, 0, 100, 0, 0, 0,
 					 0, 0, 0, 0, 0, 0, 0,
 					 0, 0, 0, 0, 0, 0, 0,
 					 0, 0, 0, 0, 0, 0, 0,
-					 0, 0, 0, 0, 0, 0, 0};
+					 0, 0, 0, 0, 0, 0, 0,
+					 0, 0, 0, 100, 0, 0, 0 };
 					color =
 					{w, w, w, w, w, w, w,
 					 w, w, w, w, w, w, w,