mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

more unused stuff cleanup

Browse Source
This commit is contained in:
Miloslav Číž 2017-11-11 14:14:24 +01:00
parent e804c4a011
commit d71d984cfa
4 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwinput/inputmanagerimp.hpp
View File

@ -259,8 +259,6 @@ namespace MWInput
A_Screenshot, // Take a screenshot A_Screenshot, // Take a screenshot
A_Screenshot360, // Take a 360 degree screenshot
A_Inventory, // Toggle inventory screen A_Inventory, // Toggle inventory screen
A_Console, // Toggle console screen A_Console, // Toggle console screen

28
apps/openmw/mwrender/water.cpp
View File

@ -207,6 +207,7 @@ osg::ref_ptr<osg::Image> readPngImage (const std::string& file)
return result.getImage(); return result.getImage();
} }
class Refraction : public osg::Camera class Refraction : public osg::Camera
{ {
public: public:
@ -220,7 +221,7 @@ public:
setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water")); setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
setName("RefractionCamera"); setName("RefractionCamera");
setupCullMask(true); setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting);
setNodeMask(Mask_RenderToTexture); setNodeMask(Mask_RenderToTexture);
setViewport(0, 0, rttSize, rttSize); setViewport(0, 0, rttSize, rttSize);
@ -261,12 +262,6 @@ public:
attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture); attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture);
} }
void setupCullMask(bool enabled)
{
setCullMask(!enabled ? 0 :
Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting);
}
void setScene(osg::Node* scene) void setScene(osg::Node* scene)
{ {
if (mScene) if (mScene)
@ -309,9 +304,9 @@ public:
setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water")); setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
setName("ReflectionCamera"); setName("ReflectionCamera");
mReflectActors = Settings::Manager::getBool("reflect actors", "Water"); bool reflectActors = Settings::Manager::getBool("reflect actors", "Water");
setupCullMask(true); setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting|(reflectActors ? Mask_Actor : 0));
setNodeMask(Mask_RenderToTexture); setNodeMask(Mask_RenderToTexture);
unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water"); unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
@ -339,12 +334,6 @@ public:
addChild(mClipCullNode); addChild(mClipCullNode);
} }
void setupCullMask(bool enabled)
{
setCullMask(!enabled ? 0 :
Mask_Effect|Mask_Scene|Mask_Terrain|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting|(mReflectActors ? Mask_Actor : 0));
}
void setWaterLevel(float waterLevel) void setWaterLevel(float waterLevel)
{ {
setViewMatrix(osg::Matrix::scale(1,1,-1) * osg::Matrix::translate(0,0,2 * waterLevel)); setViewMatrix(osg::Matrix::scale(1,1,-1) * osg::Matrix::translate(0,0,2 * waterLevel));
@ -719,13 +708,4 @@ void Water::clearRipples()
mSimulation->clear(); mSimulation->clear();
} }
void Water::setEffectsEnabled(bool enabled)
{
if (mReflection)
mReflection->setupCullMask(enabled);
if (mRefraction)
mRefraction->setupCullMask(enabled);
}
} }

1
apps/openmw/mwrender/water.hpp
View File

@ -107,7 +107,6 @@ namespace MWRender
void removeCell(const MWWorld::CellStore* store); ///< remove all emitters in this cell void removeCell(const MWWorld::CellStore* store); ///< remove all emitters in this cell
void clearRipples(); void clearRipples();
void setEffectsEnabled(bool enabled);
void changeCell(const MWWorld::CellStore* store); void changeCell(const MWWorld::CellStore* store);
void setHeight(const float height); void setHeight(const float height);

1
apps/openmw/mwstate/statemanagerimp.cpp
View File

@ -655,4 +655,5 @@ void MWState::StateManager::writeScreenshot(std::vector<char> &imageData) const
std::string data = ostream.str(); std::string data = ostream.str();
imageData = std::vector<char>(data.begin(), data.end()); imageData = std::vector<char>(data.begin(), data.end());
} }