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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-11-25 16:02:08 +01:00
commit ba2cfee2b1
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp
View file

@ -27,24 +27,16 @@
// //
#include "weather_function_params_sheet_base.h" #include "weather_function_params_sheet_base.h"
#include "nel/misc/algo.h" #include "nel/misc/algo.h"
#include "nel/misc/random.h" #include "nel/misc/wang_hash.h"
#include "nel/misc/noise_value.h"
#include "nel/misc/fast_floor.h"
// //
static NLMISC::CNoiseValue nv;
float CPredictWeather::getCycleWeatherValue(uint64 cycle, const CWeatherFunction &wf) float CPredictWeather::getCycleWeatherValue(uint64 cycle, const CWeatherFunction &wf)
{ {
uint numWS = wf.getNumWeatherSetups(); uint numWS = wf.getNumWeatherSetups();
if (!numWS) return 0.f; if (!numWS) return 0.f;
NLMISC::CRandom rnd; uint32 value = NLMISC::wangHash64(cycle) % wf.getWeatherSetupsTotalWeight();
NLMISC::OptFastFloorBegin();
float noiseValue = nv.eval(NLMISC::CVector(cycle * 0.99524f, cycle * 0.85422f, cycle * -0.45722f));
NLMISC::OptFastFloorEnd();
noiseValue = fmodf(noiseValue * 10.f, 1.f); // make distribution more uniform
uint32 value = (uint32) (noiseValue * (float) wf.getWeatherSetupsTotalWeight());
uint32 currWeight = 0; uint32 currWeight = 0;
for(uint k = 0; k < numWS; ++k) for(uint k = 0; k < numWS; ++k)
{ {