From 331959909a0a015199bf54ea9b0bb8710fbadba3 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 25 Nov 2015 16:02:08 +0100 Subject: [PATCH] Merge with develop --- .../time_weather_season/weather_predict.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp b/code/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp index 2c4c0ee5f..33224acf9 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_predict.cpp @@ -27,24 +27,16 @@ // #include "weather_function_params_sheet_base.h" #include "nel/misc/algo.h" -#include "nel/misc/random.h" -#include "nel/misc/noise_value.h" -#include "nel/misc/fast_floor.h" +#include "nel/misc/wang_hash.h" // -static NLMISC::CNoiseValue nv; float CPredictWeather::getCycleWeatherValue(uint64 cycle, const CWeatherFunction &wf) { uint numWS = wf.getNumWeatherSetups(); if (!numWS) return 0.f; - NLMISC::CRandom rnd; - 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 value = NLMISC::wangHash64(cycle) % wf.getWeatherSetupsTotalWeight(); uint32 currWeight = 0; for(uint k = 0; k < numWS; ++k) {