From: Daniel Karbach Date: Sun, 10 Dec 2017 17:03:38 +0000 (+0100) Subject: old glm? or maybe compiler? X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=commitdiff_plain;h=91c987450eb7595ff2ef68c925f945ca89d4d879 old glm? or maybe compiler? --- diff --git a/src/app/states.cpp b/src/app/states.cpp index 5e3642b..68c66f2 100644 --- a/src/app/states.cpp +++ b/src/app/states.cpp @@ -190,9 +190,9 @@ void MasterState::OnRender(graphics::Viewport &viewport) { // TODO: source sun's light color and strength glm::vec3 pos(cam.View() * cam.Model(*sun)[3]); assets.shaders.planet_surface.Activate(); - assets.shaders.planet_surface.SetLight(num_lights, pos, sun->Color(), sun->Luminosity()); + assets.shaders.planet_surface.SetLight(num_lights, pos, glm::vec3(sun->Color()), float(sun->Luminosity())); assets.shaders.creature_skin.Activate(); - assets.shaders.creature_skin.SetLight(num_lights, pos, sun->Color(), sun->Luminosity()); + assets.shaders.creature_skin.SetLight(num_lights, pos, glm::vec3(sun->Color()), float(sun->Luminosity())); ++num_lights; if (num_lights >= graphics::PlanetSurface::MAX_LIGHTS || num_lights >= graphics::CreatureSkin::MAX_LIGHTS) { break;