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

Remove unused/unneeded parameters

Browse Source
This commit is contained in:
Chris Robinson 2013-08-07 03:02:27 -07:00
parent 932fffd1a7
commit 0458fd5531
19 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwclass/apparatus.cpp
View File

@ -26,7 +26,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/armor.cpp
View File

@ -31,7 +31,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/book.cpp
View File

@ -24,7 +24,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/clothing.cpp
View File

@ -28,7 +28,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/container.cpp
View File

@ -62,7 +62,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/door.cpp
View File

@ -30,7 +30,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/ingredient.cpp
View File

@ -37,7 +37,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/light.cpp
View File

@ -33,7 +33,7 @@ namespace MWClass
const std::string &model = ref->mBase->mModel;
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
if(!model.empty())
objects.insertMesh(ptr, "meshes\\" + model);
else

2
apps/openmw/mwclass/lockpick.cpp
View File

@ -27,7 +27,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/misc.cpp
View File

@ -43,7 +43,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/potion.cpp
View File

@ -29,7 +29,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/probe.cpp
View File

@ -27,7 +27,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/repair.cpp
View File

@ -26,7 +26,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/static.cpp
View File

@ -16,7 +16,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), true);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

2
apps/openmw/mwclass/weapon.cpp
View File

@ -34,7 +34,7 @@ namespace MWClass
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
}
}

5
apps/openmw/mwrender/animation.cpp
View File

@ -979,7 +979,7 @@ void Animation::detachObjectFromBone(Ogre::MovableObject *obj)
}
ObjectAnimation::ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model, bool isStatic)
ObjectAnimation::ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model)
: Animation(ptr, ptr.getRefData().getBaseNode())
{
setObjectRoot(model, false);
@ -997,7 +997,8 @@ ObjectAnimation::ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &mod
small = false;
float dist = small ? Settings::Manager::getInt("small object distance", "Viewing distance") : 0.0f;
setRenderProperties(mObjectRoot, isStatic ? (small ? RV_StaticsSmall : RV_Statics) : RV_Misc,
setRenderProperties(mObjectRoot, (mPtr.getTypeName() == typeid(ESM::Static).name()) ?
(small ? RV_StaticsSmall : RV_Statics) : RV_Misc,
RQG_Main, RQG_Alpha, dist);
}

2
apps/openmw/mwrender/animation.hpp
View File

@ -247,7 +247,7 @@ public:
class ObjectAnimation : public Animation {
public:
ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model, bool isStatic);
ObjectAnimation(const MWWorld::Ptr& ptr, const std::string &model);
void addLight(const ESM::Light *light);

11
apps/openmw/mwrender/objects.cpp
View File

@ -29,7 +29,7 @@ void Objects::setRootNode(Ogre::SceneNode* root)
mRootNode = root;
}
void Objects::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_)
void Objects::insertBegin (const MWWorld::Ptr& ptr)
{
Ogre::SceneNode* root = mRootNode;
Ogre::SceneNode* cellnode;
@ -66,10 +66,7 @@ void Objects::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_)
// Rotates first around z, then y, then x
insert->setOrientation(xr*yr*zr);
if (!enabled)
insert->setVisible (false);
ptr.getRefData().setBaseNode(insert);
mIsStatic = static_;
}
void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
@ -77,7 +74,7 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
Ogre::SceneNode* insert = ptr.getRefData().getBaseNode();
assert(insert);
std::auto_ptr<ObjectAnimation> anim(new ObjectAnimation(ptr, mesh, mIsStatic));
std::auto_ptr<ObjectAnimation> anim(new ObjectAnimation(ptr, mesh));
Ogre::AxisAlignedBox bounds = anim->getWorldBounds();
Ogre::Vector3 extents = bounds.getSize();
@ -97,7 +94,9 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
if(ptr.getTypeName() == typeid(ESM::Light).name())
anim->addLight(ptr.get<ESM::Light>()->mBase);
if(mIsStatic && Settings::Manager::getBool("use static geometry", "Objects") && anim->canBatch())
if(ptr.getTypeName() == typeid(ESM::Static).name() &&
Settings::Manager::getBool("use static geometry", "Objects") &&
anim->canBatch())
{
Ogre::StaticGeometry* sg = 0;

5
apps/openmw/mwrender/objects.hpp
View File

@ -28,17 +28,16 @@ class Objects{
PtrAnimationMap mObjects;
Ogre::SceneNode* mRootNode;
bool mIsStatic;
static int uniqueID;
public:
Objects(OEngine::Render::OgreRenderer &renderer)
: mRenderer(renderer)
, mIsStatic(false)
, mRootNode(NULL)
{}
~Objects(){}
void insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_);
void insertBegin (const MWWorld::Ptr& ptr);
void insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh);
void enableLights();