From 7bbdb131383f566ba63f93f8533aad5af1931c32 Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 28 Oct 2015 19:57:20 +0100 Subject: [PATCH] Remove debug code --- apps/openmw/mwrender/water.cpp | 35 +--------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index c090dfbfe..58e80a271 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -14,7 +14,7 @@ #include #include -#include // XXX remove +#include #include #include @@ -239,34 +239,6 @@ public: } }; -void addDebugOverlay(osg::Texture2D* texture, int pos, osg::Group* parent) -{ - osg::ref_ptr debugCamera (new osg::Camera); - debugCamera->setProjectionMatrix(osg::Matrix::identity()); - debugCamera->setReferenceFrame(osg::Transform::ABSOLUTE_RF); - debugCamera->setViewMatrix(osg::Matrix::identity()); - debugCamera->setClearMask(0); - debugCamera->setRenderOrder(osg::Camera::NESTED_RENDER); - debugCamera->setAllowEventFocus(false); - - const float size = 0.5; - osg::ref_ptr debugGeode (new osg::Geode); - osg::ref_ptr geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1 + size*pos, -1, 0), osg::Vec3f(size,0,0), osg::Vec3f(0,size,0)); - debugGeode->addDrawable(geom); - - debugCamera->addChild(debugGeode); - - osg::StateSet* debugStateset = geom->getOrCreateStateSet(); - - debugStateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON); - debugStateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF); - - debugStateset->setRenderBinDetails(20, "RenderBin"); - debugStateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF); - - parent->addChild(debugCamera); -} - osg::ref_ptr readShader (osg::Shader::Type type, const std::string& file) { osg::ref_ptr shader (new osg::Shader(type)); @@ -432,11 +404,6 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem mParent->addChild(reflectionCamera); - // debug overlay - addDebugOverlay(refractionTexture, 0, mParent); - addDebugOverlay(refractionDepthTexture, 1, mParent); - addDebugOverlay(reflectionTexture, 2, mParent); - // shader osg::ref_ptr vertexShader (readShader(osg::Shader::VERTEX, resourcePath + "/shaders/water_vertex.glsl"));