krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #186 from OpenMW/master

Browse source 
Add OpenMW commits up to 15 Mar 2017
This commit is contained in:
David Cernat 2017-03-15 23:13:24 +02:00 committed by GitHub
commit 5eb183bacf
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.md
View file

@ -22,6 +22,7 @@ Programmers
Alexander Nadeau (wareya) Alexander Nadeau (wareya)
Alexander Olofsson (Ace) Alexander Olofsson (Ace)
Allofich Allofich
Andrei Kortunov (akortunov)
AnyOldName3 AnyOldName3
Aussiemon Aussiemon
Austin Salgat (Salgat) Austin Salgat (Salgat)

6
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1959,12 +1959,14 @@ namespace MWGui
void WindowManager::cycleSpell(bool next) void WindowManager::cycleSpell(bool next)
{ {
mSpellWindow->cycle(next); if (!isGuiMode())
mSpellWindow->cycle(next);
} }
void WindowManager::cycleWeapon(bool next) void WindowManager::cycleWeapon(bool next)
{ {
mInventoryWindow->cycle(next); if (!isGuiMode())
mInventoryWindow->cycle(next);
} }
void WindowManager::setConsoleSelectedObject(const MWWorld::Ptr &object) void WindowManager::setConsoleSelectedObject(const MWWorld::Ptr &object)

2
components/sceneutil/optimizer.cpp
View file

@ -1057,7 +1057,7 @@ void Optimizer::MergeGeometryVisitor::checkAllowedToMerge()
{ {
osg::StateSet* stateSet = *it; osg::StateSet* stateSet = *it;
osg::StateSet::RenderBinMode mode = stateSet->getRenderBinMode(); osg::StateSet::RenderBinMode mode = stateSet->getRenderBinMode();
if (override && (!mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS)) if (override && !(mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS))
continue; continue;
if (mode & osg::StateSet::USE_RENDERBIN_DETAILS) if (mode & osg::StateSet::USE_RENDERBIN_DETAILS)
renderingHint = stateSet->getRenderingHint(); renderingHint = stateSet->getRenderingHint();

4
components/terrain/quadtreeworld.cpp
View file

@ -37,7 +37,7 @@ namespace
return targetlevel; return targetlevel;
} }
float distance(const osg::BoundingBox& box, const osg::Vec3f& v) float distanceToBox(const osg::BoundingBox& box, const osg::Vec3f& v)
{ {
if (box.contains(v)) if (box.contains(v))
return 0; return 0;
@ -79,7 +79,7 @@ public:
virtual bool isSufficientDetail(QuadTreeNode* node, const osg::Vec3f& eyePoint) virtual bool isSufficientDetail(QuadTreeNode* node, const osg::Vec3f& eyePoint)
{ {
float dist = distance(node->getBoundingBox(), eyePoint); float dist = distanceToBox(node->getBoundingBox(), eyePoint);
int nativeLodLevel = Log2(static_cast<unsigned int>(node->getSize()/mMinSize)); int nativeLodLevel = Log2(static_cast<unsigned int>(node->getSize()/mMinSize));
int lodLevel = Log2(static_cast<unsigned int>(dist/(8192*mMinSize))); int lodLevel = Log2(static_cast<unsigned int>(dist/(8192*mMinSize)));