ViktorLjung
5f3b03fa6d
Conflicts: src/GameWorld.cpp src/Systems/PhysicsSystem.cpp vs11/Returngeance/Returngeance.vcxproj.filters
230 lines
8.2 KiB
C++
Executable File
230 lines
8.2 KiB
C++
Executable File
#include "PrecompiledHeader.h"
|
|
#include "GameWorld.h"
|
|
|
|
void GameWorld::Initialize()
|
|
{
|
|
World::Initialize();
|
|
|
|
m_ResourceManager.Preload("Model", "Models/Placeholders/PhysicsTest/Plane.obj");
|
|
m_ResourceManager.Preload("Model", "Models/Placeholders/PhysicsTest/ArrowCube.obj");
|
|
|
|
RegisterComponents();
|
|
|
|
|
|
|
|
|
|
{
|
|
auto ground = CreateEntity();
|
|
auto transform = AddComponent<Components::Transform>(ground, "Transform");
|
|
transform->Position = glm::vec3(0, 0, 0);
|
|
//transform->Scale = glm::vec3(400.0f, 10.0f, 400.0f);
|
|
transform->Orientation = glm::quat(glm::vec3(0.0f, 0.0f, 0.0f));
|
|
auto model = AddComponent<Components::Model>(ground, "Model");
|
|
model->ModelFile = "Models/Placeholders/Terrain/Terrain.obj";
|
|
auto meshShape = AddComponent<Components::MeshShape>(ground, "MeshShape");
|
|
meshShape->ResourceName = "Models/Placeholders/Terrain/Terrain.obj";
|
|
|
|
|
|
auto physics = AddComponent<Components::Physics>(ground, "Physics");
|
|
physics->Mass = 10;
|
|
physics->Static = true;
|
|
|
|
CommitEntity(ground);
|
|
}
|
|
|
|
|
|
{
|
|
auto jeep = CreateEntity();
|
|
auto transform = AddComponent<Components::Transform>(jeep, "Transform");
|
|
transform->Position = glm::vec3(0, 10, 0);
|
|
|
|
auto physics = AddComponent<Components::Physics>(jeep, "Physics");
|
|
physics->Mass = 800;
|
|
|
|
|
|
// auto box = AddComponent<Components::Box>(jeep, "Box");
|
|
// box->Width = 1.487f;
|
|
// box->Height = 0.727f;
|
|
// box->Depth = 2.594f;
|
|
|
|
auto meshShape = AddComponent<Components::MeshShape>(jeep, "MeshShape");
|
|
meshShape->ResourceName = "Models/JeepV2/Chassi/chassi.OBJ";
|
|
|
|
auto vehicle = AddComponent<Components::Vehicle>(jeep, "Vehicle");
|
|
|
|
auto light = AddComponent<Components::PointLight>(jeep, "PointLight");
|
|
light->Diffuse = glm::vec3(0, 1, 0);
|
|
light->constantAttenuation = 0.0005f;
|
|
light->linearAttenuation = 0.001f;
|
|
light->quadraticAttenuation = 0.001f;
|
|
|
|
AddComponent<Components::Input>(jeep, "Input");
|
|
|
|
|
|
{
|
|
auto camera = CreateEntity();
|
|
auto transform = AddComponent<Components::Transform>(camera, "Transform");
|
|
transform->Position.z = 20.f;
|
|
transform->Position.y = 10.f;
|
|
transform->Orientation = glm::quat(glm::vec3(-glm::pi<float>() / 8.f, 0.f, 0.f));
|
|
auto cameraComp = AddComponent<Components::Camera>(camera, "Camera");
|
|
cameraComp->FarClip = 2000.f;
|
|
AddComponent(camera, "Input");
|
|
auto freeSteering = AddComponent<Components::FreeSteering>(camera, "FreeSteering");
|
|
CommitEntity(camera);
|
|
}
|
|
|
|
{
|
|
auto chassis = CreateEntity(jeep);
|
|
auto transform = AddComponent<Components::Transform>(chassis, "Transform");
|
|
transform->Position = glm::vec3(0, -0.6577f, 0);
|
|
auto model = AddComponent<Components::Model>(chassis, "Model");
|
|
model->ModelFile = "Models/JeepV2/Chassi/chassi.OBJ";
|
|
}
|
|
|
|
{
|
|
auto wheel = CreateEntity(jeep);
|
|
auto transform = AddComponent<Components::Transform>(wheel, "Transform");
|
|
transform->Position = glm::vec3(1.4f, 0.5546f - 0.6577f - 0.2, -0.9242f);
|
|
transform->Scale = glm::vec3(1.0f);
|
|
auto model = AddComponent<Components::Model>(wheel, "Model");
|
|
model->ModelFile = "Models/JeepV2/WheelFront/wheelFront.obj";
|
|
auto Wheel = AddComponent<Components::Wheel>(wheel, "Wheel");
|
|
Wheel->Hardpoint = transform->Position + glm::vec3(0.f, 1.f, 0.f);
|
|
Wheel->AxleID = 0;
|
|
Wheel->Mass = 50;
|
|
Wheel->Radius = 0.837f;
|
|
Wheel->Steering = true;
|
|
Wheel->SuspensionStrength = 40.f;
|
|
Wheel->Friction = 3.0f;
|
|
Wheel->ConnectedToHandbrake = true;
|
|
CommitEntity(wheel);
|
|
}
|
|
|
|
{
|
|
auto wheel = CreateEntity(jeep);
|
|
auto transform = AddComponent<Components::Transform>(wheel, "Transform");
|
|
transform->Position = glm::vec3(-1.4f, 0.5546f - 0.6577f - 0.2, -0.9242f);
|
|
transform->Scale = glm::vec3(1.0f);
|
|
transform->Orientation = glm::angleAxis(glm::pi<float>(), glm::vec3(0, 0, 1));
|
|
auto model = AddComponent<Components::Model>(wheel, "Model");
|
|
model->ModelFile = "Models/JeepV2/WheelFront/wheelFront.obj";
|
|
auto Wheel = AddComponent<Components::Wheel>(wheel, "Wheel");
|
|
Wheel->Hardpoint = transform->Position + glm::vec3(0.f, 1.f, 0.f);
|
|
Wheel->AxleID = 0;
|
|
Wheel->Mass = 50;
|
|
Wheel->Radius = 0.837f;
|
|
Wheel->Steering = true;
|
|
Wheel->SuspensionStrength = 40.f;
|
|
Wheel->Friction = 3.0f;
|
|
Wheel->ConnectedToHandbrake = true;
|
|
CommitEntity(wheel);
|
|
}
|
|
|
|
{
|
|
auto wheel = CreateEntity(jeep);
|
|
auto transform = AddComponent<Components::Transform>(wheel, "Transform");
|
|
transform->Position = glm::vec3(0.2726f, 0.2805f - 0.6577f, 1.9307f);
|
|
auto model = AddComponent<Components::Model>(wheel, "Model");
|
|
model->ModelFile = "Models/JeepV2/WheelBack/wheelBack.obj";
|
|
auto Wheel = AddComponent<Components::Wheel>(wheel, "Wheel");
|
|
Wheel->Hardpoint = transform->Position + glm::vec3(0.f, 1.f, 0.f);
|
|
Wheel->AxleID = 1;
|
|
Wheel->Mass = 10;
|
|
Wheel->Radius = 0.737f;
|
|
Wheel->Steering = false;
|
|
Wheel->SuspensionStrength = 20.f;
|
|
Wheel->Friction = 3.0f;
|
|
Wheel->ConnectedToHandbrake = true;
|
|
CommitEntity(wheel);
|
|
}
|
|
|
|
{
|
|
auto wheel = CreateEntity(jeep);
|
|
auto transform = AddComponent<Components::Transform>(wheel, "Transform");
|
|
transform->Position = glm::vec3(-0.2726f, 0.2805f - 0.6577f, 1.9307f);
|
|
transform->Orientation = glm::angleAxis(glm::pi<float>(), glm::vec3(0, 0, 1));
|
|
auto model = AddComponent<Components::Model>(wheel, "Model");
|
|
model->ModelFile = "Models/JeepV2/WheelBack/wheelBack.obj";
|
|
auto Wheel = AddComponent<Components::Wheel>(wheel, "Wheel");
|
|
Wheel->Hardpoint = transform->Position + glm::vec3(0.f, 1.f, 0.f);
|
|
Wheel->AxleID = 1;
|
|
Wheel->Mass = 10;
|
|
Wheel->Radius = 0.737f;
|
|
Wheel->Steering = false;
|
|
Wheel->SuspensionStrength = 20.f;
|
|
Wheel->Friction = 3.0f;
|
|
Wheel->ConnectedToHandbrake = true;
|
|
CommitEntity(wheel);
|
|
}
|
|
CommitEntity(jeep);
|
|
}
|
|
|
|
for(int i = 0; i < 0; i++)
|
|
{
|
|
auto cube = CreateEntity();
|
|
auto transform = AddComponent<Components::Transform>(cube, "Transform");
|
|
transform->Position = glm::vec3(20, 10 + i*2, 0);
|
|
transform->Scale = glm::vec3(1);
|
|
transform->Orientation = glm::quat(glm::vec3(0.0f, 0.0f, 0.0f));
|
|
auto model = AddComponent<Components::Model>(cube, "Model");
|
|
model->ModelFile = "Models/cardboardBox/BoxFixed.obj";
|
|
|
|
auto physics = AddComponent<Components::Physics>(cube, "Physics");
|
|
physics->Mass = 100;
|
|
auto box = AddComponent<Components::BoxShape>(cube, "BoxShape");
|
|
box->Width = 0.5f;
|
|
box->Height = 0.5f;
|
|
box->Depth = 0.5f;
|
|
CommitEntity(cube);
|
|
}
|
|
|
|
/*{
|
|
auto entity = CreateEntity();
|
|
AddComponent(entity, "Transform");
|
|
auto emitter = AddComponent<Components::SoundEmitter>(entity, "SoundEmitter");
|
|
emitter->Path = "Sounds/korvring.wav";
|
|
emitter->Loop = true;
|
|
GetSystem<Systems::SoundSystem>("SoundSystem")->PlaySound(emitter);
|
|
CommitEntity(entity);
|
|
}*/
|
|
}
|
|
|
|
void GameWorld::Update(double dt)
|
|
{
|
|
World::Update(dt);
|
|
}
|
|
|
|
void GameWorld::RegisterComponents()
|
|
{
|
|
m_ComponentFactory.Register("Transform", []() { return new Components::Transform(); });
|
|
m_ComponentFactory.Register("Template", []() { return new Components::Template(); });
|
|
}
|
|
|
|
void GameWorld::RegisterSystems()
|
|
{
|
|
m_SystemFactory.Register("TransformSystem", [this]() { return new Systems::TransformSystem(this); });
|
|
//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("FreeSteeringSystem", [this]() { return new Systems::FreeSteeringSystem(this); });
|
|
m_SystemFactory.Register("SoundSystem", [this]() { return new Systems::SoundSystem(this); });
|
|
m_SystemFactory.Register("PhysicsSystem", [this]() { return new Systems::PhysicsSystem(this); });
|
|
m_SystemFactory.Register("RenderSystem", [this]() { return new Systems::RenderSystem(this, m_Renderer); });
|
|
}
|
|
|
|
void GameWorld::AddSystems()
|
|
{
|
|
AddSystem("TransformSystem");
|
|
//AddSystem("LevelGenerationSystem");
|
|
AddSystem("InputSystem");
|
|
//AddSystem("CollisionSystem");
|
|
////AddSystem("ParticleSystem");
|
|
//AddSystem("PlayerSystem");
|
|
AddSystem("FreeSteeringSystem");
|
|
AddSystem("SoundSystem");
|
|
AddSystem("PhysicsSystem");
|
|
AddSystem("RenderSystem");
|
|
} |