Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-09 03:57:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 39

Merge branch 'master' into guifixes

Browse source
This commit is contained in:
Alexei Dobrohotov 2019-09-20 20:03:02 +03:00 • committed by GitHub
commit acc4811d12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 522 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/world.hpp
View file

@ -403,7 +403,7 @@ namespace MWBase
virtual osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const = 0;
virtual void togglePOV() = 0;
virtual void togglePOV(bool force = false) = 0;
virtual bool isFirstPerson() const = 0;
virtual void togglePreviewMode(bool enable) = 0;
virtual bool toggleVanityMode(bool enable) = 0;

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

@ -1333,9 +1333,9 @@ namespace MWRender
return mCurrentCameraPos;
}
void RenderingManager::togglePOV()
void RenderingManager::togglePOV(bool force)
{
mCamera->toggleViewMode();
mCamera->toggleViewMode(force);
}
void RenderingManager::togglePreviewMode(bool enable)

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

@ -204,7 +204,7 @@ namespace MWRender
float getCameraDistance() const;
Camera* getCamera();
const osg::Vec3f& getCameraPosition() const;
void togglePOV();
void togglePOV(bool force = false);
void togglePreviewMode(bool enable);
bool toggleVanityMode(bool enable);
void allowVanityMode(bool allow);

4
apps/openmw/mwscript/miscextensions.cpp
View file

@ -358,7 +358,7 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime)
{
if (!MWBase::Environment::get().getWorld()->isFirstPerson())
MWBase::Environment::get().getWorld()->togglePOV();
MWBase::Environment::get().getWorld()->togglePOV(true);
}
};
@ -367,7 +367,7 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime)
{
if (MWBase::Environment::get().getWorld()->isFirstPerson())
MWBase::Environment::get().getWorld()->togglePOV();
MWBase::Environment::get().getWorld()->togglePOV(true);
}
};

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

@ -2395,9 +2395,9 @@ namespace MWWorld
return mPhysics->isOnGround(ptr);
}
void World::togglePOV()
void World::togglePOV(bool force)
{
mRendering->togglePOV();
mRendering->togglePOV(force);
}
bool World::isFirstPerson() const

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -518,7 +518,7 @@ namespace MWWorld
osg::Matrixf getActorHeadTransform(const MWWorld::ConstPtr& actor) const override;
void togglePOV() override;
void togglePOV(bool force = false) override;
bool isFirstPerson() const override;