teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove debug code

Browse source
This commit is contained in:
scrawl 2015-10-28 16:13:40 +01:00
parent e13eb625d3
commit 700a0099c3
5 changed files with 3 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/npcanimation.cpp
View file

@ -324,9 +324,9 @@ public:
virtual void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous) virtual void drawImplementation(osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous)
{ {
//renderInfo.getState()->applyAttribute(mDepth); renderInfo.getState()->applyAttribute(mDepth);
//glClear(GL_DEPTH_BUFFER_BIT); glClear(GL_DEPTH_BUFFER_BIT);
bin->drawImplementation(renderInfo, previous); bin->drawImplementation(renderInfo, previous);
} }

33
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -198,39 +198,6 @@ namespace MWRender
mFieldOfView = Settings::Manager::getFloat("field of view", "General"); mFieldOfView = Settings::Manager::getFloat("field of view", "General");
updateProjectionMatrix(); updateProjectionMatrix();
mStateUpdater->setFogEnd(mViewDistance); mStateUpdater->setFogEnd(mViewDistance);
/*
osg::Texture2D* texture = new osg::Texture2D;
texture->setSourceFormat(GL_DEPTH_COMPONENT);
texture->setInternalFormat(GL_DEPTH_COMPONENT24_ARB);
texture->setSourceType(GL_UNSIGNED_INT);
mViewer->getCamera()->attach(osg::Camera::DEPTH_BUFFER, texture);
osg::ref_ptr<osg::Camera> camera (new osg::Camera);
camera->setProjectionMatrix(osg::Matrix::identity());
camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
camera->setViewMatrix(osg::Matrix::identity());
camera->setClearMask(0);
camera->setRenderOrder(osg::Camera::NESTED_RENDER);
camera->setAllowEventFocus(false);
osg::ref_ptr<osg::Geode> geode (new osg::Geode);
osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1,-1,0), osg::Vec3f(0.5,0,0), osg::Vec3f(0,0.5,0));
geode->addDrawable(geom);
camera->addChild(geode);
osg::StateSet* stateset = geom->getOrCreateStateSet();
stateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
stateset->setRenderBinDetails(20, "RenderBin");
stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
mLightRoot->addChild(camera);
*/
} }
RenderingManager::~RenderingManager() RenderingManager::~RenderingManager()

5
apps/openmw/mwrender/sky.cpp
View file

@ -1,9 +1,6 @@
#include "sky.hpp" #include "sky.hpp"
#include <cmath> #include <cmath>
#include <iostream>
#include <osg/io_utils>
#include <osg/Transform> #include <osg/Transform>
#include <osg/Geode> #include <osg/Geode>
@ -264,7 +261,7 @@ public:
META_Node(MWRender, CameraRelativeTransform) META_Node(MWRender, CameraRelativeTransform)
virtual bool computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor* nv) const virtual bool computeLocalToWorldMatrix(osg::Matrix& matrix, osg::NodeVisitor*) const
{ {
if (_referenceFrame==RELATIVE_RF) if (_referenceFrame==RELATIVE_RF)
{ {

2
apps/openmw/mwrender/water.cpp
View file

@ -2,8 +2,6 @@
#include <iomanip> #include <iomanip>
#include <osg/io_utils>
#include <osg/Depth> #include <osg/Depth>
#include <osg/Group> #include <osg/Group>
#include <osg/Geode> #include <osg/Geode>

3
apps/openmw/mwrender/water.hpp
View file

@ -9,9 +9,6 @@ namespace osg
{ {
class Group; class Group;
class PositionAttitudeTransform; class PositionAttitudeTransform;
class Texture2D;
class Image;
class Camera;
} }
namespace osgUtil namespace osgUtil