renamed OutlineMesh -> PrimitiveMesh

[blank.git] / src / graphics / viewport.cpp

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index e1719668eab185b4bf27b200de5d8d45d5a99f08..f9558d036865de4e3b388e5e22a96b1d1a8536d8 100644 (file)
--- 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 {