mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-08 03:41:11 -04:00
fixes + russian line
This commit is contained in:
parent
aae21c6f53
commit
b792bc0ee2
@ -481,7 +481,7 @@ namespace MWBase
|
|||||||
virtual float getSunVisibility() const = 0;
|
virtual float getSunVisibility() const = 0;
|
||||||
virtual float getSunPercentage() const = 0;
|
virtual float getSunPercentage() const = 0;
|
||||||
|
|
||||||
virtual float getPhysicsFrameRateDT() const = 0;
|
virtual float getPhysicsFrameRateDt() const = 0;
|
||||||
|
|
||||||
virtual bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) = 0;
|
virtual bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) = 0;
|
||||||
|
|
||||||
|
@ -93,9 +93,10 @@ namespace
|
|||||||
namespace MWPhysics
|
namespace MWPhysics
|
||||||
{
|
{
|
||||||
PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
|
PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
|
||||||
: mShapeManager(
|
: mPhysicsDt(1.f / 60.f)
|
||||||
std::make_unique<Resource::BulletShapeManager>(resourceSystem->getVFS(), resourceSystem->getSceneManager(),
|
, mShapeManager(std::make_unique<Resource::BulletShapeManager>(resourceSystem->getVFS(),
|
||||||
resourceSystem->getNifFileManager(), Settings::cells().mCacheExpiryDelay))
|
resourceSystem->getSceneManager(), resourceSystem->getNifFileManager(),
|
||||||
|
Settings::cells().mCacheExpiryDelay))
|
||||||
, mResourceSystem(resourceSystem)
|
, mResourceSystem(resourceSystem)
|
||||||
, mDebugDrawEnabled(false)
|
, mDebugDrawEnabled(false)
|
||||||
, mTimeAccum(0.0f)
|
, mTimeAccum(0.0f)
|
||||||
@ -103,7 +104,6 @@ namespace MWPhysics
|
|||||||
, mWaterHeight(0)
|
, mWaterHeight(0)
|
||||||
, mWaterEnabled(false)
|
, mWaterEnabled(false)
|
||||||
, mParentNode(std::move(parentNode))
|
, mParentNode(std::move(parentNode))
|
||||||
, mPhysicsDt(1.f / 60.f)
|
|
||||||
{
|
{
|
||||||
mResourceSystem->addResourceManager(mShapeManager.get());
|
mResourceSystem->addResourceManager(mShapeManager.get());
|
||||||
|
|
||||||
|
@ -983,7 +983,7 @@ namespace MWSound
|
|||||||
sound->setPosition(ptr.getRefData().getPosition().asVec3());
|
sound->setPosition(ptr.getRefData().getPosition().asVec3());
|
||||||
MWBase::World* world = MWBase::Environment::get().getWorld();
|
MWBase::World* world = MWBase::Environment::get().getWorld();
|
||||||
sound->setVelocity(
|
sound->setVelocity(
|
||||||
(sound->getPosition() - sound->getLastPosition()) / world->getPhysicsFrameRateDT());
|
(sound->getPosition() - sound->getLastPosition()) / world->getPhysicsFrameRateDt());
|
||||||
}
|
}
|
||||||
|
|
||||||
cull3DSound(sound);
|
cull3DSound(sound);
|
||||||
@ -1024,7 +1024,7 @@ namespace MWSound
|
|||||||
MWBase::World* world = MWBase::Environment::get().getWorld();
|
MWBase::World* world = MWBase::Environment::get().getWorld();
|
||||||
sound->setPosition(world->getActorHeadTransform(ptr).getTrans());
|
sound->setPosition(world->getActorHeadTransform(ptr).getTrans());
|
||||||
sound->setVelocity(
|
sound->setVelocity(
|
||||||
(sound->getPosition() - sound->getLastPosition()) / world->getPhysicsFrameRateDT());
|
(sound->getPosition() - sound->getLastPosition()) / world->getPhysicsFrameRateDt());
|
||||||
}
|
}
|
||||||
|
|
||||||
cull3DSound(sound);
|
cull3DSound(sound);
|
||||||
|
@ -3152,7 +3152,7 @@ namespace MWWorld
|
|||||||
return mWeatherManager->getSunPercentage(getTimeStamp().getHour());
|
return mWeatherManager->getSunPercentage(getTimeStamp().getHour());
|
||||||
}
|
}
|
||||||
|
|
||||||
float World::getPhysicsFrameRateDT() const
|
float World::getPhysicsFrameRateDt() const
|
||||||
{
|
{
|
||||||
return mPhysics->mPhysicsDt;
|
return mPhysics->mPhysicsDt;
|
||||||
}
|
}
|
||||||
|
@ -576,7 +576,7 @@ namespace MWWorld
|
|||||||
float getSunVisibility() const override;
|
float getSunVisibility() const override;
|
||||||
float getSunPercentage() const override;
|
float getSunPercentage() const override;
|
||||||
|
|
||||||
float getPhysicsFrameRateDT() const override;
|
float getPhysicsFrameRateDt() const override;
|
||||||
|
|
||||||
bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) override;
|
bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) override;
|
||||||
|
|
||||||
|
@ -1464,7 +1464,7 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source><html><head/><body><p>Controls the strength of the Doppler effect. Zero means it is completely disabled.</p><p>The Doppler effect increases or decreases the pitch of sounds relative to the velocity of the sound source and the listener.</p></body></html></source>
|
<source><html><head/><body><p>Controls the strength of the Doppler effect. Zero means it is completely disabled.</p><p>The Doppler effect increases or decreases the pitch of sounds relative to the velocity of the sound source and the listener.</p></body></html></source>
|
||||||
<translation type="unfinished"></translation>
|
<translation><html><head/><body><p>Определяет силу эффекта Доплера. Нулевое значение означает, что эффект отключен полностью.</p><p>Эффект Доплера увеличивает или уменьшает высоту звуков в зависимости от скорости источника звука и слушателя.</p></body></html></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Doppler Factor</source>
|
<source>Doppler Factor</source>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user