mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:23:51 +00:00
Code Issues Releases Wiki Activity

Implement getHalfExtents() for non-actor objects

Browse source
This commit is contained in:
Andrei Kortunov 2018-06-16 10:18:04 +04:00
parent 088463ebe6
commit 8516aee6e0
3 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwgui/loadingscreen.hpp" #include "../mwgui/loadingscreen.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
@ -1321,6 +1322,29 @@ namespace MWRender
} }
} }
osg::Vec3f RenderingManager::getHalfExtents(const MWWorld::ConstPtr& object) const
{
osg::Vec3f halfExtents(0, 0, 0);
std::string modelName = object.getClass().getModel(object);
if (modelName.empty())
return halfExtents;
osg::ref_ptr<const osg::Node> node = mResourceSystem->getSceneManager()->getTemplate(modelName);
osg::ComputeBoundsVisitor computeBoundsVisitor;
computeBoundsVisitor.setTraversalMask(~(MWRender::Mask_ParticleSystem|MWRender::Mask_Effect));
const_cast<osg::Node*>(node.get())->accept(computeBoundsVisitor);
osg::BoundingBox bounds = computeBoundsVisitor.getBoundingBox();
if (bounds.valid())
{
halfExtents[0] = std::abs(bounds.xMax() - bounds.xMin()) / 2.f;
halfExtents[1] = std::abs(bounds.yMax() - bounds.yMin()) / 2.f;
halfExtents[2] = std::abs(bounds.zMax() - bounds.zMin()) / 2.f;
}
return halfExtents;
}
void RenderingManager::resetFieldOfView() void RenderingManager::resetFieldOfView()
{ {
if (mFieldOfViewOverridden == true) if (mFieldOfViewOverridden == true)

2
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -203,6 +203,8 @@ namespace MWRender
/// reset a previous overrideFieldOfView() call, i.e. revert to field of view specified in the settings file. /// reset a previous overrideFieldOfView() call, i.e. revert to field of view specified in the settings file.
void resetFieldOfView(); void resetFieldOfView();
osg::Vec3f getHalfExtents(const MWWorld::ConstPtr& object) const;
void exportSceneGraph(const MWWorld::Ptr& ptr, const std::string& filename, const std::string& format); void exportSceneGraph(const MWWorld::Ptr& ptr, const std::string& filename, const std::string& format);
LandManager* getLandManager() const; LandManager* getLandManager() const;

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

@ -3339,12 +3339,16 @@ namespace MWWorld
return mRendering->getTerrainHeightAt(worldPos); return mRendering->getTerrainHeightAt(worldPos);
} }
osg::Vec3f World::getHalfExtents(const ConstPtr& actor, bool rendering) const osg::Vec3f World::getHalfExtents(const ConstPtr& object, bool rendering) const
{ {
if (!object.getClass().isActor())
return mRendering->getHalfExtents(object);
// Handle actors separately because of bodyparts
if (rendering) if (rendering)
return mPhysics->getRenderingHalfExtents(actor); return mPhysics->getRenderingHalfExtents(object);
else else
return mPhysics->getHalfExtents(actor); return mPhysics->getHalfExtents(object);
} }
std::string World::exportSceneGraph(const Ptr &ptr) std::string World::exportSceneGraph(const Ptr &ptr)