From d0587a3ad5c922d97cea5544c710181d662802c8 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 3 Nov 2017 14:33:06 +0000
Subject: [PATCH] Clean up the debug hud now it's working.

---
 apps/openmw/mwrender/shadow.cpp | 13 +++----------
 apps/openmw/mwrender/shadow.hpp |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwrender/shadow.cpp b/apps/openmw/mwrender/shadow.cpp
index 915979bac3..347952b4cb 100644
--- a/apps/openmw/mwrender/shadow.cpp
+++ b/apps/openmw/mwrender/shadow.cpp
@@ -51,7 +51,7 @@ namespace MWRender
         "}                                                                       \n";
 
 
-    MWShadow::MWShadow() : debugCamera(new osg::Camera), debugProgram(new osg::Program), testTex(new osg::Texture2D)
+    MWShadow::MWShadow() : debugCamera(new osg::Camera), debugProgram(new osg::Program), debugTextureUnit(0)
     {
         debugCamera->setViewport(0, 0, 200, 200);
         debugCamera->setRenderOrder(osg::Camera::POST_RENDER);
@@ -67,13 +67,9 @@ namespace MWRender
         debugCamera->addChild(debugGeometry);
         osg::ref_ptr<osg::StateSet> stateSet = debugGeometry->getOrCreateStateSet();
         stateSet->setAttributeAndModes(debugProgram, osg::StateAttribute::ON);
-        osg::ref_ptr<osg::Uniform> textureUniform = new osg::Uniform("texture", 0);
+        osg::ref_ptr<osg::Uniform> textureUniform = new osg::Uniform("texture", debugTextureUnit);
         //textureUniform->setType(osg::Uniform::SAMPLER_2D);
         stateSet->addUniform(textureUniform.get());
-
-        testTex->setDataVariance(osg::Object::DYNAMIC);
-        osg::ref_ptr<osg::Image> testImage = osgDB::readRefImageFile("resources/mygui/openmw.png");
-        testTex->setImage(testImage);
     }
     
     class VDSMCameraCullCallback : public osg::NodeCallback
@@ -560,10 +556,7 @@ namespace MWRender
                 {
                     osg::ref_ptr<osg::Texture2D> texture = sd->_texture;
                     osg::ref_ptr<osg::StateSet> stateSet = debugGeometry->getOrCreateStateSet();
-                    if (true)
-                        stateSet->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
-                    else
-                        stateSet->setTextureAttributeAndModes(0, testTex, osg::StateAttribute::ON);
+                    stateSet->setTextureAttributeAndModes(debugTextureUnit, texture, osg::StateAttribute::ON);
 
                     unsigned int traversalMask = cv.getTraversalMask();
                     cv.setTraversalMask(debugGeometry->getNodeMask());
diff --git a/apps/openmw/mwrender/shadow.hpp b/apps/openmw/mwrender/shadow.hpp
index 4a4e8b8a5b..a941f9c2e6 100644
--- a/apps/openmw/mwrender/shadow.hpp
+++ b/apps/openmw/mwrender/shadow.hpp
@@ -12,13 +12,13 @@ namespace MWRender
 
         virtual void cull(osgUtil::CullVisitor& cv);
     protected:
+        const int debugTextureUnit;
+
         osg::ref_ptr<osg::Camera> debugCamera;
 
         osg::ref_ptr<osg::Program> debugProgram;
 
         osg::ref_ptr<osg::Node> debugGeometry;
-
-        osg::ref_ptr<osg::Texture2D> testTex;
     };
 }