mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 22:53:53 +00:00
Code Issues Releases Wiki Activity

Dead code removal

Browse source
This commit is contained in:
scrawl 2015-04-25 15:53:11 +02:00
parent 0ff7b2ff11
commit 7809caf9dc
7 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/windowmanager.hpp
View file

@ -303,8 +303,6 @@ namespace MWBase
virtual void showSoulgemDialog (MWWorld::Ptr item) = 0; virtual void showSoulgemDialog (MWWorld::Ptr item) = 0;
virtual void frameStarted(float dt) = 0;
virtual void changePointer (const std::string& name) = 0; virtual void changePointer (const std::string& name) = 0;
virtual void setEnemy (const MWWorld::Ptr& enemy) = 0; virtual void setEnemy (const MWWorld::Ptr& enemy) = 0;

1
apps/openmw/mwbase/world.hpp
View file

@ -460,7 +460,6 @@ namespace MWBase
virtual void reattachPlayerCamera() = 0; virtual void reattachPlayerCamera() = 0;
/// \todo this does not belong here /// \todo this does not belong here
virtual void frameStarted (float dt, bool paused) = 0;
virtual void screenshot (Ogre::Image& image, int w, int h) = 0; virtual void screenshot (Ogre::Image& image, int w, int h) = 0;
/// Find default position inside exterior cell specified by name /// Find default position inside exterior cell specified by name

4
apps/openmw/mwgui/myguirendermanager.cpp
View file

@ -460,15 +460,13 @@ void RenderManager::initialise()
state->setTextureAttribute(0, new osg::TexEnv(osg::TexEnv::MODULATE)); state->setTextureAttribute(0, new osg::TexEnv(osg::TexEnv::MODULATE));
state->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT, osg::PolygonMode::FILL)); state->setAttribute(new osg::PolygonMode(osg::PolygonMode::FRONT, osg::PolygonMode::FILL));
state->setAttribute(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)); state->setAttribute(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
state->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
state->setRenderBinDetails(11, "RenderBin");
state->setMode(GL_CULL_FACE, osg::StateAttribute::OFF); state->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
geode->setStateSet(state); geode->setStateSet(state);
geode->setCullingActive(false); geode->setCullingActive(false);
camera->addChild(geode.get()); camera->addChild(geode.get());
mGuiRoot = camera; mGuiRoot = camera;
mSceneRoot->addChild(mGuiRoot.get()); //mSceneRoot->addChild(mGuiRoot.get());
mViewer->addEventHandler(new ResizeHandler(this)); mViewer->addEventHandler(new ResizeHandler(this));
osg::ref_ptr<osg::Viewport> vp = mViewer->getCamera()->getViewport(); osg::ref_ptr<osg::Viewport> vp = mViewer->getCamera()->getViewport();

6
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1501,12 +1501,6 @@ namespace MWGui
updateVisible(); updateVisible();
} }
void WindowManager::frameStarted (float dt)
{
mInventoryWindow->doRenderUpdate ();
mCharGen->doRenderUpdate();
}
void WindowManager::updatePlayer() void WindowManager::updatePlayer()
{ {
mInventoryWindow->updatePlayer(); mInventoryWindow->updatePlayer();

2
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -309,8 +309,6 @@ namespace MWGui
virtual void showBook(const MWWorld::Ptr& item, bool showTakeButton); virtual void showBook(const MWWorld::Ptr& item, bool showTakeButton);
virtual void showScroll(const MWWorld::Ptr& item, bool showTakeButton); virtual void showScroll(const MWWorld::Ptr& item, bool showTakeButton);
virtual void frameStarted(float dt);
virtual void showSoulgemDialog (MWWorld::Ptr item); virtual void showSoulgemDialog (MWWorld::Ptr item);
virtual void changePointer (const std::string& name); virtual void changePointer (const std::string& name);

5
apps/openmw/mwworld/worldimp.cpp
View file

@ -2166,11 +2166,6 @@ namespace MWWorld
return mRendering->getAnimation(ptr); return mRendering->getAnimation(ptr);
} }
void World::frameStarted (float dt, bool paused)
{
//mRendering->frameStarted(dt, paused);
}
void World::screenshot(Ogre::Image &image, int w, int h) void World::screenshot(Ogre::Image &image, int w, int h)
{ {
//mRendering->screenshot(image, w, h); //mRendering->screenshot(image, w, h);

1
apps/openmw/mwworld/worldimp.hpp
View file

@ -564,7 +564,6 @@ namespace MWWorld
virtual void reattachPlayerCamera(); virtual void reattachPlayerCamera();
/// \todo this does not belong here /// \todo this does not belong here
virtual void frameStarted (float dt, bool paused);
virtual void screenshot (Ogre::Image& image, int w, int h); virtual void screenshot (Ogre::Image& image, int w, int h);
/// Find center of exterior cell above land surface /// Find center of exterior cell above land surface