escape-the-dawn/Escape-the-Dawn/GameWorld.cpp.orig

#include "GameWorld.h"


void GameWorld::Initialize()
{
	World::Initialize();

	//AddSystem("LevelGenerationSystem");
	AddSystem("InputSystem");
	AddSystem("CollisionSystem");
	//AddSystem("ParticleSystem");
	AddSystem("PlayerSystem");
	AddSystem("SoundSystem");
	AddSystem("RenderSystem");

	std::shared_ptr<Components::Transform> transform;
	std::shared_ptr<Components::Model> model;
	std::shared_ptr<Components::PointLight> pointLight;
	std::shared_ptr<Components::Camera> camera;
	std::shared_ptr<Components::Bounds> bounds;
	std::shared_ptr<Components::Collision> collision;
	EntityID ent;

	// Camera
	entcamera = CreateEntity();
	SetProperty(entcamera, "Name", std::string("Camera"));
	transform = AddComponent<Components::Transform>(entcamera, "Transform");
	AddComponent<Components::Input>(entcamera, "Input");
	transform->Position = glm::vec3(0.f, 2.f, 10.f);
	camera = AddComponent<Components::Camera>(entcamera, "Camera");
	camera->FOV		= 45.f;
	camera->FarClip	= 1000.f;
	camera->NearClip	= 0.01f;
	transform->Orientation = glm::angleAxis<float>(glm::radians(25.0f),glm::vec3(1,0,0));
	collision = AddComponent<Components::Collision>(entcamera, "Collision");
	collision->Phantom = false;
	bounds = AddComponent<Components::Bounds>(entcamera, "Bounds");
	bounds->Origin = transform->Position;
	bounds->VolumeVector = glm::vec3(4.f,2.f,2.f);

	// Fucking lights
	ent = CreateEntity();
	transform = AddComponent<Components::Transform>(ent, "Transform");
	transform->Position = glm::vec3(0.f, 4.f, 0.f);
	transform->Position = glm::vec3(10.f, 2.f, 5.f);
	pointLight = AddComponent<Components::PointLight>(ent, "PointLight");
	pointLight->Specular = glm::vec3(1.0,  1.0,  1.0);
	pointLight->Diffuse = glm::vec3(1.0,  1.0,  1.0);
	pointLight->Diffuse = glm::vec3(1.0,  1.0,  5.0);
	pointLight->constantAttenuation = 0.f;
	pointLight->linearAttenuation = 1.f;
	pointLight->quadraticAttenuation = 0.f;
	pointLight->spotExponent = 0.0f;
	model = AddComponent<Components::Model>(ent, "Model");
	model->ModelFile = "sphere.obj";
	ent = CreateEntity();
	transform = AddComponent<Components::Transform>(ent, "Transform");
	transform->Position = glm::vec3(10.f, 4.f, 0.f);
	transform->Position = glm::vec3(0.f, 2.f, 5.f);
	pointLight = AddComponent<Components::PointLight>(ent, "PointLight");
	pointLight->Specular = glm::vec3(1.0,  1.0,  1.0);
	pointLight->Diffuse = glm::vec3(1.0,  1.0,  1.0);
	pointLight->Specular = glm::vec3(3.0,  3.0,  3.0);
	pointLight->Diffuse = glm::vec3(3.0,  0.0,  0.0);
	pointLight->constantAttenuation = 0.f;
	pointLight->linearAttenuation = 1.f;
	pointLight->quadraticAttenuation = 0.f;
	pointLight->spotExponent = 0.0f;
	model = AddComponent<Components::Model>(ent, "Model");
	model->ModelFile = "sphere.obj";
	ent = CreateEntity();
	transform = AddComponent<Components::Transform>(ent, "Transform");
	transform->Position = glm::vec3(0.f, -4.f, 0.f);
	transform->Position = glm::vec3(-10.f, 2.f, 5.f);
	pointLight = AddComponent<Components::PointLight>(ent, "PointLight");
	pointLight->Specular = glm::vec3(1.0,  1.0,  1.0);
	pointLight->Diffuse = glm::vec3(1.0,  1.0,  1.0);
	pointLight->Diffuse = glm::vec3(0.0,  3.0,  0.0);
	pointLight->constantAttenuation = 0.f;
	pointLight->linearAttenuation = 1.f;
	pointLight->quadraticAttenuation = 0.f;
	pointLight->spotExponent = 0.0f;
	model = AddComponent<Components::Model>(ent, "Model");
	model->ModelFile = "sphere.obj";

	//ground
	ent = CreateEntity();
	transform = AddComponent<Components::Transform>(ent, "Transform");
	transform->Position = glm::vec3(0.f, 0.f, 0.f);
	model = AddComponent<Components::Model>(ent, "Model");
	model->ModelFile = "plane.obj";

	// Player
<<<<<<< HEAD
	player1 = CreateEntity();
	transform = AddComponent<Components::Transform>(player1, "Transform");
	transform->Position = glm::vec3(0.f, 0.f, 0.f);
	model = AddComponent<Components::Model>(player1, "Model");
	model->ModelFile = "ship.obj";
	collision = AddComponent<Components::Collision>(player1, "Collision");
	collision->Phantom = false;
	bounds = AddComponent<Components::Bounds>(player1, "Bounds");
	bounds->Origin = transform->Position;
	bounds->VolumeVector = glm::vec3(10.f,10.f,5.f);


	player2 = CreateEntity();
	transform = AddComponent<Components::Transform>(player2, "Transform");
	transform->Position = glm::vec3(10.f, 0.f, 0.f);
	model = AddComponent<Components::Model>(player2, "Model");
=======
	m_Player = CreateEntity();
	transform = AddComponent<Components::Transform>(m_Player, "Transform");
	transform->Position = glm::vec3(0.f, 4.f, 0.f);
	model = AddComponent<Components::Model>(m_Player, "Model");
	model->ModelFile = "ship.obj";
	auto bounds = AddComponent<Components::Bounds>(m_Player, "Bounds");
	bounds->Origin = glm::vec3(0.f);
	bounds->VolumeVector = glm::vec3(1.0f, 2.0f, 3.0f);

	ent = CreateEntity();
	transform = AddComponent<Components::Transform>(ent, "Transform");
	transform->Position = glm::vec3(10.f, 4.f, 0.f);
	model = AddComponent<Components::Model>(ent, "Model");
>>>>>>> 21b2e3bdc15ac8b21f027a7f531574f46187ae80
	model->ModelFile = "ship.obj";
	collision = AddComponent<Components::Collision>(player2, "Collision");
	collision->Phantom = false;
	bounds = AddComponent<Components::Bounds>(player2, "Bounds");
	bounds->Origin = transform->Position;
	bounds->VolumeVector = glm::vec3(2.f,2.f,2.f);
}

void GameWorld::Update(double dt)
{
	World::Update(dt);
<<<<<<< HEAD
	if(GetSystem<Systems::CollisionSystem>("CollisionSystem")->Intersects(player1, entcamera))
		assert(false);
=======

	auto transform = GetComponent<Components::Transform>(m_Player, "Transform");
	transform->Orientation = transform->Orientation * glm::angleAxis<float>(dt, glm::vec3(0, 0, 1));
>>>>>>> 21b2e3bdc15ac8b21f027a7f531574f46187ae80
}

void GameWorld::RegisterComponents()
{
	m_ComponentFactory.Register("Bounds", []() { return new Components::Bounds(); });
	m_ComponentFactory.Register("Camera", []() { return new Components::Camera(); });
	m_ComponentFactory.Register("Collision", []() { return new Components::Collision(); });
	m_ComponentFactory.Register("DirectionalLight", []() { return new Components::DirectionalLight(); });
	m_ComponentFactory.Register("Input", []() { return new Components::Input(); });
	m_ComponentFactory.Register("Model", []() { return new Components::Model(); });
	m_ComponentFactory.Register("ParticleEmitter", []() { return new Components::ParticleEmitter(); });
	m_ComponentFactory.Register("PointLight", []() { return new Components::PointLight(); });
	m_ComponentFactory.Register("PowerUp", []() { return new Components::PowerUp(); });
	m_ComponentFactory.Register("SoundEmitter", []() { return new Components::SoundEmitter(); });
	m_ComponentFactory.Register("Sprite", []() { return new Components::Sprite(); });
	m_ComponentFactory.Register("Stat", []() { return new Components::Stat(); });
	m_ComponentFactory.Register("Template", []() { return new Components::Template(); });
	m_ComponentFactory.Register("Transform", []() { return new Components::Transform(); });
}

void GameWorld::RegisterSystems()
{
	//m_SystemFactory.Register("LevelGenerationSystem", [this]() { return new Systems::LevelGenerationSystem(this); });
	m_SystemFactory.Register("InputSystem", [this]() { return new Systems::InputSystem(this, m_Renderer); });
	m_SystemFactory.Register("CollisionSystem", [this]() { return new Systems::CollisionSystem(this); });
	//m_SystemFactory.Register("ParticleSystem", [this]() { return new Systems::ParticleSystem(this); });
	m_SystemFactory.Register("PlayerSystem", [this]() { return new Systems::PlayerSystem(this); });
	m_SystemFactory.Register("SoundSystem", [this]() { return new Systems::SoundSystem(this); });
	m_SystemFactory.Register("RenderSystem", [this]() { return new Systems::RenderSystem(this, m_Renderer); });
}