haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3d-viewer, make ortho projection zoom similar as prespective projection 

Fixes #1843
Fixes reload of Raytracing when the projection button is pressed.
This commit is contained in:
Mario Luzeiro 2020-01-05 19:02:54 +00:00 committed by Seth Hillbrand
parent 0c10bab412
commit 2c00540ad6
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
3d-viewer/3d_rendering/ccamera.cpp
View File

@ -163,7 +163,7 @@ void CCAMERA::rebuildProjection()
m_projectionMatrixInv = glm::inverse( m_projectionMatrix ); m_projectionMatrixInv = glm::inverse( m_projectionMatrix );
m_frustum.tang = glm::tan( glm::radians( m_frustum.angle ) * 0.5f ) ; m_frustum.tang = glm::tan( glm::radians( m_frustum.angle ) * 0.5f );
m_focalLen.x = ( (float)m_windowSize.y / (float)m_windowSize.x ) / m_frustum.tang; m_focalLen.x = ( (float)m_windowSize.y / (float)m_windowSize.x ) / m_frustum.tang;
m_focalLen.y = 1.0f / m_frustum.tang; m_focalLen.y = 1.0f / m_frustum.tang;
@ -178,19 +178,21 @@ void CCAMERA::rebuildProjection()
m_frustum.nearD = -m_frustum.farD; // Use a symmetrical clip plane for ortho projection m_frustum.nearD = -m_frustum.farD; // Use a symmetrical clip plane for ortho projection
const float orthoReductionFactor = m_zoom / 75.0f; // This formula was found by trial and error
const float orthoReductionFactor = glm::length( m_camera_pos_init ) *
m_zoom * m_zoom * 0.5f;
// Initialize Projection Matrix for Ortographic View // Initialize Projection Matrix for Ortographic View
m_projectionMatrix = glm::ortho( -m_windowSize.x * orthoReductionFactor, m_projectionMatrix = glm::ortho( -m_frustum.ratio * orthoReductionFactor,
m_windowSize.x * orthoReductionFactor, m_frustum.ratio * orthoReductionFactor,
-m_windowSize.y * orthoReductionFactor, -orthoReductionFactor,
m_windowSize.y * orthoReductionFactor, orthoReductionFactor,
m_frustum.nearD, m_frustum.farD ); m_frustum.nearD, m_frustum.farD );
m_projectionMatrixInv = glm::inverse( m_projectionMatrix ); m_projectionMatrixInv = glm::inverse( m_projectionMatrix );
m_frustum.nw = m_windowSize.x * orthoReductionFactor * 2.0f; m_frustum.nw = orthoReductionFactor * 2.0f * m_frustum.ratio;
m_frustum.nh = m_windowSize.y * orthoReductionFactor * 2.0f; m_frustum.nh = orthoReductionFactor * 2.0f;
m_frustum.fw = m_frustum.nw; m_frustum.fw = m_frustum.nw;
m_frustum.fh = m_frustum.nh; m_frustum.fh = m_frustum.nh;

4
3d-viewer/3d_viewer/eda_3d_viewer.cpp
View File

@ -360,7 +360,11 @@ void EDA_3D_VIEWER::Process_Special_Functions( wxCommandEvent &event )
case ID_ORTHO: case ID_ORTHO:
m_settings.CameraGet().ToggleProjection(); m_settings.CameraGet().ToggleProjection();
if( m_settings.RenderEngineGet() == RENDER_ENGINE::OPENGL_LEGACY )
m_canvas->Request_refresh(); m_canvas->Request_refresh();
else
m_canvas->RenderRaytracingRequest();
return; return;
case ID_TOOL_SCREENCOPY_TOCLIBBOARD: case ID_TOOL_SCREENCOPY_TOCLIBBOARD: