Skip to content

Commit d5946e9

Browse files
committed
loading screens w/o fade no longer fade brightness uniform
1 parent c11bc81 commit d5946e9

File tree

1 file changed

+28
-13
lines changed

1 file changed

+28
-13
lines changed

Qor/LoadingState.cpp

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ LoadingState :: LoadingState(Qor* qor):
3535
else
3636
m_BG = Color::black();
3737
}
38+
39+
if(!m_bFade)
40+
{
41+
m_pPipeline->shader(1)->use();
42+
int fade = m_pPipeline->shader(1)->uniform("Brightness");
43+
m_pPipeline->shader(1)->uniform(
44+
fade, Color::white().vec3()
45+
);
46+
}
3847
m_pRoot->add(m_pCamera);
3948

4049
vec2 win = vec2(m_pWindow->size().x, m_pWindow->size().y);
@@ -166,13 +175,16 @@ void LoadingState :: logic(Freq::Time t)
166175

167176
if(not Headless::enabled())
168177
{
169-
m_pPipeline->shader(1)->use();
170-
int fade = m_pPipeline->shader(1)->uniform("Brightness");
171-
if(fade >= 0)
172-
m_pPipeline->shader(1)->uniform(
173-
fade,
174-
m_Fade.get().vec3()
175-
);
178+
if(m_bFade)
179+
{
180+
m_pPipeline->shader(1)->use();
181+
int fade = m_pPipeline->shader(1)->uniform("Brightness");
182+
if(fade >= 0)
183+
m_pPipeline->shader(1)->uniform(
184+
fade,
185+
m_Fade.get().vec3()
186+
);
187+
}
176188
}
177189
m_pQor->do_tasks();
178190

@@ -218,12 +230,15 @@ void LoadingState :: logic(Freq::Time t)
218230
{
219231
if(not Headless::enabled())
220232
{
221-
m_pPipeline->shader(1)->use();
222-
int u = m_pPipeline->shader(1)->uniform("Brightness");
223-
if(u >= 0)
224-
m_pPipeline->shader(1)->uniform(
225-
u, Color::white().vec3()
226-
);
233+
if(m_bFade)
234+
{
235+
m_pPipeline->shader(1)->use();
236+
int u = m_pPipeline->shader(1)->uniform("Brightness");
237+
if(u >= 0)
238+
m_pPipeline->shader(1)->uniform(
239+
u, Color::white().vec3()
240+
);
241+
}
227242
}
228243
m_pQor->pop_state();
229244
}

0 commit comments

Comments
 (0)