mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-29 15:06:42 +00:00
removed some redundant code, added some comments
This commit is contained in:
parent
38b06aee6c
commit
5018db3332
3 changed files with 14 additions and 3 deletions
|
@ -28,6 +28,8 @@ namespace MWRender
|
||||||
bool mVanityModeEnabled;
|
bool mVanityModeEnabled;
|
||||||
|
|
||||||
void controlFlip();
|
void controlFlip();
|
||||||
|
|
||||||
|
/// Updates sound manager listener data
|
||||||
void updateListener();
|
void updateListener();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -35,11 +37,17 @@ namespace MWRender
|
||||||
Player (Ogre::Camera *camera, Ogre::SceneNode* mNode);
|
Player (Ogre::Camera *camera, Ogre::SceneNode* mNode);
|
||||||
|
|
||||||
/// Set where the player is looking at. Uses Morrowind (euler) angles
|
/// Set where the player is looking at. Uses Morrowind (euler) angles
|
||||||
|
/// \return true if player object needs to bo rotated physically
|
||||||
bool setRotation(const Ogre::Vector3 &rot);
|
bool setRotation(const Ogre::Vector3 &rot);
|
||||||
|
|
||||||
|
/// \return true if player object needs to bo rotated physically
|
||||||
bool adjustRotation(const Ogre::Vector3 &rot);
|
bool adjustRotation(const Ogre::Vector3 &rot);
|
||||||
|
|
||||||
std::string getHandle() const;
|
std::string getHandle() const;
|
||||||
|
|
||||||
|
/// Attach camera to object
|
||||||
|
/// \note there is no protection from attaching the same camera to
|
||||||
|
/// several different objects
|
||||||
void attachTo(const MWWorld::Ptr &);
|
void attachTo(const MWWorld::Ptr &);
|
||||||
|
|
||||||
void toggleViewMode() {
|
void toggleViewMode() {
|
||||||
|
|
|
@ -85,6 +85,10 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
|
||||||
|
|
||||||
void moveObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& position);
|
void moveObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& position);
|
||||||
void scaleObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& scale);
|
void scaleObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& scale);
|
||||||
|
|
||||||
|
/// Rotates object accordingly to its type
|
||||||
|
/// \param adjust indicates should rotation be set or adjusted
|
||||||
|
/// \return true if object needs to be rotated physically
|
||||||
bool rotateObject (const MWWorld::Ptr& ptr, Ogre::Vector3 &rot, bool adjust = false);
|
bool rotateObject (const MWWorld::Ptr& ptr, Ogre::Vector3 &rot, bool adjust = false);
|
||||||
|
|
||||||
void setWaterHeight(const float height);
|
void setWaterHeight(const float height);
|
||||||
|
|
|
@ -140,19 +140,18 @@ namespace MWWorld
|
||||||
const ESM::Position& pos,
|
const ESM::Position& pos,
|
||||||
bool adjustPlayerPos)
|
bool adjustPlayerPos)
|
||||||
{
|
{
|
||||||
MWBase::Environment::get().getWorld()->getPlayer().setCell (cell);
|
|
||||||
|
|
||||||
bool hasWater = cell->cell->data.flags & cell->cell->HasWater;
|
bool hasWater = cell->cell->data.flags & cell->cell->HasWater;
|
||||||
mPhysics->setCurrentWater(hasWater, cell->cell->water);
|
mPhysics->setCurrentWater(hasWater, cell->cell->water);
|
||||||
|
|
||||||
MWBase::World *world = MWBase::Environment::get().getWorld();
|
MWBase::World *world = MWBase::Environment::get().getWorld();
|
||||||
|
world->getPlayer().setCell(cell);
|
||||||
|
|
||||||
MWWorld::Ptr player = world->getPlayer().getPlayer();
|
MWWorld::Ptr player = world->getPlayer().getPlayer();
|
||||||
|
|
||||||
if (adjustPlayerPos) {
|
if (adjustPlayerPos) {
|
||||||
world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]);
|
world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]);
|
||||||
world->rotateObject(player, pos.rot[0], pos.rot[1], pos.rot[2]);
|
world->rotateObject(player, pos.rot[0], pos.rot[1], pos.rot[2]);
|
||||||
}
|
}
|
||||||
world->getPlayer().setCell(cell);
|
|
||||||
|
|
||||||
MWMechanics::MechanicsManager *mechMgr =
|
MWMechanics::MechanicsManager *mechMgr =
|
||||||
MWBase::Environment::get().getMechanicsManager();
|
MWBase::Environment::get().getMechanicsManager();
|
||||||
|
|
Loading…
Reference in a new issue