zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed calculation of projection matrix for weapon sprites.

Browse source 
- fixed color mask for green/magenta.
- fixed crash when initializing video, because it was accessing 'screen' before it was set from within the framebuffer's constructor.
This commit is contained in:
Christoph Oelckers 2018-06-24 17:15:27 +02:00
parent c3d5b960ee
commit 491898fe2c
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/renderer/gl_stereo3d.cpp
View file

@ -324,7 +324,7 @@ void FGLRenderer::PresentStereo()
return;
case VR_GREENMAGENTA:
PresentAnaglyph(false, true, true);
PresentAnaglyph(false, true, false);
break;
case VR_REDCYAN:

2
src/gl/system/gl_framebuffer.cpp
View file

@ -377,7 +377,7 @@ void OpenGLFrameBuffer::SetViewportRects(IntRect *bounds)
if (!bounds)
{
auto vrmode = VRMode::GetVRMode(true);
vrmode->AdjustViewport();
vrmode->AdjustViewport(this);
}
}

12
src/hwrenderer/utility/hw_vrmodes.cpp
View file

@ -93,7 +93,7 @@ const VRMode *VRMode::GetVRMode(bool toscreen)
}
}
void VRMode::AdjustViewport() const
void VRMode::AdjustViewport(DFrameBuffer *screen) const
{
screen->mSceneViewport.height = (int)(screen->mSceneViewport.height * mVerticalViewportScale);
screen->mSceneViewport.top = (int)(screen->mSceneViewport.top * mVerticalViewportScale);
@ -109,11 +109,11 @@ void VRMode::AdjustViewport() const
VSMatrix VRMode::GetHUDSpriteProjection() const
{
VSMatrix mat;
int w = screen->mScreenViewport.width;
int h = screen->mScreenViewport.height;
float scaled_w = w * mWeaponProjectionScale;
float left_ofs = (scaled_w - w) / 2.f;
mat.ortho(left_ofs, left_ofs + w, (float)h, 0, -1.0f, 1.0f);
int w = screen->GetWidth();
int h = screen->GetHeight();
float scaled_w = w / mWeaponProjectionScale;
float left_ofs = (w - scaled_w) / 2.f;
mat.ortho(left_ofs, left_ofs + scaled_w, (float)h, 0, -1.0f, 1.0f);
return mat;
}

3
src/hwrenderer/utility/hw_vrmodes.h
View file

@ -2,6 +2,7 @@
#include "r_data/matrix.h"
class DFrameBuffer;
enum
{
@ -41,6 +42,6 @@ struct VRMode
VREyeInfo mEyes[2];
static const VRMode *GetVRMode(bool toscreen = true);
void AdjustViewport() const;
void AdjustViewport(DFrameBuffer *fb) const;
VSMatrix GetHUDSpriteProjection() const;
};