X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=f9558d036865de4e3b388e5e22a96b1d1a8536d8;hb=b49cc8c88caf7d69b35b50e23a40528e71306ade;hp=e1719668eab185b4bf27b200de5d8d45d5a99f08;hpb=f430ad789fe620ad2e8b2b2b99af868372791295;p=blank.git diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp index e171966..f9558d0 100644 --- a/src/graphics/viewport.cpp +++ b/src/graphics/viewport.cpp @@ -219,22 +219,22 @@ DirectionalLighting &Viewport::HUDProgram() noexcept { return entity_prog; } -PlainColor &Viewport::WorldOutlineProgram() noexcept { - if (active_prog != OUTLINE_WORLD) { - outline_prog.Activate(); - outline_prog.SetVP(cam.View(), cam.Projection()); - active_prog = OUTLINE_WORLD; +PlainColor &Viewport::WorldColorProgram() noexcept { + if (active_prog != COLOR_WORLD) { + color_prog.Activate(); + color_prog.SetVP(cam.View(), cam.Projection()); + active_prog = COLOR_WORLD; } - return outline_prog; + return color_prog; } -PlainColor &Viewport::HUDOutlineProgram() noexcept { - if (active_prog != OUTLINE_HUD) { - outline_prog.Activate(); - outline_prog.SetVP(canv.View(), canv.Projection()); - active_prog = OUTLINE_HUD; +PlainColor &Viewport::HUDColorProgram() noexcept { + if (active_prog != COLOR_HUD) { + color_prog.Activate(); + color_prog.SetVP(canv.View(), canv.Projection()); + active_prog = COLOR_HUD; } - return outline_prog; + return color_prog; } SkyBoxShader &Viewport::SkyBoxProgram() noexcept {