mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Resolve merge issues.

Browse Source
This commit is contained in:
cc9cii 2014-12-09 19:37:37 +11:00
parent 84f0ddd51c
commit 4c3c674223
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/view/render/pathgridpoint.cpp
View File

@ -15,7 +15,7 @@
namespace CSVRender namespace CSVRender
{ {
PathgridPoint::PathgridPoint(const std::string &name, PathgridPoint::PathgridPoint(const std::string &name,
Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos, CSVWorld::PhysicsSystem *physics) Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos, boost::shared_ptr<CSVWorld::PhysicsSystem> physics)
: mBase(cellNode), mPhysics(physics) : mBase(cellNode), mPhysics(physics)
{ {
mBase = cellNode->createChildSceneNode(); mBase = cellNode->createChildSceneNode();

7
apps/opencs/view/render/pathgridpoint.hpp
View File

@ -1,6 +1,8 @@
#ifndef OPENCS_VIEW_PATHGRIDPOINT_H #ifndef OPENCS_VIEW_PATHGRIDPOINT_H
#define OPENCS_VIEW_PATHGRIDPOINT_H #define OPENCS_VIEW_PATHGRIDPOINT_H
#include <boost/shared_ptr.hpp>
#include <components/nifogre/ogrenifloader.hpp> #include <components/nifogre/ogrenifloader.hpp>
namespace Ogre namespace Ogre
@ -19,14 +21,15 @@ namespace CSVRender
{ {
class PathgridPoint class PathgridPoint
{ {
CSVWorld::PhysicsSystem *mPhysics; // local copy boost::shared_ptr<CSVWorld::PhysicsSystem> mPhysics; // local copy
NifOgre::ObjectScenePtr mPgPoint; NifOgre::ObjectScenePtr mPgPoint;
Ogre::SceneNode *mBase; Ogre::SceneNode *mBase;
public: public:
PathgridPoint(const std::string &name, PathgridPoint(const std::string &name,
Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos, CSVWorld::PhysicsSystem *physics); Ogre::SceneNode *cellNode, const Ogre::Vector3 &pos,
boost::shared_ptr<CSVWorld::PhysicsSystem> physics);
~PathgridPoint(); ~PathgridPoint();