Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #963 Floating point exceptions

Browse source
This commit is contained in:
kervala 2010-06-05 10:50:04 +02:00
parent 2ef597aaae
commit d14e6418da
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/src/sound/driver/source.cpp
View file

@ -25,12 +25,15 @@ namespace NLSOUND
// common method used only with OptionManualRolloff. return the volume in 1/100th DB ( = mB) modified // common method used only with OptionManualRolloff. return the volume in 1/100th DB ( = mB) modified
sint32 ISource::computeManualRollOff(sint32 volumeMB, sint32 mbMin, sint32 mbMax, double alpha, float sqrdist, float distMin, float distMax) sint32 ISource::computeManualRollOff(sint32 volumeMB, sint32 mbMin, sint32 mbMax, double alpha, float sqrdist, float distMin, float distMax)
{ {
// root square of max float value
static float maxSqrt = sqrt(std::numeric_limits<float>::max());
if (sqrdist < distMin * distMin) if (sqrdist < distMin * distMin)
{ {
// no attenuation // no attenuation
return volumeMB; return volumeMB;
} }
else if (sqrdist > distMax * distMax) else if ((distMax < maxSqrt) && (sqrdist > distMax * distMax))
{ {
// full attenuation // full attenuation
return mbMin; return mbMin;

5
code/ryzom/client/src/main_loop.cpp
View file

@ -322,7 +322,7 @@ std::string DebugUIFilter;
bool ShowHelp = false; // Do the Help have to be displayed. bool ShowHelp = false; // Do the Help have to be displayed.
uint8 ShowInfos = 0; // 0=no info 1=text info 2=graph info uint8 ShowInfos = 0; // 0=no info 1=text info 2=graph info
bool bZeroCpu = 0; // For no Cpu use if application is minimize TODO: intercept minimize message, called by CTRL + Z at this bool bZeroCpu = false; // For no Cpu use if application is minimize TODO: intercept minimize message, called by CTRL + Z at this
bool Profiling = false; // Are we in Profile mode? bool Profiling = false; // Are we in Profile mode?
uint ProfileNumFrame = 0; uint ProfileNumFrame = 0;
@ -2287,9 +2287,12 @@ bool mainLoop()
smoothFPS.addValue((float)deltaTime); smoothFPS.addValue((float)deltaTime);
moreSmoothFPS.addValue((float)deltaTime); moreSmoothFPS.addValue((float)deltaTime);
deltaTime = smoothFPS.getSmoothValue (); deltaTime = smoothFPS.getSmoothValue ();
if (deltaTime > 0.0)
{
CCDBNodeLeaf*pNL = pIMinstance->getDbProp("UI:VARIABLES:FPS"); CCDBNodeLeaf*pNL = pIMinstance->getDbProp("UI:VARIABLES:FPS");
pNL->setValue64((sint64)(1.f/deltaTime)); pNL->setValue64((sint64)(1.f/deltaTime));
} }
}
// Detect disconnection / server down: display information text // Detect disconnection / server down: display information text
// but keep the rendering so that the player can remember where he is // but keep the rendering so that the player can remember where he is