zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 15:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed conditions for menu patching.

Browse source
This commit is contained in:
Christoph Oelckers 2016-05-01 17:43:30 +02:00
parent 50ba1ecde8
commit 26acf8e994
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gl/compatibility/gl_20.cpp
View file

@ -37,6 +37,7 @@
** **
*/ */
#include "gl/system/gl_system.h" #include "gl/system/gl_system.h"
#include "menu/menu.h"
#include "tarray.h" #include "tarray.h"
#include "doomtype.h" #include "doomtype.h"
#include "m_argv.h" #include "m_argv.h"
@ -63,7 +64,7 @@
void gl_PatchMenu() void gl_PatchMenu()
{ {
if (gl.compatibility == CMPT_GL2) if (gl.glslversion == 0)
{ {
// Radial fog and Doom lighting are not available in SM < 4 cards // Radial fog and Doom lighting are not available in SM < 4 cards
// The way they are implemented does not work well on older hardware. // The way they are implemented does not work well on older hardware.

2
src/gl/scene/gl_scene.cpp
View file

@ -836,7 +836,7 @@ sector_t * FGLRenderer::RenderViewpoint (AActor * camera, GL_IRECT * bounds, flo
SetProjection( eye->GetProjection(fov, ratio, fovratio) ); SetProjection( eye->GetProjection(fov, ratio, fovratio) );
// SetProjection(fov, ratio, fovratio); // switch to perspective mode and set up clipper // SetProjection(fov, ratio, fovratio); // switch to perspective mode and set up clipper
SetViewAngle(ViewAngle); SetViewAngle(ViewAngle);
// Stereo mode specific viewpoint adjustment - temporarily shifts global viewx, viewy, viewz // Stereo mode specific viewpoint adjustment - temporarily shifts global ViewPos
eye->GetViewShift(GLRenderer->mAngles.Yaw.Degrees, viewShift); eye->GetViewShift(GLRenderer->mAngles.Yaw.Degrees, viewShift);
s3d::ScopedViewShifter viewShifter(viewShift); s3d::ScopedViewShifter viewShifter(viewShift);
SetViewMatrix(ViewPos.X, ViewPos.Y, ViewPos.Z, false, false); SetViewMatrix(ViewPos.X, ViewPos.Y, ViewPos.Z, false, false);

2
src/gl/stereo3d/scoped_view_shifter.cpp
View file

@ -1,6 +1,6 @@
/* /*
** scoped_view_shifter.cpp ** scoped_view_shifter.cpp
** Stack-scoped class for temporarily changing player viewpoint global variables viewx, viewy, viewz. ** Stack-scoped class for temporarily changing camera viewpoint
** Used for stereoscopic 3D. ** Used for stereoscopic 3D.
** **
**--------------------------------------------------------------------------- **---------------------------------------------------------------------------

4
src/gl/stereo3d/scoped_view_shifter.h
View file

@ -1,6 +1,6 @@
/* /*
** scoped_view_shifter.h ** scoped_view_shifter.h
** Stack-scoped class for temporarily changing player viewpoint global variables viewx, viewy, viewz. ** Stack-scoped class for temporarily changing camera viewpoint
** Used for stereoscopic 3D. ** Used for stereoscopic 3D.
** **
**--------------------------------------------------------------------------- **---------------------------------------------------------------------------
@ -43,7 +43,7 @@
namespace s3d { namespace s3d {
/** /**
* Temporarily shift viewx, viewy, viewz * Temporarily shift
*/ */
class ScopedViewShifter class ScopedViewShifter
{ {