fly/flightgear
1
0
Fork 0
Code Activity

Better handling of near/far values in multiple camera setups

Browse source
This commit is contained in:
Fernando García Liñán 2020-12-08 14:10:24 +01:00
parent 86befa6e5e
commit d95964071d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Viewer/CameraGroup.cxx
View file

@ -34,6 +34,7 @@
#include <simgear/scene/util/RenderConstants.hxx> #include <simgear/scene/util/RenderConstants.hxx>
#include <simgear/scene/util/SGReaderWriterOptions.hxx> #include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include <simgear/scene/viewer/Compositor.hxx> #include <simgear/scene/viewer/Compositor.hxx>
#include <simgear/scene/viewer/CompositorUtil.hxx>
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
@ -256,9 +257,14 @@ void CameraGroup::update(const osg::Vec3d& position,
proj_matrix = masterProj * info->projOffset; proj_matrix = masterProj * info->projOffset;
} }
osg::Matrix new_proj_matrix = proj_matrix;
if ((info->flags & CameraInfo::FIXED_NEAR_FAR) == 0) {
makeNewProjMat(proj_matrix, _zNear, _zFar, new_proj_matrix);
}
info->viewMatrix = view_matrix; info->viewMatrix = view_matrix;
info->projMatrix = proj_matrix; info->projMatrix = new_proj_matrix;
info->compositor->update(view_matrix, proj_matrix); info->compositor->update(view_matrix, new_proj_matrix);
} }
} }