From 5e721325a4ba8a535535d21d3a85981980bba17f Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 14 Jan 2016 18:20:51 +0100 Subject: [PATCH] Merge fixes --- include/Engine/Collision/Collision.h | 2 +- include/Engine/Rendering/RenderSystem.h | 10 +- resources/Schema/Components/Camera.xml | 2 +- resources/Schema/Components/Camera.xsd | 4 +- resources/Schema/Entities/MovementTest.xml | 7 ++ src/Engine/Collision/Collision.cpp | 4 +- src/Engine/Editor/EditorSystem.cpp | 3 + src/Engine/Rendering/PickingPass.cpp | 6 +- src/Engine/Rendering/RenderSystem.cpp | 122 ++++++++++----------- src/Game/Game.cpp | 4 +- 10 files changed, 85 insertions(+), 79 deletions(-) diff --git a/include/Engine/Collision/Collision.h b/include/Engine/Collision/Collision.h index 4ea45a55..148f688d 100644 --- a/include/Engine/Collision/Collision.h +++ b/include/Engine/Collision/Collision.h @@ -11,7 +11,7 @@ #include "../Core/Ray.h" #include "../Core/AABB.h" #include "../Rendering/RawModel.h" -#include "../Rendering/RenderQueueFactory.h" +#include "../Core/Transform.h" #include "../Core/Entity.h" #include "../Core/EntityWrapper.h" diff --git a/include/Engine/Rendering/RenderSystem.h b/include/Engine/Rendering/RenderSystem.h index 93e7233f..efe3b88c 100644 --- a/include/Engine/Rendering/RenderSystem.h +++ b/include/Engine/Rendering/RenderSystem.h @@ -14,22 +14,24 @@ #include "ModelJob.h" #include "Renderer.h" #include "../Core/Transform.h" +#include "DebugCameraInputController.h" class RenderSystem : public ImpureSystem { public: RenderSystem(EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame); + ~RenderSystem(); virtual void Update(World* world, double dt) override; private: World* m_World = nullptr; - const IRenderer* m_Renderer = nullptr; + const IRenderer* m_Renderer; RenderFrame* m_RenderFrame; bool m_SwitchCamera = false; - Camera* m_Camera = nullptr; - Camera* m_DefaultCamera = nullptr; + Camera* m_Camera; + DebugCameraInputController* m_DebugCameraInputController; std::list m_CameraComponents; @@ -41,8 +43,6 @@ private: void updateCamera(World* world, double dt); void updateProjectionMatrix(ComponentWrapper& cameraComponent); - glm::mat4 m_ViewMatrix; - glm::mat4 m_ProjectionMatrix; void fillModels(std::list>& jobs, World* world); diff --git a/resources/Schema/Components/Camera.xml b/resources/Schema/Components/Camera.xml index 92225dde..4f613ded 100644 --- a/resources/Schema/Components/Camera.xml +++ b/resources/Schema/Components/Camera.xml @@ -1,6 +1,6 @@ cam - 60.0 + 45 0.01 5000 \ No newline at end of file diff --git a/resources/Schema/Components/Camera.xsd b/resources/Schema/Components/Camera.xsd index 4f02deb0..2b896c74 100644 --- a/resources/Schema/Components/Camera.xsd +++ b/resources/Schema/Components/Camera.xsd @@ -10,7 +10,9 @@ - + + Vertical Field of View in degrees + diff --git a/resources/Schema/Entities/MovementTest.xml b/resources/Schema/Entities/MovementTest.xml index 08e05417..93b4d374 100644 --- a/resources/Schema/Entities/MovementTest.xml +++ b/resources/Schema/Entities/MovementTest.xml @@ -6,6 +6,13 @@ + + + + + + + diff --git a/src/Engine/Collision/Collision.cpp b/src/Engine/Collision/Collision.cpp index 92048e70..6a66be75 100644 --- a/src/Engine/Collision/Collision.cpp +++ b/src/Engine/Collision/Collision.cpp @@ -290,8 +290,8 @@ boost::optional EntityAbsoluteAABB(EntityWrapper& entity) } ComponentWrapper& cAABB = entity["AABB"]; - glm::vec3 absPosition = RenderQueueFactory::AbsolutePosition(entity.World, entity.ID); - glm::vec3 absScale = RenderQueueFactory::AbsoluteScale(entity.World, entity.ID); + glm::vec3 absPosition = Transform::AbsolutePosition(entity.World, entity.ID); + glm::vec3 absScale = Transform::AbsoluteScale(entity.World, entity.ID); glm::vec3 origin = absPosition + (glm::vec3)cAABB["Origin"]; glm::vec3 size = (glm::vec3)cAABB["Size"] * absScale; return AABB::FromOriginSize(origin, size); diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index 714d3d10..69889be5 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -125,6 +125,9 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e) if (m_Selection == 0) { return false; } + if (m_Camera == nullptr) { + return false; + } auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); glm::vec3 widgetOrientation = widgetTransform["Orientation"]; diff --git a/src/Engine/Rendering/PickingPass.cpp b/src/Engine/Rendering/PickingPass.cpp index aa42a961..6800df1d 100644 --- a/src/Engine/Rendering/PickingPass.cpp +++ b/src/Engine/Rendering/PickingPass.cpp @@ -109,7 +109,7 @@ void PickingPass::ClearPicking() { m_PickingColorsToEntity.clear(); m_EntityColors.clear(); - m_ColorCounter[0] = 0; + m_ColorCounter[0] = 1; m_ColorCounter[1] = 0; m_PickingBuffer.Bind(); @@ -138,10 +138,10 @@ PickData PickingPass::Pick(glm::vec2 screenCoord) pickInfo = it->second; } else { pickData.Entity = EntityID_Invalid; + return pickData; } - pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, screenCoord.y, data.Depth, resolution, pickInfo.Camera->ProjectionMatrix(), pickInfo.Camera->ViewMatrix()); - + pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, screenCoord.y, data.Depth, resolution, pickInfo.Camera->ProjectionMatrix(), pickInfo.Camera->ViewMatrix()); pickData.Entity = pickInfo.Entity; pickData.Camera = pickInfo.Camera; pickData.World = pickInfo.World; diff --git a/src/Engine/Rendering/RenderSystem.cpp b/src/Engine/Rendering/RenderSystem.cpp index d6cdb9b3..1435e219 100644 --- a/src/Engine/Rendering/RenderSystem.cpp +++ b/src/Engine/Rendering/RenderSystem.cpp @@ -1,18 +1,21 @@ #include "Rendering/RenderSystem.h" -#include "Rendering/DebugCameraInputController.h" -RenderSystem::RenderSystem(EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame) :ImpureSystem(eventBrokerer) +RenderSystem::RenderSystem(EventBroker* eventBroker, const IRenderer* renderer, RenderFrame* renderFrame) + : System(eventBroker) + , m_Renderer(renderer) + , m_RenderFrame(renderFrame) { - m_Renderer = renderer; - m_RenderFrame = renderFrame; EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera); EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand); - m_DefaultCamera = new Camera((float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, glm::radians(45.f), 0.01f, 5000.f); - m_DefaultCamera->SetPosition(glm::vec3(0, 0, 10)); - if (m_Camera == nullptr) { - m_Camera = m_DefaultCamera; - } + m_Camera = new Camera((float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, glm::radians(45.f), 0.01f, 5000.f); + m_DebugCameraInputController = new DebugCameraInputController(eventBroker, -1); +} + +RenderSystem::~RenderSystem() +{ + delete m_Camera; + delete m_DebugCameraInputController; } bool RenderSystem::OnSetCamera(const Events::SetCamera &event) @@ -54,14 +57,11 @@ void RenderSystem::switchCamera(EntityID entity) void RenderSystem::updateProjectionMatrix(ComponentWrapper& cameraComponent) { double fov = cameraComponent["FOV"]; - double aspectRatio = m_Renderer->Resolution().Width / m_Renderer->Resolution().Height; + double aspectRatio = (float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height; double nearClip = cameraComponent["NearClip"]; double farClip = cameraComponent["FarClip"]; - double fovY = atan(tan(glm::radians(fov)/2.0) * aspectRatio) * 2.0; - m_ProjectionMatrix = glm::perspective(fovY, aspectRatio, nearClip, farClip); - - m_Camera->SetFOV(fovY); + m_Camera->SetFOV(glm::radians(fov)); m_Camera->SetAspectRatio(aspectRatio); m_Camera->SetNearClip(nearClip); m_Camera->SetFarClip(farClip); @@ -129,66 +129,62 @@ void RenderSystem::Update(World* world, double dt) void RenderSystem::updateCamera(World* world, double dt) { - - static DebugCameraInputController firstPersonInputController(m_EventBroker, -1); - - if (m_SwitchCamera) { - auto cameras = world->GetComponents("Camera"); - for (auto it = cameras->begin(); it != cameras->end(); it++) { - if ((*it).EntityID == m_CurrentCamera) { - it++; - if (it != cameras->end()) { - switchCamera((*it).EntityID); - } else { - switchCamera((*cameras->begin()).EntityID); - } - break; + if (m_SwitchCamera) { + auto cameras = world->GetComponents("Camera"); + for (auto it = cameras->begin(); it != cameras->end(); it++) { + if ((*it).EntityID == m_CurrentCamera) { + it++; + if (it != cameras->end()) { + switchCamera((*it).EntityID); + } else { + switchCamera((*cameras->begin()).EntityID); } + break; } + } + ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera"); + ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform"); + + m_DebugCameraInputController->SetOrientation(glm::quat((glm::vec3)cameraTransform["Orientation"])); + m_DebugCameraInputController->SetPosition(cameraTransform["Position"]); + } + + if (m_World->ValidEntity(m_CurrentCamera)) { + if (world->HasComponent(m_CurrentCamera, "Camera") && world->HasComponent(m_CurrentCamera, "Transform")) { ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera"); ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform"); - firstPersonInputController.SetOrientation(glm::quat((glm::vec3)cameraTransform["Orientation"])); - firstPersonInputController.SetPosition(cameraTransform["Position"]); - - } + m_DebugCameraInputController->Update(dt); + (glm::vec3&)cameraTransform["Orientation"] = glm::eulerAngles(m_DebugCameraInputController->Orientation()); + (glm::vec3&)cameraTransform["Position"] = m_DebugCameraInputController->Position(); + + glm::vec3 position = Transform::AbsolutePosition(world, m_CurrentCamera); + glm::quat orientation = Transform::AbsoluteOrientation(world, m_CurrentCamera); + + m_Camera->SetPosition(position); + m_Camera->SetOrientation(orientation); + + updateProjectionMatrix(cameraComponent); + + } + } else { + m_Camera = m_Camera; + + auto cameras = world->GetComponents("Camera"); + if (cameras != nullptr) { + if (cameras->begin() != cameras->end()) { + ComponentWrapper& cameraC = *cameras->begin(); + switchCamera(cameraC.EntityID); - if (m_World->ValidEntity(m_CurrentCamera)) { - if (world->HasComponent(m_CurrentCamera, "Camera") && world->HasComponent(m_CurrentCamera, "Transform")) { ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera"); ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform"); - firstPersonInputController.Update(dt); - (glm::vec3&)cameraTransform["Orientation"] = glm::eulerAngles(firstPersonInputController.Orientation()); - (glm::vec3&)cameraTransform["Position"] = firstPersonInputController.Position(); - - glm::vec3 position = Transform::AbsolutePosition(world, m_CurrentCamera); - glm::quat orientation = Transform::AbsoluteOrientation(world, m_CurrentCamera); - - m_Camera->SetPosition(position); - m_Camera->SetOrientation(orientation); - - updateProjectionMatrix(cameraComponent); - - } - } else { - m_Camera = m_DefaultCamera; - - auto cameras = world->GetComponents("Camera"); - if (cameras != nullptr) { - if (cameras->begin() != cameras->end()) { - ComponentWrapper& cameraC = *cameras->begin(); - switchCamera(cameraC.EntityID); - - ComponentWrapper& cameraComponent = world->GetComponent(m_CurrentCamera, "Camera"); - ComponentWrapper& cameraTransform = world->GetComponent(m_CurrentCamera, "Transform"); - - firstPersonInputController.SetOrientation(glm::quat((glm::vec3)cameraTransform["Orientation"])); - firstPersonInputController.SetPosition(cameraTransform["Position"]); - } + m_DebugCameraInputController->SetOrientation(glm::quat((glm::vec3)cameraTransform["Orientation"])); + m_DebugCameraInputController->SetPosition(cameraTransform["Position"]); } } + } - m_Camera->UpdateViewMatrix(); + m_Camera->UpdateViewMatrix(); } diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index 2be1cb28..a49171bb 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -35,6 +35,7 @@ Game::Game(int argc, char* argv[]) )); m_Renderer->Initialize(); //m_Renderer->Camera()->SetFOV(glm::radians(m_Config->Get("Video.FOV", 90.f))); + m_RenderFrame = new RenderFrame(); // Create input manager m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker); @@ -59,8 +60,6 @@ Game::Game(int argc, char* argv[]) fp.MergeEntities(m_World); } - m_RenderFrame = new RenderFrame(); - // Create Octrees m_OctreeCollision = new Octree(AABB(glm::vec3(-100), glm::vec3(100)), 4); m_OctreeFrustrumCulling = new Octree(AABB(glm::vec3(-100), glm::vec3(100)), 4); @@ -82,7 +81,6 @@ Game::Game(int argc, char* argv[]) ++updateOrderLevel; m_SystemPipeline->AddSystem(updateOrderLevel, m_OctreeCollision); m_SystemPipeline->AddSystem(updateOrderLevel, m_OctreeCollision); - ++updateOrderLevel; m_SystemPipeline->AddSystem(updateOrderLevel, m_Renderer, m_RenderFrame);