BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Picking' into RendererDecoupling

Browse Source 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
This commit is contained in:
Tleety
2015-12-11 11:21:58 +01:00
parent 91edab34bc bb900c5110
commit 8c563a2d76
39 changed files with 1186 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Rendering/Renderer.cpp
+13 -21
View File
@@ -3,7 +3,6 @@
void Renderer::Initialize()
{
InitializeWindow();
// Create default camera
m_DefaultCamera = new ::Camera((float)m_Resolution.Width / m_Resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
m_DefaultCamera->SetPosition(glm::vec3(0, 0, 10));
@@ -120,26 +119,8 @@ void Renderer::InputUpdate(double dt)
static double mousePosX, mousePosY;
glfwGetCursorPos(m_Window, &mousePosX, &mousePosY);
//if (glfwGetMouseButton(m_Window, GLFW_MOUSE_BUTTON_1) == GLFW_PRESS) {
// ScreenCoords::PixelData data = ScreenCoords::ToPixelData(mousePosX, m_Resolution.Height - mousePosY, &m_PickingBuffer, m_DepthBuffer);
//
// glm::vec3 viewPos = ScreenCoords::ToWorldPos(mousePosX, m_Resolution.Height - mousePosY, data.Depth, m_Resolution, m_Camera->ProjectionMatrix(), m_Camera->ViewMatrix());
// // glm::vec3 worldPos = glm::vec3(glm::inverse(m_Camera->ViewMatrix()) * glm::vec4(viewPos, 1.f));
// //printf("R: %f, G: %f, Depth: %f\n", data.Color[0], data.Color[1], data.Depth);
// //printf("view: x: %f, y: %f z: %f, Length: %f\n\n", viewPos.x, viewPos.y, viewPos.z, glm::length(viewPos));
// //printf("\n\n---------------------------\n");
// //auto got = m_PickingColorsToEntity.find(glm::vec2(data.Color[0], data.Color[1]));
// //if (got == m_PickingColorsToEntity.end())
// // printf("Color (R:%f, G:%f) not found.\n", data.Color[0], data.Color[1]);
// //else
// // printf("R:%f G:%f, EntityID: %i\n", got->first.r, got->first.g, got->second);
// //printf("----\n");
// //for (auto i : m_PickingColorsToEntity) {
// // printf("Entity: %i, Color: R: %f, G: %f\n", i.second, i.first.r, i.first.g);
// //}
// //printf("---------------------------\n\n");
//}
if (glfwGetKey(m_Window, GLFW_KEY_SPACE) == GLFW_PRESS) {
@@ -165,7 +146,8 @@ void Renderer::InputUpdate(double dt)
void Renderer::Update(double dt)
{
InputUpdate(dt);
m_EventBroker->Process<Renderer>();
InputUpdate(dt);
}
@@ -280,7 +262,17 @@ void Renderer::DrawScene(RenderQueueCollection& rq)
//}
//m_PickingBuffer.Unbind();
//GLERROR("PickingPass Error");
//}
//Publish pick event every frame with the pick data that can be picked by the event
Events::Picking pickEvent = Events::Picking(
&m_PickingBuffer,
&m_DepthBuffer,
m_Camera->ProjectionMatrix(),
m_Camera->ViewMatrix(),
m_Resolution,
&m_PickingColorsToEntity);
m_EventBroker->Publish(pickEvent);
void Renderer::DrawScreenQuad(GLuint textureToDraw)
{