mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Remove now unnecessary factory class.

Browse Source 
It was originally used for storing normals, but that functionality
was removed.
This commit is contained in:
Aesylwinn 2016-05-03 16:11:39 -04:00
parent 1f902ff069
commit 14ae232938
4 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/opencs/view/render/cell.cpp
View File

@ -75,8 +75,7 @@ void CSVRender::Cell::recreatePathgrid()
if (pathgridIndex != -1)
{
mPathgridGeode->removeDrawable(mPathgridGeometry);
mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
pathgrids.getRecord(pathgridIndex).get());
mPathgridGeometry = SceneUtil::createPathgridGeometry(pathgrids.getRecord(pathgridIndex).get());
mPathgridGeode->addDrawable(mPathgridGeometry);
}
}

2
apps/openmw/mwrender/pathgrid.cpp
View File

@ -112,7 +112,7 @@ void Pathgrid::enableCellPathgrid(const MWWorld::CellStore *store)
osg::ref_ptr<osg::PositionAttitudeTransform> cellPathGrid = new osg::PositionAttitudeTransform;
cellPathGrid->setPosition(cellPathGridPos);
osg::ref_ptr<osg::Geometry> geometry = SceneUtil::PathgridGeometryFactory::get().create(*pathgrid);
osg::ref_ptr<osg::Geometry> geometry = SceneUtil::createPathgridGeometry(*pathgrid);
cellPathGrid->addChild(geometry);

12
components/sceneutil/pathgridutil.cpp
View File

@ -56,7 +56,7 @@ namespace SceneUtil
const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
osg::ref_ptr<osg::Geometry> PathgridGeometryFactory::create(const ESM::Pathgrid& pathgrid)
osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
{
const unsigned short PointCount = static_cast<unsigned short>(pathgrid.mPoints.size());
const size_t EdgeCount = pathgrid.mEdges.size();
@ -155,14 +155,4 @@ namespace SceneUtil
return gridGeometry;
}
PathgridGeometryFactory& PathgridGeometryFactory::get()
{
static PathgridGeometryFactory instance;
return instance;
}
PathgridGeometryFactory::PathgridGeometryFactory()
{
}
}

17
components/sceneutil/pathgridutil.hpp
View File

@ -11,22 +11,7 @@ namespace ESM
namespace SceneUtil
{
class PathgridGeometryFactory
{
public:
osg::ref_ptr<osg::Geometry> create(const ESM::Pathgrid& pathgrid);
static PathgridGeometryFactory& get();
private:
PathgridGeometryFactory();
// Not implemented
PathgridGeometryFactory(const PathgridGeometryFactory&);
PathgridGeometryFactory& operator=(const PathgridGeometryFactory&);
};
osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid);
}
#endif