OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: The cycler for a pulse light needs to be reinitialized when new light properties get applied.

Browse source 
- do not clamp the cycler's output to a byte.
This commit is contained in:
Christoph Oelckers 2016-12-23 15:25:39 +01:00
commit 78737f9bc7
5 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/gl/utility/gl_cycler.cpp
View file

@ -83,13 +83,23 @@ FCycler::FCycler()
//
//==========================================================================
void FCycler::SetParams(float start, float end, float cycle)
void FCycler::SetParams(float start, float end, float cycle, bool update)
{
m_cycle = cycle;
m_time = 0.f;
m_start = m_current = start;
if (!update || cycle != m_cycle)
{
m_cycle = cycle;
m_time = 0.f;
m_increment = true;
m_current = start;
}
else
{
// When updating and keeping the same cycle, scale the current light size to the new dimensions.
float fact = (m_current - m_start) / (m_end - m_start);
m_current = start + fact *(end - start);
}
m_start = start;
m_end = end;
m_increment = true;
}

2
src/gl/utility/gl_cycler.h
View file

@ -22,7 +22,7 @@ class FCycler
public:
FCycler();
void Update(float diff);
void SetParams(float start, float end, float cycle);
void SetParams(float start, float end, float cycle, bool update = false);
void ShouldCycle(bool sc) { m_shouldCycle = sc; }
void SetCycleType(CycleType ct) { m_cycleType = ct; }
float GetVal() { return m_current; }