ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compiler warnings.

Browse Source
This commit is contained in:
hiker 2015-01-05 08:15:51 +11:00
parent 0d8bb12ec9
commit 001544133f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/render_lighting.cpp
View File

@ -233,7 +233,7 @@ void IrrDriver::renderLightsScatter(unsigned pointlightcount)
const Track * const track = World::getWorld()->getTrack(); const Track * const track = World::getWorld()->getTrack();
// This function is only called once per frame - thus no need for setters. // This function is only called once per frame - thus no need for setters.
float start = track->getFogStart() + .001; float start = track->getFogStart() + .001f;
const video::SColor tmpcol = track->getFogColor(); const video::SColor tmpcol = track->getFogColor();
core::vector3df col(tmpcol.getRed() / 255.0f, core::vector3df col(tmpcol.getRed() / 255.0f,

8
src/utils/debug.cpp
View File

@ -607,7 +607,7 @@ bool onEvent(const SEvent &event)
{ {
LightNode* nearest = findNearestLight(); LightNode* nearest = findNearestLight();
core::vector3df color = nearest->getColor(); core::vector3df color = nearest->getColor();
nearest->setColor(intensity / 100.0, color.Y, color.Z); nearest->setColor(intensity / 100.0f, color.Y, color.Z);
} }
); );
dsd->changeLabel("Green", "Green (x10)"); dsd->changeLabel("Green", "Green (x10)");
@ -620,7 +620,7 @@ bool onEvent(const SEvent &event)
{ {
LightNode* nearest = findNearestLight(); LightNode* nearest = findNearestLight();
core::vector3df color = nearest->getColor(); core::vector3df color = nearest->getColor();
nearest->setColor(color.X, intensity / 100.0, color.Z); nearest->setColor(color.X, intensity / 100.0f, color.Z);
} }
); );
dsd->changeLabel("Blue", "Blue (x10)"); dsd->changeLabel("Blue", "Blue (x10)");
@ -633,13 +633,13 @@ bool onEvent(const SEvent &event)
{ {
LightNode* nearest = findNearestLight(); LightNode* nearest = findNearestLight();
core::vector3df color = nearest->getColor(); core::vector3df color = nearest->getColor();
nearest->setColor(color.X, color.Y, intensity / 100.0); nearest->setColor(color.X, color.Y, intensity / 100.0f);
} }
); );
dsd->changeLabel("SSAO radius", "energy (x10)"); dsd->changeLabel("SSAO radius", "energy (x10)");
dsd->setSliderHook("ssao_radius", 0, 100, dsd->setSliderHook("ssao_radius", 0, 100,
[]() { return findNearestLight()->getEnergy() * 10; }, []() { return findNearestLight()->getEnergy() * 10; },
[](int v){ findNearestLight()->setEnergy(v / 10.0); } [](int v){ findNearestLight()->setEnergy(v / 10.0f); }
); );
dsd->changeLabel("SSAO k", "radius"); dsd->changeLabel("SSAO k", "radius");
dsd->setSliderHook("ssao_k", 0, 100, dsd->setSliderHook("ssao_k", 0, 100,