mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 23:02:03 +00:00
- redid the timer for the automap zoom
Add more precision and uncouple from the game timer
This commit is contained in:
parent
45a22eb3cd
commit
2bf368d49b
3 changed files with 19 additions and 17 deletions
|
@ -242,6 +242,7 @@ void Display()
|
||||||
case GS_LEVEL:
|
case GS_LEVEL:
|
||||||
if (gametic != 0)
|
if (gametic != 0)
|
||||||
{
|
{
|
||||||
|
screen->FrameTime = I_msTimeFS();
|
||||||
screen->BeginFrame();
|
screen->BeginFrame();
|
||||||
screen->SetSceneRenderTarget(gl_ssao != 0);
|
screen->SetSceneRenderTarget(gl_ssao != 0);
|
||||||
twodpsp.Clear();
|
twodpsp.Clear();
|
||||||
|
|
|
@ -107,7 +107,6 @@ void GameInterface::Ticker()
|
||||||
{
|
{
|
||||||
exitlevel();
|
exitlevel();
|
||||||
}
|
}
|
||||||
nonsharedkeys(); // this must go elsewhere later!
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
@ -164,6 +163,7 @@ void GameInterface::Startup()
|
||||||
|
|
||||||
void GameInterface::Render()
|
void GameInterface::Render()
|
||||||
{
|
{
|
||||||
|
nonsharedkeys(); // automap zoom
|
||||||
drawtime.Reset();
|
drawtime.Reset();
|
||||||
drawtime.Clock();
|
drawtime.Clock();
|
||||||
videoSetBrightness(thunder_brightness);
|
videoSetBrightness(thunder_brightness);
|
||||||
|
|
|
@ -36,6 +36,7 @@ source as it is released.
|
||||||
#include "ns.h"
|
#include "ns.h"
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "gamecontrol.h"
|
#include "gamecontrol.h"
|
||||||
|
#include "v_video.h"
|
||||||
|
|
||||||
BEGIN_DUKE_NS
|
BEGIN_DUKE_NS
|
||||||
|
|
||||||
|
@ -59,34 +60,35 @@ void GameInterface::ResetFollowPos(bool message)
|
||||||
}
|
}
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
//
|
//
|
||||||
// handles UI side input not handled via CCMDs or CVARs.
|
//
|
||||||
// Most of what's in here needs to be offloaded to CCMDs
|
|
||||||
//
|
//
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
void nonsharedkeys(void)
|
void nonsharedkeys(void)
|
||||||
{
|
{
|
||||||
|
int ms = screen->FrameTime;
|
||||||
|
int interval;
|
||||||
|
if (nonsharedtimer > 0 || ms < nonsharedtimer)
|
||||||
|
{
|
||||||
|
interval = ms - nonsharedtimer;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
interval = 0;
|
||||||
|
}
|
||||||
|
nonsharedtimer = screen->FrameTime;
|
||||||
|
|
||||||
if (System_WantGuiCapture())
|
if (System_WantGuiCapture())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (automapMode != am_off)
|
if (automapMode != am_off)
|
||||||
{
|
{
|
||||||
int j;
|
double j = interval * (120./1000);
|
||||||
if (nonsharedtimer > 0 || gameclock < nonsharedtimer)
|
|
||||||
{
|
|
||||||
j = gameclock - nonsharedtimer;
|
|
||||||
nonsharedtimer += j;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
j = 0;
|
|
||||||
nonsharedtimer = gameclock;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (buttonMap.ButtonDown(gamefunc_Enlarge_Screen))
|
if (buttonMap.ButtonDown(gamefunc_Enlarge_Screen))
|
||||||
ps[myconnectindex].zoom += mulscale6(j, max(ps[myconnectindex].zoom, 256));
|
ps[myconnectindex].zoom += (int)fmulscale6(j, max(ps[myconnectindex].zoom, 256));
|
||||||
if (buttonMap.ButtonDown(gamefunc_Shrink_Screen))
|
if (buttonMap.ButtonDown(gamefunc_Shrink_Screen))
|
||||||
ps[myconnectindex].zoom -= mulscale6(j, max(ps[myconnectindex].zoom, 256));
|
ps[myconnectindex].zoom -= (int)fmulscale6(j, max(ps[myconnectindex].zoom, 256));
|
||||||
|
|
||||||
ps[myconnectindex].zoom = clamp(ps[myconnectindex].zoom, 48, 2048);
|
ps[myconnectindex].zoom = clamp(ps[myconnectindex].zoom, 48, 2048);
|
||||||
}
|
}
|
||||||
|
@ -1127,7 +1129,6 @@ void GameInterface::GetInput(InputPacket* packet)
|
||||||
void GameInterface::clearlocalinputstate()
|
void GameInterface::clearlocalinputstate()
|
||||||
{
|
{
|
||||||
loc = {};
|
loc = {};
|
||||||
nonsharedtimer = 0;
|
|
||||||
turnheldtime = 0;
|
turnheldtime = 0;
|
||||||
lastcontroltime = 0;
|
lastcontroltime = 0;
|
||||||
lastCheck = 0;
|
lastCheck = 0;
|
||||||
|
|
Loading…
Reference in a new issue