Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marc Zinnschlag 2016-01-03 10:17:08 +01:00
commit 236bfa3678
2 changed files with 2 additions and 1 deletions

View File

@ -56,6 +56,7 @@ Programmers
Jeffrey Haines (Jyby) Jeffrey Haines (Jyby)
Jengerer Jengerer
Jiří Kuneš (kunesj) Jiří Kuneš (kunesj)
Joe Wilkerson (neuralroberts)
Joel Graff (graffy) Joel Graff (graffy)
John Blomberg (fstp) John Blomberg (fstp)
Jordan Ayers Jordan Ayers

View File

@ -1435,7 +1435,7 @@ namespace MWMechanics
osg::Vec3f observerDir = (observer.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0)); osg::Vec3f observerDir = (observer.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0));
float angleRadians = std::acos(observerDir * vec / (observerDir.length() * vec.length())); float angleRadians = std::acos(observerDir * vec / (observerDir.length() * vec.length()));
if (angleRadians < osg::DegreesToRadians(90.f)) if (angleRadians > osg::DegreesToRadians(90.f))
y = obsTerm * observerStats.getFatigueTerm() * fSneakNoViewMult; y = obsTerm * observerStats.getFatigueTerm() * fSneakNoViewMult;
else else
y = obsTerm * observerStats.getFatigueTerm() * fSneakViewMult; y = obsTerm * observerStats.getFatigueTerm() * fSneakViewMult;