From 08ae21fc7329d1b4cb0f23d77ca7ee2ad23ad8bb Mon Sep 17 00:00:00 2001 From: OEOTYAN <1124718975@qq.com> Date: Tue, 6 Sep 2022 17:18:51 +0800 Subject: [PATCH] update --- FastNoise/FastNoiseLite.h | 2931 +++++++++++++---------------- Template/WorldEdit.h | 2 +- core/brush/Brush.h | 1 + core/command/BrushCommand.cpp | 37 +- core/command/ClipboardCommand.cpp | 40 +- core/command/HandToolCommand.cpp | 59 +- core/eval/CppEval.h | 40 +- core/eval/Eval.cpp | 104 +- core/eval/Eval.h | 2 + core/store/BlockPattern.cpp | 7 +- core/store/BlockPattern.hpp | 10 +- core/subscribe/player.cpp | 142 +- core/subscribe/player.hpp | 12 +- core/tool/tool.cpp | 144 +- core/tool/tool.h | 17 +- 15 files changed, 1850 insertions(+), 1698 deletions(-) diff --git a/FastNoise/FastNoiseLite.h b/FastNoise/FastNoiseLite.h index 30a670c..78d3100 100644 --- a/FastNoise/FastNoiseLite.h +++ b/FastNoise/FastNoiseLite.h @@ -21,29 +21,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. // -// .'',;:cldxkO00KKXXNNWWWNNXKOkxdollcc::::::;:::ccllloooolllllllllooollc:,'... ...........',;cldxkO000Okxdlc::;;;,,;;;::cclllllll -// ..',;:ldxO0KXXNNNNNNNNXXK0kxdolcc::::::;;;,,,,,,;;;;;;;;;;:::cclllllc:;'.... ...........',;:ldxO0KXXXK0Okxdolc::;;;;::cllodddddo -// ...',:loxO0KXNNNNNXXKK0Okxdolc::;::::::::;;;,,'''''.....''',;:clllllc:;,'............''''''''',;:loxO0KXNNNNNXK0Okxdollccccllodxxxxxxd -// ....';:ldkO0KXXXKK00Okxdolcc:;;;;;::cclllcc:;;,''..... ....',;clooddolcc:;;;;,,;;;;;::::;;;;;;:cloxk0KXNWWWWWWNXKK0Okxddoooddxxkkkkkxx -// .....';:ldxkOOOOOkxxdolcc:;;;,,,;;:cllooooolcc:;'... ..,:codxkkkxddooollloooooooollcc:::::clodkO0KXNWWWWWWNNXK00Okxxxxxxxxkkkkxxx -// . ....';:cloddddo___________,,,,;;:clooddddoolc:,... ..,:ldx__00OOOkkk___kkkkkkxxdollc::::cclodkO0KXXNNNNNNXXK0OOkxxxxxxxxxxxxddd -// .......',;:cccc:| |,,,;;:cclooddddoll:;'.. ..';cox| \KKK000| |KK00OOkxdocc___;::clldxxkO0KKKKK00Okkxdddddddddddddddoo -// .......'',,,,,''| ________|',,;;::cclloooooolc:;'......___:ldk| \KK000| |XKKK0Okxolc| |;;::cclodxxkkkkxxdoolllcclllooodddooooo -// ''......''''....| | ....'',,,,;;;::cclloooollc:;,''.'| |oxk| \OOO0| |KKK00Oxdoll|___|;;;;;::ccllllllcc::;;,,;;;:cclloooooooo -// ;;,''.......... | |_____',,;;;____:___cllo________.___| |___| \xkk| |KK_______ool___:::;________;;;_______...'',;;:ccclllloo -// c:;,''......... | |:::/ ' |lo/ | | \dx| |0/ \d| |cc/ |'/ \......',,;;:ccllo -// ol:;,'..........| _____|ll/ __ |o/ ______|____ ___| | \o| |/ ___ \| |o/ ______|/ ___ \ .......'',;:clo -// dlc;,...........| |::clooo| / | |x\___ \KXKKK0| |dol| |\ \| | | | | |d\___ \..| | / / ....',:cl -// xoc;'... .....'| |llodddd| \__| |_____\ \KKK0O| |lc:| |'\ | |___| | |_____\ \.| |_/___/... ...',;:c -// dlc;'... ....',;| |oddddddo\ | |Okkx| |::;| |..\ |\ /| | | \ |... ....',;:c -// ol:,'.......',:c|___|xxxddollc\_____,___|_________/ddoll|___|,,,|___|...\_____|:\ ______/l|___|_________/...\________|'........',;::cc -// c:;'.......';:codxxkkkkxxolc::;::clodxkOO0OOkkxdollc::;;,,''''',,,,''''''''''',,'''''',;:loxkkOOkxol:;,'''',,;:ccllcc:;,'''''',;::ccll -// ;,'.......',:codxkOO0OOkxdlc:;,,;;:cldxxkkxxdolc:;;,,''.....'',;;:::;;,,,'''''........,;cldkO0KK0Okdoc::;;::cloodddoolc:;;;;;::ccllooo -// .........',;:lodxOO0000Okdoc:,,',,;:clloddoolc:;,''.......'',;:clooollc:;;,,''.......',:ldkOKXNNXX0Oxdolllloddxxxxxxdolccccccllooodddd -// . .....';:cldxkO0000Okxol:;,''',,;::cccc:;,,'.......'',;:cldxxkkxxdolc:;;,'.......';coxOKXNWWWNXKOkxddddxxkkkkkkxdoollllooddxxxxkkk -// ....',;:codxkO000OOxdoc:;,''',,,;;;;,''.......',,;:clodkO00000Okxolc::;,,''..',;:ldxOKXNWWWNNK0OkkkkkkkkkkkxxddooooodxxkOOOOO000 -// ....',;;clodxkkOOOkkdolc:;,,,,,,,,'..........,;:clodxkO0KKXKK0Okxdolcc::;;,,,;;:codkO0XXNNNNXKK0OOOOOkkkkxxdoollloodxkO0KKKXXXXX -// // VERSION: 1.0.1 // https://github.com/Auburn/FastNoise @@ -52,29 +29,18 @@ #include -class FastNoiseLite -{ -public: - enum NoiseType - { - NoiseType_OpenSimplex2, - NoiseType_OpenSimplex2S, +class FastNoiseLite { + public: + enum NoiseType { + NoiseType_Simplex = 0, NoiseType_Cellular, NoiseType_Perlin, NoiseType_ValueCubic, NoiseType_Value }; - enum RotationType3D - { - RotationType3D_None, - RotationType3D_ImproveXYPlanes, - RotationType3D_ImproveXZPlanes - }; - - enum FractalType - { - FractalType_None, + enum FractalType { + FractalType_None = 0, FractalType_FBm, FractalType_Ridged, FractalType_PingPong, @@ -82,17 +48,15 @@ class FastNoiseLite FractalType_DomainWarpIndependent }; - enum CellularDistanceFunction - { - CellularDistanceFunction_Euclidean, + enum CellularDistanceFunction { + CellularDistanceFunction_Euclidean = 0, CellularDistanceFunction_EuclideanSq, CellularDistanceFunction_Manhattan, CellularDistanceFunction_Hybrid }; - enum CellularReturnType - { - CellularReturnType_CellValue, + enum CellularReturnType { + CellularReturnType_CellValue = 0, CellularReturnType_Distance, CellularReturnType_Distance2, CellularReturnType_Distance2Add, @@ -101,9 +65,8 @@ class FastNoiseLite CellularReturnType_Distance2Div }; - enum DomainWarpType - { - DomainWarpType_OpenSimplex2, + enum DomainWarpType { + DomainWarpType_OpenSimplex2 = 0, DomainWarpType_OpenSimplex2Reduced, DomainWarpType_BasicGrid }; @@ -111,30 +74,27 @@ class FastNoiseLite /// /// Create new FastNoise object with optional seed /// - FastNoiseLite(int seed = 1337) - { + FastNoiseLite(int64_t seed = 1337) { mSeed = seed; - mFrequency = 0.01f; - mNoiseType = NoiseType_OpenSimplex2; - mRotationType3D = RotationType3D_None; + mNoiseType = NoiseType_Simplex; mTransformType3D = TransformType3D_DefaultOpenSimplex2; mFractalType = FractalType_None; mOctaves = 3; - mLacunarity = 2.0f; - mGain = 0.5f; - mWeightedStrength = 0.0f; - mPingPongStrength = 2.0f; + mLacunarity = 2.0; + mGain = 0.5; + mWeightedStrength = 0.0; + mPingPongStrength = 2.0; - mFractalBounding = 1 / 1.75f; + mFractalBounding = 1.0; mCellularDistanceFunction = CellularDistanceFunction_EuclideanSq; mCellularReturnType = CellularReturnType_Distance; - mCellularJitterModifier = 1.0f; + mCellularJitterModifier = 1.0; mDomainWarpType = DomainWarpType_OpenSimplex2; mWarpTransformType3D = TransformType3D_DefaultOpenSimplex2; - mDomainWarpAmp = 1.0f; + mDomainWarpAmp = 1.0; } /// @@ -143,15 +103,7 @@ class FastNoiseLite /// /// Default: 1337 /// - void SetSeed(int seed) { mSeed = seed; } - - /// - /// Sets frequency for all noise types - /// - /// - /// Default: 0.01 - /// - void SetFrequency(float frequency) { mFrequency = frequency; } + void SetSeed(int64_t seed) { mSeed = seed; } /// /// Sets noise algorithm used for GetNoise(...) @@ -159,26 +111,11 @@ class FastNoiseLite /// /// Default: OpenSimplex2 /// - void SetNoiseType(NoiseType noiseType) - { + void SetNoiseType(NoiseType noiseType) { mNoiseType = noiseType; UpdateTransformType3D(); } - /// - /// Sets domain rotation type for 3D Noise and 3D DomainWarp. - /// Can aid in reducing directional artifacts when sampling a 2D plane in 3D - /// - /// - /// Default: None - /// - void SetRotationType3D(RotationType3D rotationType3D) - { - mRotationType3D = rotationType3D; - UpdateTransformType3D(); - UpdateWarpTransformType3D(); - } - /// /// Sets method for combining octaves in all fractal noise types /// @@ -189,13 +126,12 @@ class FastNoiseLite void SetFractalType(FractalType fractalType) { mFractalType = fractalType; } /// - /// Sets octave count for all fractal noise types + /// Sets octave count for all fractal noise types /// /// /// Default: 3 /// - void SetFractalOctaves(int octaves) - { + void SetFractalOctaves(int64_t octaves) { mOctaves = octaves; CalculateFractalBounding(); } @@ -206,7 +142,7 @@ class FastNoiseLite /// /// Default: 2.0 /// - void SetFractalLacunarity(float lacunarity) { mLacunarity = lacunarity; } + void SetFractalLacunarity(double lacunarity) { mLacunarity = lacunarity; } /// /// Sets octave gain for all fractal noise types @@ -214,8 +150,7 @@ class FastNoiseLite /// /// Default: 0.5 /// - void SetFractalGain(float gain) - { + void SetFractalGain(double gain) { mGain = gain; CalculateFractalBounding(); } @@ -227,7 +162,7 @@ class FastNoiseLite /// Default: 0.0 /// Note: Keep between 0...1 to maintain -1...1 output bounding /// - void SetFractalWeightedStrength(float weightedStrength) { mWeightedStrength = weightedStrength; } + void SetFractalWeightedStrength(double weightedStrength) { mWeightedStrength = weightedStrength; } /// /// Sets strength of the fractal ping pong effect @@ -235,8 +170,7 @@ class FastNoiseLite /// /// Default: 2.0 /// - void SetFractalPingPongStrength(float pingPongStrength) { mPingPongStrength = pingPongStrength; } - + void SetFractalPingPongStrength(double pingPongStrength) { mPingPongStrength = pingPongStrength; } /// /// Sets distance function used in cellular noise calculations @@ -244,7 +178,9 @@ class FastNoiseLite /// /// Default: Distance /// - void SetCellularDistanceFunction(CellularDistanceFunction cellularDistanceFunction) { mCellularDistanceFunction = cellularDistanceFunction; } + void SetCellularDistanceFunction(CellularDistanceFunction cellularDistanceFunction) { + mCellularDistanceFunction = cellularDistanceFunction; + } /// /// Sets return type from cellular noise calculations @@ -260,9 +196,8 @@ class FastNoiseLite /// /// Default: 1.0 /// Note: Setting this higher than 1 will cause artifacts - /// - void SetCellularJitter(float cellularJitter) { mCellularJitterModifier = cellularJitter; } - + /// + void SetCellularJitter(double cellularJitter) { mCellularJitterModifier = cellularJitter; } /// /// Sets the warp algorithm when using DomainWarp(...) @@ -270,21 +205,18 @@ class FastNoiseLite /// /// Default: OpenSimplex2 /// - void SetDomainWarpType(DomainWarpType domainWarpType) - { + void SetDomainWarpType(DomainWarpType domainWarpType) { mDomainWarpType = domainWarpType; UpdateWarpTransformType3D(); } - /// /// Sets the maximum warp distance from original position when using DomainWarp(...) /// /// /// Default: 1.0 /// - void SetDomainWarpAmp(float domainWarpAmp) { mDomainWarpAmp = domainWarpAmp; } - + void SetDomainWarpAmp(double domainWarpAmp) { mDomainWarpAmp = domainWarpAmp; } /// /// 2D noise at given position using current settings @@ -293,22 +225,20 @@ class FastNoiseLite /// Noise output bounded between -1...1 /// template - float GetNoise(FNfloat x, FNfloat y) - { + double GetNoise(FNfloat x, FNfloat y) { Arguments_must_be_floating_point_values(); TransformNoiseCoordinate(x, y); - switch (mFractalType) - { - default: - return GenNoiseSingle(mSeed, x, y); - case FractalType_FBm: - return GenFractalFBm(x, y); - case FractalType_Ridged: - return GenFractalRidged(x, y); - case FractalType_PingPong: - return GenFractalPingPong(x, y); + switch (mFractalType) { + default: + return GenNoiseSingle(mSeed, x, y); + case FractalType_FBm: + return GenFractalFBm(x, y); + case FractalType_Ridged: + return GenFractalRidged(x, y); + case FractalType_PingPong: + return GenFractalPingPong(x, y); } } @@ -319,26 +249,23 @@ class FastNoiseLite /// Noise output bounded between -1...1 /// template - float GetNoise(FNfloat x, FNfloat y, FNfloat z) - { + double GetNoise(FNfloat x, FNfloat y, FNfloat z) { Arguments_must_be_floating_point_values(); TransformNoiseCoordinate(x, y, z); - switch (mFractalType) - { - default: - return GenNoiseSingle(mSeed, x, y, z); - case FractalType_FBm: - return GenFractalFBm(x, y, z); - case FractalType_Ridged: - return GenFractalRidged(x, y, z); - case FractalType_PingPong: - return GenFractalPingPong(x, y, z); + switch (mFractalType) { + default: + return GenNoiseSingle(mSeed, x, y, z); + case FractalType_FBm: + return GenFractalFBm(x, y, z); + case FractalType_Ridged: + return GenFractalRidged(x, y, z); + case FractalType_PingPong: + return GenFractalPingPong(x, y, z); } } - /// /// 2D warps the input position using current domain warp settings /// @@ -348,21 +275,19 @@ class FastNoiseLite /// noise = GetNoise(x, y) /// template - void DomainWarp(FNfloat& x, FNfloat& y) - { + void DomainWarp(FNfloat& x, FNfloat& y) { Arguments_must_be_floating_point_values(); - switch (mFractalType) - { - default: - DomainWarpSingle(x, y); - break; - case FractalType_DomainWarpProgressive: - DomainWarpFractalProgressive(x, y); - break; - case FractalType_DomainWarpIndependent: - DomainWarpFractalIndependent(x, y); - break; + switch (mFractalType) { + default: + DomainWarpSingle(x, y); + break; + case FractalType_DomainWarpProgressive: + DomainWarpFractalProgressive(x, y); + break; + case FractalType_DomainWarpIndependent: + DomainWarpFractalIndependent(x, y); + break; } } @@ -375,108 +300,96 @@ class FastNoiseLite /// noise = GetNoise(x, y, z) /// template - void DomainWarp(FNfloat& x, FNfloat& y, FNfloat& z) - { + void DomainWarp(FNfloat& x, FNfloat& y, FNfloat& z) { Arguments_must_be_floating_point_values(); - switch (mFractalType) - { - default: - DomainWarpSingle(x, y, z); - break; - case FractalType_DomainWarpProgressive: - DomainWarpFractalProgressive(x, y, z); - break; - case FractalType_DomainWarpIndependent: - DomainWarpFractalIndependent(x, y, z); - break; + switch (mFractalType) { + default: + DomainWarpSingle(x, y, z); + break; + case FractalType_DomainWarpProgressive: + DomainWarpFractalProgressive(x, y, z); + break; + case FractalType_DomainWarpIndependent: + DomainWarpFractalIndependent(x, y, z); + break; } } -private: + public: template struct Arguments_must_be_floating_point_values; - enum TransformType3D - { - TransformType3D_None, - TransformType3D_ImproveXYPlanes, - TransformType3D_ImproveXZPlanes, - TransformType3D_DefaultOpenSimplex2 - }; + enum TransformType3D { TransformType3D_None, TransformType3D_DefaultOpenSimplex2 }; - int mSeed; - float mFrequency; + int64_t mSeed; NoiseType mNoiseType; - RotationType3D mRotationType3D; TransformType3D mTransformType3D; FractalType mFractalType; - int mOctaves; - float mLacunarity; - float mGain; - float mWeightedStrength; - float mPingPongStrength; + int64_t mOctaves; + double mLacunarity; + double mGain; + double mWeightedStrength; + double mPingPongStrength; - float mFractalBounding; + double mFractalBounding; CellularDistanceFunction mCellularDistanceFunction; CellularReturnType mCellularReturnType; - float mCellularJitterModifier; + double mCellularJitterModifier; DomainWarpType mDomainWarpType; TransformType3D mWarpTransformType3D; - float mDomainWarpAmp; - + double mDomainWarpAmp; template - struct Lookup - { + struct Lookup { static const T Gradients2D[]; static const T Gradients3D[]; static const T RandVecs2D[]; static const T RandVecs3D[]; }; - static float FastMin(float a, float b) { return a < b ? a : b; } + static double FastMin(double a, double b) { return a < b ? a : b; } - static float FastMax(float a, float b) { return a > b ? a : b; } + static double FastMax(double a, double b) { return a > b ? a : b; } - static float FastAbs(float f) { return f < 0 ? -f : f; } + static double FastAbs(double f) { return f < 0 ? -f : f; } - static float FastSqrt(float f) { return sqrtf(f); } + static double FastSqrt(double f) { return sqrtf(f); } template - static int FastFloor(FNfloat f) { return f >= 0 ? (int)f : (int)f - 1; } + static int64_t FastFloor(FNfloat f) { + return f >= 0 ? (int64_t)f : (int64_t)f - 1; + } template - static int FastRound(FNfloat f) { return f >= 0 ? (int)(f + 0.5f) : (int)(f - 0.5f); } + static int64_t FastRound(FNfloat f) { + return f >= 0 ? (int64_t)(f + 0.5) : (int64_t)(f - 0.5); + } - static float Lerp(float a, float b, float t) { return a + t * (b - a); } + static double Lerp(double a, double b, double t) { return a + t * (b - a); } - static float InterpHermite(float t) { return t * t * (3 - 2 * t); } + static double InterpHermite(double t) { return t * t * (3 - 2 * t); } - static float InterpQuintic(float t) { return t * t * t * (t * (t * 6 - 15) + 10); } + static double InterpQuintic(double t) { return t * t * t * (t * (t * 6 - 15) + 10); } - static float CubicLerp(float a, float b, float c, float d, float t) - { - float p = (d - c) - (a - b); + static double CubicLerp(double a, double b, double c, double d, double t) { + double p = (d - c) - (a - b); return t * t * t * p + t * t * ((a - b) - p) + t * (c - a) + b; } - static float PingPong(float t) - { - t -= (int)(t * 0.5f) * 2; + static double PingPong(double t) { + t -= (int64_t)(t * 0.5) * 2; return t < 1 ? t : 2 - t; } - void CalculateFractalBounding() - { - float gain = FastAbs(mGain); - float amp = gain; - float ampFractal = 1.0f; - for (int i = 1; i < mOctaves; i++) - { + void CalculateFractalBounding() { + double gain = FastAbs(mGain); + double amp = gain; + double ampFractal = 1.0; + for (int64_t i = 1; i < mOctaves; i++) { ampFractal += amp; amp *= gain; } @@ -484,348 +397,238 @@ class FastNoiseLite } // Hashing - static const int PrimeX = 501125321; - static const int PrimeY = 1136930381; - static const int PrimeZ = 1720413743; + static const int64_t PrimeX = 501125321; + static const int64_t PrimeY = 1136930381; + static const int64_t PrimeZ = 1720413743; - static int Hash(int seed, int xPrimed, int yPrimed) - { - int hash = seed ^ xPrimed ^ yPrimed; + static int64_t Hash(int64_t seed, int64_t xPrimed, int64_t yPrimed) { + int64_t hash = std::hash{}(seed) ^ std::hash{}(xPrimed) ^ std::hash{}(yPrimed); - hash *= 0x27d4eb2d; return hash; } - - static int Hash(int seed, int xPrimed, int yPrimed, int zPrimed) - { - int hash = seed ^ xPrimed ^ yPrimed ^ zPrimed; - - hash *= 0x27d4eb2d; + static int64_t Hash(int64_t seed, int64_t xPrimed, int64_t yPrimed, int64_t zPrimed) { + int64_t hash = std::hash{}(seed) ^ std::hash{}(xPrimed) ^ std::hash{}(yPrimed) ^ + std::hash{}(zPrimed); return hash; } - - static float ValCoord(int seed, int xPrimed, int yPrimed) - { - int hash = Hash(seed, xPrimed, yPrimed); - - hash *= hash; - hash ^= hash << 19; - return hash * (1 / 2147483648.0f); + static double toDouble(int64_t h) { + union { + uint64_t u; + double f; + } x; + x.u = ((uint64_t)h >> 12ull) | 0x3ff0000000000000ull; + return x.f * 2.0 - 3.0; } - - static float ValCoord(int seed, int xPrimed, int yPrimed, int zPrimed) - { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - - hash *= hash; - hash ^= hash << 19; - return hash * (1 / 2147483648.0f); + static double ValCoord(int64_t seed, int64_t xPrimed, int64_t yPrimed) { + return toDouble(std::hash{}(Hash(seed, xPrimed, yPrimed))); } + static double ValCoord(int64_t seed, int64_t xPrimed, int64_t yPrimed, int64_t zPrimed) { + return toDouble(std::hash{}(Hash(seed, xPrimed, yPrimed, zPrimed))); + } - float GradCoord(int seed, int xPrimed, int yPrimed, float xd, float yd) - { - int hash = Hash(seed, xPrimed, yPrimed); + double GradCoord(int64_t seed, int64_t xPrimed, int64_t yPrimed, double xd, double yd) { + int64_t hash = Hash(seed, xPrimed, yPrimed); hash ^= hash >> 15; hash &= 127 << 1; - float xg = Lookup::Gradients2D[hash]; - float yg = Lookup::Gradients2D[hash | 1]; + double xg = Lookup::Gradients2D[hash]; + double yg = Lookup::Gradients2D[hash | 1]; return xd * xg + yd * yg; } - - float GradCoord(int seed, int xPrimed, int yPrimed, int zPrimed, float xd, float yd, float zd) - { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); + double GradCoord(int64_t seed, int64_t xPrimed, int64_t yPrimed, int64_t zPrimed, double xd, double yd, double zd) { + int64_t hash = Hash(seed, xPrimed, yPrimed, zPrimed); hash ^= hash >> 15; hash &= 63 << 2; - float xg = Lookup::Gradients3D[hash]; - float yg = Lookup::Gradients3D[hash | 1]; - float zg = Lookup::Gradients3D[hash | 2]; + double xg = Lookup::Gradients3D[hash]; + double yg = Lookup::Gradients3D[hash | 1]; + double zg = Lookup::Gradients3D[hash | 2]; return xd * xg + yd * yg + zd * zg; } + void GradCoordOut(int64_t seed, int64_t xPrimed, int64_t yPrimed, double& xo, double& yo) { + int64_t hash = Hash(seed, xPrimed, yPrimed) & (255 << 1); - void GradCoordOut(int seed, int xPrimed, int yPrimed, float& xo, float& yo) - { - int hash = Hash(seed, xPrimed, yPrimed) & (255 << 1); - - xo = Lookup::RandVecs2D[hash]; - yo = Lookup::RandVecs2D[hash | 1]; + xo = Lookup::RandVecs2D[hash]; + yo = Lookup::RandVecs2D[hash | 1]; } + void + GradCoordOut(int64_t seed, int64_t xPrimed, int64_t yPrimed, int64_t zPrimed, double& xo, double& yo, double& zo) { + int64_t hash = Hash(seed, xPrimed, yPrimed, zPrimed) & (255 << 2); - void GradCoordOut(int seed, int xPrimed, int yPrimed, int zPrimed, float& xo, float& yo, float& zo) - { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed) & (255 << 2); - - xo = Lookup::RandVecs3D[hash]; - yo = Lookup::RandVecs3D[hash | 1]; - zo = Lookup::RandVecs3D[hash | 2]; + xo = Lookup::RandVecs3D[hash]; + yo = Lookup::RandVecs3D[hash | 1]; + zo = Lookup::RandVecs3D[hash | 2]; } + void GradCoordDual(int64_t seed, int64_t xPrimed, int64_t yPrimed, double xd, double yd, double& xo, double& yo) { + int64_t hash = Hash(seed, xPrimed, yPrimed); + int64_t index1 = hash & (127 << 1); + int64_t index2 = (hash >> 7) & (255 << 1); - void GradCoordDual(int seed, int xPrimed, int yPrimed, float xd, float yd, float& xo, float& yo) - { - int hash = Hash(seed, xPrimed, yPrimed); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - - float xg = Lookup::Gradients2D[index1]; - float yg = Lookup::Gradients2D[index1 | 1]; - float value = xd * xg + yd * yg; + double xg = Lookup::Gradients2D[index1]; + double yg = Lookup::Gradients2D[index1 | 1]; + double value = xd * xg + yd * yg; - float xgo = Lookup::RandVecs2D[index2]; - float ygo = Lookup::RandVecs2D[index2 | 1]; + double xgo = Lookup::RandVecs2D[index2]; + double ygo = Lookup::RandVecs2D[index2 | 1]; xo = value * xgo; yo = value * ygo; } - - void GradCoordDual(int seed, int xPrimed, int yPrimed, int zPrimed, float xd, float yd, float zd, float& xo, float& yo, float& zo) - { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - int index1 = hash & (63 << 2); - int index2 = (hash >> 6) & (255 << 2); - - float xg = Lookup::Gradients3D[index1]; - float yg = Lookup::Gradients3D[index1 | 1]; - float zg = Lookup::Gradients3D[index1 | 2]; - float value = xd * xg + yd * yg + zd * zg; - - float xgo = Lookup::RandVecs3D[index2]; - float ygo = Lookup::RandVecs3D[index2 | 1]; - float zgo = Lookup::RandVecs3D[index2 | 2]; + void GradCoordDual(int64_t seed, + int64_t xPrimed, + int64_t yPrimed, + int64_t zPrimed, + double xd, + double yd, + double zd, + double& xo, + double& yo, + double& zo) { + int64_t hash = Hash(seed, xPrimed, yPrimed, zPrimed); + int64_t index1 = hash & (63 << 2); + int64_t index2 = (hash >> 6) & (255 << 2); + + double xg = Lookup::Gradients3D[index1]; + double yg = Lookup::Gradients3D[index1 | 1]; + double zg = Lookup::Gradients3D[index1 | 2]; + double value = xd * xg + yd * yg + zd * zg; + + double xgo = Lookup::RandVecs3D[index2]; + double ygo = Lookup::RandVecs3D[index2 | 1]; + double zgo = Lookup::RandVecs3D[index2 | 2]; xo = value * xgo; yo = value * ygo; zo = value * zgo; } - // Generic noise gen template - float GenNoiseSingle(int seed, FNfloat x, FNfloat y) - { - switch (mNoiseType) - { - case NoiseType_OpenSimplex2: - return SingleSimplex(seed, x, y); - case NoiseType_OpenSimplex2S: - return SingleOpenSimplex2S(seed, x, y); - case NoiseType_Cellular: - return SingleCellular(seed, x, y); - case NoiseType_Perlin: - return SinglePerlin(seed, x, y); - case NoiseType_ValueCubic: - return SingleValueCubic(seed, x, y); - case NoiseType_Value: - return SingleValue(seed, x, y); - default: - return 0; + double GenNoiseSingle(int64_t seed, FNfloat x, FNfloat y) { + switch (mNoiseType) { + case NoiseType_Simplex: + return SingleSimplex(seed, x, y); + case NoiseType_Cellular: + return SingleCellular(seed, x, y); + case NoiseType_Perlin: + return SinglePerlin(seed, x, y); + case NoiseType_ValueCubic: + return SingleValueCubic(seed, x, y); + case NoiseType_Value: + return SingleValue(seed, x, y); + default: + return 0; } } template - float GenNoiseSingle(int seed, FNfloat x, FNfloat y, FNfloat z) - { - switch (mNoiseType) - { - case NoiseType_OpenSimplex2: - return SingleOpenSimplex2(seed, x, y, z); - case NoiseType_OpenSimplex2S: - return SingleOpenSimplex2S(seed, x, y, z); - case NoiseType_Cellular: - return SingleCellular(seed, x, y, z); - case NoiseType_Perlin: - return SinglePerlin(seed, x, y, z); - case NoiseType_ValueCubic: - return SingleValueCubic(seed, x, y, z); - case NoiseType_Value: - return SingleValue(seed, x, y, z); - default: - return 0; + double GenNoiseSingle(int64_t seed, FNfloat x, FNfloat y, FNfloat z) { + switch (mNoiseType) { + case NoiseType_Simplex: + return SingleSimplex(seed, x, y, z); + case NoiseType_Cellular: + return SingleCellular(seed, x, y, z); + case NoiseType_Perlin: + return SinglePerlin(seed, x, y, z); + case NoiseType_ValueCubic: + return SingleValueCubic(seed, x, y, z); + case NoiseType_Value: + return SingleValue(seed, x, y, z); + default: + return 0; } } - // Noise Coordinate Transforms (frequency, and possible skew or rotation) template - void TransformNoiseCoordinate(FNfloat& x, FNfloat& y) - { - x *= mFrequency; - y *= mFrequency; - - switch (mNoiseType) - { - case NoiseType_OpenSimplex2: - case NoiseType_OpenSimplex2S: - { + void TransformNoiseCoordinate(FNfloat& x, FNfloat& y) { + switch (mNoiseType) { + case NoiseType_Simplex: { const FNfloat SQRT3 = (FNfloat)1.7320508075688772935274463415059; - const FNfloat F2 = 0.5f * (SQRT3 - 1); + const FNfloat F2 = 0.5 * (SQRT3 - 1); FNfloat t = (x + y) * F2; x += t; y += t; - } - break; - default: - break; + } break; + default: + break; } } template - void TransformNoiseCoordinate(FNfloat& x, FNfloat& y, FNfloat& z) - { - x *= mFrequency; - y *= mFrequency; - z *= mFrequency; - - switch (mTransformType3D) - { - case TransformType3D_ImproveXYPlanes: - { - FNfloat xy = x + y; - FNfloat s2 = xy * -(FNfloat)0.211324865405187; - z *= (FNfloat)0.577350269189626; - x += s2 - z; - y = y + s2 - z; - z += xy * (FNfloat)0.577350269189626; - } - break; - case TransformType3D_ImproveXZPlanes: - { - FNfloat xz = x + z; - FNfloat s2 = xz * -(FNfloat)0.211324865405187; - y *= (FNfloat)0.577350269189626; - x += s2 - y; - z += s2 - y; - y += xz * (FNfloat)0.577350269189626; - } - break; - case TransformType3D_DefaultOpenSimplex2: - { + void TransformNoiseCoordinate(FNfloat& x, FNfloat& y, FNfloat& z) { + switch (mTransformType3D) { + case TransformType3D_DefaultOpenSimplex2: { const FNfloat R3 = (FNfloat)(2.0 / 3.0); - FNfloat r = (x + y + z) * R3; // Rotation, not skew + FNfloat r = (x + y + z) * R3; // Rotation, not skew x = r - x; y = r - y; z = r - z; - } - break; - default: - break; + } break; + default: + break; } } - void UpdateTransformType3D() - { - switch (mRotationType3D) - { - case RotationType3D_ImproveXYPlanes: - mTransformType3D = TransformType3D_ImproveXYPlanes; - break; - case RotationType3D_ImproveXZPlanes: - mTransformType3D = TransformType3D_ImproveXZPlanes; - break; - default: - switch (mNoiseType) - { - case NoiseType_OpenSimplex2: - case NoiseType_OpenSimplex2S: + void UpdateTransformType3D() { + switch (mNoiseType) { + case NoiseType_Simplex: mTransformType3D = TransformType3D_DefaultOpenSimplex2; break; default: mTransformType3D = TransformType3D_None; break; - } - break; } } - // Domain Warp Coordinate Transforms template - void TransformDomainWarpCoordinate(FNfloat& x, FNfloat& y) - { - switch (mDomainWarpType) - { - case DomainWarpType_OpenSimplex2: - case DomainWarpType_OpenSimplex2Reduced: - { + void TransformDomainWarpCoordinate(FNfloat& x, FNfloat& y) { + switch (mDomainWarpType) { + case DomainWarpType_OpenSimplex2: + case DomainWarpType_OpenSimplex2Reduced: { const FNfloat SQRT3 = (FNfloat)1.7320508075688772935274463415059; - const FNfloat F2 = 0.5f * (SQRT3 - 1); + const FNfloat F2 = 0.5 * (SQRT3 - 1); FNfloat t = (x + y) * F2; x += t; y += t; - } - break; - default: - break; + } break; + default: + break; } } template - void TransformDomainWarpCoordinate(FNfloat& x, FNfloat& y, FNfloat& z) - { - switch (mWarpTransformType3D) - { - case TransformType3D_ImproveXYPlanes: - { - FNfloat xy = x + y; - FNfloat s2 = xy * -(FNfloat)0.211324865405187; - z *= (FNfloat)0.577350269189626; - x += s2 - z; - y = y + s2 - z; - z += xy * (FNfloat)0.577350269189626; - } - break; - case TransformType3D_ImproveXZPlanes: - { - FNfloat xz = x + z; - FNfloat s2 = xz * -(FNfloat)0.211324865405187; - y *= (FNfloat)0.577350269189626; - x += s2 - y; - z += s2 - y; - y += xz * (FNfloat)0.577350269189626; - } - break; - case TransformType3D_DefaultOpenSimplex2: - { + void TransformDomainWarpCoordinate(FNfloat& x, FNfloat& y, FNfloat& z) { + switch (mWarpTransformType3D) { + case TransformType3D_DefaultOpenSimplex2: { const FNfloat R3 = (FNfloat)(2.0 / 3.0); - FNfloat r = (x + y + z) * R3; // Rotation, not skew + FNfloat r = (x + y + z) * R3; // Rotation, not skew x = r - x; y = r - y; z = r - z; - } - break; - default: - break; + } break; + default: + break; } } - void UpdateWarpTransformType3D() - { - switch (mRotationType3D) - { - case RotationType3D_ImproveXYPlanes: - mWarpTransformType3D = TransformType3D_ImproveXYPlanes; - break; - case RotationType3D_ImproveXZPlanes: - mWarpTransformType3D = TransformType3D_ImproveXZPlanes; - break; - default: - switch (mDomainWarpType) - { + void UpdateWarpTransformType3D() { + switch (mDomainWarpType) { case DomainWarpType_OpenSimplex2: case DomainWarpType_OpenSimplex2Reduced: mWarpTransformType3D = TransformType3D_DefaultOpenSimplex2; @@ -833,26 +636,21 @@ class FastNoiseLite default: mWarpTransformType3D = TransformType3D_None; break; - } - break; } } - // Fractal FBm template - float GenFractalFBm(FNfloat x, FNfloat y) - { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) - { - float noise = GenNoiseSingle(seed++, x, y); + double GenFractalFBm(FNfloat x, FNfloat y) { + int64_t seed = mSeed; + double sum = 0; + double amp = mFractalBounding; + + for (int64_t i = 0; i < mOctaves; i++) { + double noise = GenNoiseSingle(seed++, x, y); sum += noise * amp; - amp *= Lerp(1.0f, FastMin(noise + 1, 2) * 0.5f, mWeightedStrength); + amp *= Lerp(1.0, FastMin(noise + 1, 2) * 0.5, mWeightedStrength); x *= mLacunarity; y *= mLacunarity; @@ -863,17 +661,15 @@ class FastNoiseLite } template - float GenFractalFBm(FNfloat x, FNfloat y, FNfloat z) - { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) - { - float noise = GenNoiseSingle(seed++, x, y, z); + double GenFractalFBm(FNfloat x, FNfloat y, FNfloat z) { + int64_t seed = mSeed; + double sum = 0; + double amp = mFractalBounding; + + for (int64_t i = 0; i < mOctaves; i++) { + double noise = GenNoiseSingle(seed++, x, y, z); sum += noise * amp; - amp *= Lerp(1.0f, (noise + 1) * 0.5f, mWeightedStrength); + amp *= Lerp(1.0, (noise + 1) * 0.5, mWeightedStrength); x *= mLacunarity; y *= mLacunarity; @@ -884,21 +680,18 @@ class FastNoiseLite return sum; } - // Fractal Ridged template - float GenFractalRidged(FNfloat x, FNfloat y) - { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) - { - float noise = FastAbs(GenNoiseSingle(seed++, x, y)); + double GenFractalRidged(FNfloat x, FNfloat y) { + int64_t seed = mSeed; + double sum = 0; + double amp = mFractalBounding; + + for (int64_t i = 0; i < mOctaves; i++) { + double noise = FastAbs(GenNoiseSingle(seed++, x, y)); sum += (noise * -2 + 1) * amp; - amp *= Lerp(1.0f, 1 - noise, mWeightedStrength); + amp *= Lerp(1.0, 1 - noise, mWeightedStrength); x *= mLacunarity; y *= mLacunarity; @@ -909,17 +702,15 @@ class FastNoiseLite } template - float GenFractalRidged(FNfloat x, FNfloat y, FNfloat z) - { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) - { - float noise = FastAbs(GenNoiseSingle(seed++, x, y, z)); + double GenFractalRidged(FNfloat x, FNfloat y, FNfloat z) { + int64_t seed = mSeed; + double sum = 0; + double amp = mFractalBounding; + + for (int64_t i = 0; i < mOctaves; i++) { + double noise = FastAbs(GenNoiseSingle(seed++, x, y, z)); sum += (noise * -2 + 1) * amp; - amp *= Lerp(1.0f, 1 - noise, mWeightedStrength); + amp *= Lerp(1.0, 1 - noise, mWeightedStrength); x *= mLacunarity; y *= mLacunarity; @@ -930,21 +721,18 @@ class FastNoiseLite return sum; } - - // Fractal PingPong + // Fractal PingPong template - float GenFractalPingPong(FNfloat x, FNfloat y) - { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) - { - float noise = PingPong((GenNoiseSingle(seed++, x, y) + 1) * mPingPongStrength); - sum += (noise - 0.5f) * 2 * amp; - amp *= Lerp(1.0f, noise, mWeightedStrength); + double GenFractalPingPong(FNfloat x, FNfloat y) { + int64_t seed = mSeed; + double sum = 0; + double amp = mFractalBounding; + + for (int64_t i = 0; i < mOctaves; i++) { + double noise = PingPong((GenNoiseSingle(seed++, x, y) + 1) * mPingPongStrength); + sum += (noise - 0.5) * 2 * amp; + amp *= Lerp(1.0, noise, mWeightedStrength); x *= mLacunarity; y *= mLacunarity; @@ -955,17 +743,15 @@ class FastNoiseLite } template - float GenFractalPingPong(FNfloat x, FNfloat y, FNfloat z) - { - int seed = mSeed; - float sum = 0; - float amp = mFractalBounding; - - for (int i = 0; i < mOctaves; i++) - { - float noise = PingPong((GenNoiseSingle(seed++, x, y, z) + 1) * mPingPongStrength); - sum += (noise - 0.5f) * 2 * amp; - amp *= Lerp(1.0f, noise, mWeightedStrength); + double GenFractalPingPong(FNfloat x, FNfloat y, FNfloat z) { + int64_t seed = mSeed; + double sum = 0; + double amp = mFractalBounding; + + for (int64_t i = 0; i < mOctaves; i++) { + double noise = PingPong((GenNoiseSingle(seed++, x, y, z) + 1) * mPingPongStrength); + sum += (noise - 0.5) * 2 * amp; + amp *= Lerp(1.0, noise, mWeightedStrength); x *= mLacunarity; y *= mLacunarity; @@ -976,1042 +762,802 @@ class FastNoiseLite return sum; } - - // Simplex/OpenSimplex2 Noise - - template - float SingleSimplex(int seed, FNfloat x, FNfloat y) - { - // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex. - - const float SQRT3 = 1.7320508075688772935274463415059f; - const float G2 = (3 - SQRT3) / 6; - - /* - * --- Skew moved to TransformNoiseCoordinate method --- - * const FNfloat F2 = 0.5f * (SQRT3 - 1); - * FNfloat s = (x + y) * F2; - * x += s; y += s; - */ - - int i = FastFloor(x); - int j = FastFloor(y); - float xi = (float)(x - i); - float yi = (float)(y - j); - - float t = (xi + yi) * G2; - float x0 = (float)(xi - t); - float y0 = (float)(yi - t); - - i *= PrimeX; - j *= PrimeY; - - float n0, n1, n2; - - float a = 0.5f - x0 * x0 - y0 * y0; - if (a <= 0) n0 = 0; - else - { - n0 = (a * a) * (a * a) * GradCoord(seed, i, j, x0, y0); - } - - float c = (float)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); - if (c <= 0) n2 = 0; - else - { - float x2 = x0 + (2 * (float)G2 - 1); - float y2 = y0 + (2 * (float)G2 - 1); - n2 = (c * c) * (c * c) * GradCoord(seed, i + PrimeX, j + PrimeY, x2, y2); - } - - if (y0 > x0) - { - float x1 = x0 + (float)G2; - float y1 = y0 + ((float)G2 - 1); - float b = 0.5f - x1 * x1 - y1 * y1; - if (b <= 0) n1 = 0; - else - { - n1 = (b * b) * (b * b) * GradCoord(seed, i, j + PrimeY, x1, y1); - } - } - else - { - float x1 = x0 + ((float)G2 - 1); - float y1 = y0 + (float)G2; - float b = 0.5f - x1 * x1 - y1 * y1; - if (b <= 0) n1 = 0; - else - { - n1 = (b * b) * (b * b) * GradCoord(seed, i + PrimeX, j, x1, y1); - } - } - - return (n0 + n1 + n2) * 99.83685446303647f; - } - - template - float SingleOpenSimplex2(int seed, FNfloat x, FNfloat y, FNfloat z) - { - // 3D OpenSimplex2 case uses two offset rotated cube grids. - - /* - * --- Rotation moved to TransformNoiseCoordinate method --- - * const FNfloat R3 = (FNfloat)(2.0 / 3.0); - * FNfloat r = (x + y + z) * R3; // Rotation, not skew - * x = r - x; y = r - y; z = r - z; - */ - - int i = FastRound(x); - int j = FastRound(y); - int k = FastRound(z); - float x0 = (float)(x - i); - float y0 = (float)(y - j); - float z0 = (float)(z - k); - - int xNSign = (int)(-1.0f - x0) | 1; - int yNSign = (int)(-1.0f - y0) | 1; - int zNSign = (int)(-1.0f - z0) | 1; - - float ax0 = xNSign * -x0; - float ay0 = yNSign * -y0; - float az0 = zNSign * -z0; - - i *= PrimeX; - j *= PrimeY; - k *= PrimeZ; - - float value = 0; - float a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0); - - for (int l = 0; ; l++) - { - if (a > 0) - { - value += (a * a) * (a * a) * GradCoord(seed, i, j, k, x0, y0, z0); - } - - float b = a + 1; - int i1 = i; - int j1 = j; - int k1 = k; - float x1 = x0; - float y1 = y0; - float z1 = z0; - - if (ax0 >= ay0 && ax0 >= az0) - { - x1 += xNSign; - b -= xNSign * 2 * x1; - i1 -= xNSign * PrimeX; - } - else if (ay0 > ax0 && ay0 >= az0) - { - y1 += yNSign; - b -= yNSign * 2 * y1; - j1 -= yNSign * PrimeY; - } - else - { - z1 += zNSign; - b -= zNSign * 2 * z1; - k1 -= zNSign * PrimeZ; - } - - if (b > 0) - { - value += (b * b) * (b * b) * GradCoord(seed, i1, j1, k1, x1, y1, z1); - } - - if (l == 1) break; - - ax0 = 0.5f - ax0; - ay0 = 0.5f - ay0; - az0 = 0.5f - az0; - - x0 = xNSign * ax0; - y0 = yNSign * ay0; - z0 = zNSign * az0; - - a += (0.75f - ax0) - (ay0 + az0); - - i += (xNSign >> 1) & PrimeX; - j += (yNSign >> 1) & PrimeY; - k += (zNSign >> 1) & PrimeZ; - - xNSign = -xNSign; - yNSign = -yNSign; - zNSign = -zNSign; - - seed = ~seed; - } - - return value * 32.69428253173828125f; - } - - - // OpenSimplex2S Noise + // Simplex Noise template - float SingleOpenSimplex2S(int seed, FNfloat x, FNfloat y) - { - // 2D OpenSimplex2S case is a modified 2D simplex noise. + double SingleSimplex(int64_t seed, FNfloat x, FNfloat y) { + // 2D Simplex case is a modified 2D simplex noise. const FNfloat SQRT3 = (FNfloat)1.7320508075688772935274463415059; const FNfloat G2 = (3 - SQRT3) / 6; /* * --- Skew moved to TransformNoiseCoordinate method --- - * const FNfloat F2 = 0.5f * (SQRT3 - 1); + * const FNfloat F2 = 0.5 * (SQRT3 - 1); * FNfloat s = (x + y) * F2; * x += s; y += s; - */ + */ - int i = FastFloor(x); - int j = FastFloor(y); - float xi = (float)(x - i); - float yi = (float)(y - j); + int64_t i = FastFloor(x); + int64_t j = FastFloor(y); + double xi = (double)(x - i); + double yi = (double)(y - j); i *= PrimeX; j *= PrimeY; - int i1 = i + PrimeX; - int j1 = j + PrimeY; + int64_t i1 = i + PrimeX; + int64_t j1 = j + PrimeY; - float t = (xi + yi) * (float)G2; - float x0 = xi - t; - float y0 = yi - t; + double t = (xi + yi) * (double)G2; + double x0 = xi - t; + double y0 = yi - t; - float a0 = (2.0f / 3.0f) - x0 * x0 - y0 * y0; - float value = (a0 * a0) * (a0 * a0) * GradCoord(seed, i, j, x0, y0); + double a0 = (2.0 / 3.0) - x0 * x0 - y0 * y0; + double value = (a0 * a0) * (a0 * a0) * GradCoord(seed, i, j, x0, y0); - float a1 = (float)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a0); - float x1 = x0 - (float)(1 - 2 * G2); - float y1 = y0 - (float)(1 - 2 * G2); + double a1 = (double)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((double)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a0); + double x1 = x0 - (double)(1 - 2 * G2); + double y1 = y0 - (double)(1 - 2 * G2); value += (a1 * a1) * (a1 * a1) * GradCoord(seed, i1, j1, x1, y1); // Nested conditionals were faster than compact bit logic/arithmetic. - float xmyi = xi - yi; - if (t > G2) - { - if (xi + xmyi > 1) - { - float x2 = x0 + (float)(3 * G2 - 2); - float y2 = y0 + (float)(3 * G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) - { + double xmyi = xi - yi; + if (t > G2) { + if (xi + xmyi > 1) { + double x2 = x0 + (double)(3 * G2 - 2); + double y2 = y0 + (double)(3 * G2 - 1); + double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; + if (a2 > 0) { value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i + (PrimeX << 1), j + PrimeY, x2, y2); } - } - else - { - float x2 = x0 + (float)G2; - float y2 = y0 + (float)(G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) - { + } else { + double x2 = x0 + (double)G2; + double y2 = y0 + (double)(G2 - 1); + double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; + if (a2 > 0) { value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i, j + PrimeY, x2, y2); } } - if (yi - xmyi > 1) - { - float x3 = x0 + (float)(3 * G2 - 1); - float y3 = y0 + (float)(3 * G2 - 2); - float a3 = (2.0f / 3.0f) - x3 * x3 - y3 * y3; - if (a3 > 0) - { + if (yi - xmyi > 1) { + double x3 = x0 + (double)(3 * G2 - 1); + double y3 = y0 + (double)(3 * G2 - 2); + double a3 = (2.0 / 3.0) - x3 * x3 - y3 * y3; + if (a3 > 0) { value += (a3 * a3) * (a3 * a3) * GradCoord(seed, i + PrimeX, j + (PrimeY << 1), x3, y3); } - } - else - { - float x3 = x0 + (float)(G2 - 1); - float y3 = y0 + (float)G2; - float a3 = (2.0f / 3.0f) - x3 * x3 - y3 * y3; - if (a3 > 0) - { + } else { + double x3 = x0 + (double)(G2 - 1); + double y3 = y0 + (double)G2; + double a3 = (2.0 / 3.0) - x3 * x3 - y3 * y3; + if (a3 > 0) { value += (a3 * a3) * (a3 * a3) * GradCoord(seed, i + PrimeX, j, x3, y3); } } - } - else - { - if (xi + xmyi < 0) - { - float x2 = x0 + (float)(1 - G2); - float y2 = y0 - (float)G2; - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) - { + } else { + if (xi + xmyi < 0) { + double x2 = x0 + (double)(1 - G2); + double y2 = y0 - (double)G2; + double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; + if (a2 > 0) { value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i - PrimeX, j, x2, y2); } - } - else - { - float x2 = x0 + (float)(G2 - 1); - float y2 = y0 + (float)G2; - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) - { + } else { + double x2 = x0 + (double)(G2 - 1); + double y2 = y0 + (double)G2; + double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; + if (a2 > 0) { value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i + PrimeX, j, x2, y2); } } - if (yi < xmyi) - { - float x2 = x0 - (float)G2; - float y2 = y0 - (float)(G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) - { + if (yi < xmyi) { + double x2 = x0 - (double)G2; + double y2 = y0 - (double)(G2 - 1); + double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; + if (a2 > 0) { value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i, j - PrimeY, x2, y2); } - } - else - { - float x2 = x0 + (float)G2; - float y2 = y0 + (float)(G2 - 1); - float a2 = (2.0f / 3.0f) - x2 * x2 - y2 * y2; - if (a2 > 0) - { + } else { + double x2 = x0 + (double)G2; + double y2 = y0 + (double)(G2 - 1); + double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; + if (a2 > 0) { value += (a2 * a2) * (a2 * a2) * GradCoord(seed, i, j + PrimeY, x2, y2); } } } - return value * 18.24196194486065f; + return value * 18.24196194486065; } template - float SingleOpenSimplex2S(int seed, FNfloat x, FNfloat y, FNfloat z) - { - // 3D OpenSimplex2S case uses two offset rotated cube grids. + double SingleSimplex(int64_t seed, FNfloat x, FNfloat y, FNfloat z) { + // 3D Simplex case uses two offset rotated cube grids. /* * --- Rotation moved to TransformNoiseCoordinate method --- * const FNfloat R3 = (FNfloat)(2.0 / 3.0); * FNfloat r = (x + y + z) * R3; // Rotation, not skew * x = r - x; y = r - y; z = r - z; - */ + */ - int i = FastFloor(x); - int j = FastFloor(y); - int k = FastFloor(z); - float xi = (float)(x - i); - float yi = (float)(y - j); - float zi = (float)(z - k); + int64_t i = FastFloor(x); + int64_t j = FastFloor(y); + int64_t k = FastFloor(z); + double xi = (double)(x - i); + double yi = (double)(y - j); + double zi = (double)(z - k); i *= PrimeX; j *= PrimeY; k *= PrimeZ; - int seed2 = seed + 1293373; - - int xNMask = (int)(-0.5f - xi); - int yNMask = (int)(-0.5f - yi); - int zNMask = (int)(-0.5f - zi); - - float x0 = xi + xNMask; - float y0 = yi + yNMask; - float z0 = zi + zNMask; - float a0 = 0.75f - x0 * x0 - y0 * y0 - z0 * z0; - float value = (a0 * a0) * (a0 * a0) * GradCoord(seed, - i + (xNMask & PrimeX), j + (yNMask & PrimeY), k + (zNMask & PrimeZ), x0, y0, z0); - - float x1 = xi - 0.5f; - float y1 = yi - 0.5f; - float z1 = zi - 0.5f; - float a1 = 0.75f - x1 * x1 - y1 * y1 - z1 * z1; - value += (a1 * a1) * (a1 * a1) * GradCoord(seed2, - i + PrimeX, j + PrimeY, k + PrimeZ, x1, y1, z1); - - float xAFlipMask0 = ((xNMask | 1) << 1) * x1; - float yAFlipMask0 = ((yNMask | 1) << 1) * y1; - float zAFlipMask0 = ((zNMask | 1) << 1) * z1; - float xAFlipMask1 = (-2 - (xNMask << 2)) * x1 - 1.0f; - float yAFlipMask1 = (-2 - (yNMask << 2)) * y1 - 1.0f; - float zAFlipMask1 = (-2 - (zNMask << 2)) * z1 - 1.0f; + int64_t seed2 = seed + 1293373; + + int64_t xNMask = (int64_t)(-0.5 - xi); + int64_t yNMask = (int64_t)(-0.5 - yi); + int64_t zNMask = (int64_t)(-0.5 - zi); + + double x0 = xi + xNMask; + double y0 = yi + yNMask; + double z0 = zi + zNMask; + double a0 = 0.75 - x0 * x0 - y0 * y0 - z0 * z0; + double value = (a0 * a0) * (a0 * a0) * + GradCoord(seed, i + (xNMask & PrimeX), j + (yNMask & PrimeY), k + (zNMask & PrimeZ), x0, y0, z0); + + double x1 = xi - 0.5; + double y1 = yi - 0.5; + double z1 = zi - 0.5; + double a1 = 0.75 - x1 * x1 - y1 * y1 - z1 * z1; + value += (a1 * a1) * (a1 * a1) * GradCoord(seed2, i + PrimeX, j + PrimeY, k + PrimeZ, x1, y1, z1); + + double xAFlipMask0 = ((xNMask | 1) << 1) * x1; + double yAFlipMask0 = ((yNMask | 1) << 1) * y1; + double zAFlipMask0 = ((zNMask | 1) << 1) * z1; + double xAFlipMask1 = (-2 - (xNMask << 2)) * x1 - 1.0; + double yAFlipMask1 = (-2 - (yNMask << 2)) * y1 - 1.0; + double zAFlipMask1 = (-2 - (zNMask << 2)) * z1 - 1.0; bool skip5 = false; - float a2 = xAFlipMask0 + a0; - if (a2 > 0) - { - float x2 = x0 - (xNMask | 1); - float y2 = y0; - float z2 = z0; - value += (a2 * a2) * (a2 * a2) * GradCoord(seed, - i + (~xNMask & PrimeX), j + (yNMask & PrimeY), k + (zNMask & PrimeZ), x2, y2, z2); - } - else - { - float a3 = yAFlipMask0 + zAFlipMask0 + a0; - if (a3 > 0) - { - float x3 = x0; - float y3 = y0 - (yNMask | 1); - float z3 = z0 - (zNMask | 1); - value += (a3 * a3) * (a3 * a3) * GradCoord(seed, - i + (xNMask & PrimeX), j + (~yNMask & PrimeY), k + (~zNMask & PrimeZ), x3, y3, z3); + double a2 = xAFlipMask0 + a0; + if (a2 > 0) { + double x2 = x0 - (xNMask | 1); + double y2 = y0; + double z2 = z0; + value += (a2 * a2) * (a2 * a2) * + GradCoord(seed, i + (~xNMask & PrimeX), j + (yNMask & PrimeY), k + (zNMask & PrimeZ), x2, y2, z2); + } else { + double a3 = yAFlipMask0 + zAFlipMask0 + a0; + if (a3 > 0) { + double x3 = x0; + double y3 = y0 - (yNMask | 1); + double z3 = z0 - (zNMask | 1); + value += + (a3 * a3) * (a3 * a3) * + GradCoord(seed, i + (xNMask & PrimeX), j + (~yNMask & PrimeY), k + (~zNMask & PrimeZ), x3, y3, z3); } - float a4 = xAFlipMask1 + a1; - if (a4 > 0) - { - float x4 = (xNMask | 1) + x1; - float y4 = y1; - float z4 = z1; - value += (a4 * a4) * (a4 * a4) * GradCoord(seed2, - i + (xNMask & (PrimeX * 2)), j + PrimeY, k + PrimeZ, x4, y4, z4); + double a4 = xAFlipMask1 + a1; + if (a4 > 0) { + double x4 = (xNMask | 1) + x1; + double y4 = y1; + double z4 = z1; + value += (a4 * a4) * (a4 * a4) * + GradCoord(seed2, i + (xNMask & (PrimeX * 2)), j + PrimeY, k + PrimeZ, x4, y4, z4); skip5 = true; } } bool skip9 = false; - float a6 = yAFlipMask0 + a0; - if (a6 > 0) - { - float x6 = x0; - float y6 = y0 - (yNMask | 1); - float z6 = z0; - value += (a6 * a6) * (a6 * a6) * GradCoord(seed, - i + (xNMask & PrimeX), j + (~yNMask & PrimeY), k + (zNMask & PrimeZ), x6, y6, z6); - } - else - { - float a7 = xAFlipMask0 + zAFlipMask0 + a0; - if (a7 > 0) - { - float x7 = x0 - (xNMask | 1); - float y7 = y0; - float z7 = z0 - (zNMask | 1); - value += (a7 * a7) * (a7 * a7) * GradCoord(seed, - i + (~xNMask & PrimeX), j + (yNMask & PrimeY), k + (~zNMask & PrimeZ), x7, y7, z7); + double a6 = yAFlipMask0 + a0; + if (a6 > 0) { + double x6 = x0; + double y6 = y0 - (yNMask | 1); + double z6 = z0; + value += (a6 * a6) * (a6 * a6) * + GradCoord(seed, i + (xNMask & PrimeX), j + (~yNMask & PrimeY), k + (zNMask & PrimeZ), x6, y6, z6); + } else { + double a7 = xAFlipMask0 + zAFlipMask0 + a0; + if (a7 > 0) { + double x7 = x0 - (xNMask | 1); + double y7 = y0; + double z7 = z0 - (zNMask | 1); + value += + (a7 * a7) * (a7 * a7) * + GradCoord(seed, i + (~xNMask & PrimeX), j + (yNMask & PrimeY), k + (~zNMask & PrimeZ), x7, y7, z7); } - float a8 = yAFlipMask1 + a1; - if (a8 > 0) - { - float x8 = x1; - float y8 = (yNMask | 1) + y1; - float z8 = z1; - value += (a8 * a8) * (a8 * a8) * GradCoord(seed2, - i + PrimeX, j + (yNMask & (PrimeY << 1)), k + PrimeZ, x8, y8, z8); + double a8 = yAFlipMask1 + a1; + if (a8 > 0) { + double x8 = x1; + double y8 = (yNMask | 1) + y1; + double z8 = z1; + value += (a8 * a8) * (a8 * a8) * + GradCoord(seed2, i + PrimeX, j + (yNMask & (PrimeY << 1)), k + PrimeZ, x8, y8, z8); skip9 = true; } } bool skipD = false; - float aA = zAFlipMask0 + a0; - if (aA > 0) - { - float xA = x0; - float yA = y0; - float zA = z0 - (zNMask | 1); - value += (aA * aA) * (aA * aA) * GradCoord(seed, - i + (xNMask & PrimeX), j + (yNMask & PrimeY), k + (~zNMask & PrimeZ), xA, yA, zA); - } - else - { - float aB = xAFlipMask0 + yAFlipMask0 + a0; - if (aB > 0) - { - float xB = x0 - (xNMask | 1); - float yB = y0 - (yNMask | 1); - float zB = z0; - value += (aB * aB) * (aB * aB) * GradCoord(seed, - i + (~xNMask & PrimeX), j + (~yNMask & PrimeY), k + (zNMask & PrimeZ), xB, yB, zB); + double aA = zAFlipMask0 + a0; + if (aA > 0) { + double xA = x0; + double yA = y0; + double zA = z0 - (zNMask | 1); + value += (aA * aA) * (aA * aA) * + GradCoord(seed, i + (xNMask & PrimeX), j + (yNMask & PrimeY), k + (~zNMask & PrimeZ), xA, yA, zA); + } else { + double aB = xAFlipMask0 + yAFlipMask0 + a0; + if (aB > 0) { + double xB = x0 - (xNMask | 1); + double yB = y0 - (yNMask | 1); + double zB = z0; + value += + (aB * aB) * (aB * aB) * + GradCoord(seed, i + (~xNMask & PrimeX), j + (~yNMask & PrimeY), k + (zNMask & PrimeZ), xB, yB, zB); } - float aC = zAFlipMask1 + a1; - if (aC > 0) - { - float xC = x1; - float yC = y1; - float zC = (zNMask | 1) + z1; - value += (aC * aC) * (aC * aC) * GradCoord(seed2, - i + PrimeX, j + PrimeY, k + (zNMask & (PrimeZ << 1)), xC, yC, zC); + double aC = zAFlipMask1 + a1; + if (aC > 0) { + double xC = x1; + double yC = y1; + double zC = (zNMask | 1) + z1; + value += (aC * aC) * (aC * aC) * + GradCoord(seed2, i + PrimeX, j + PrimeY, k + (zNMask & (PrimeZ << 1)), xC, yC, zC); skipD = true; } } - if (!skip5) - { - float a5 = yAFlipMask1 + zAFlipMask1 + a1; - if (a5 > 0) - { - float x5 = x1; - float y5 = (yNMask | 1) + y1; - float z5 = (zNMask | 1) + z1; - value += (a5 * a5) * (a5 * a5) * GradCoord(seed2, - i + PrimeX, j + (yNMask & (PrimeY << 1)), k + (zNMask & (PrimeZ << 1)), x5, y5, z5); + if (!skip5) { + double a5 = yAFlipMask1 + zAFlipMask1 + a1; + if (a5 > 0) { + double x5 = x1; + double y5 = (yNMask | 1) + y1; + double z5 = (zNMask | 1) + z1; + value += (a5 * a5) * (a5 * a5) * + GradCoord(seed2, i + PrimeX, j + (yNMask & (PrimeY << 1)), k + (zNMask & (PrimeZ << 1)), x5, + y5, z5); } } - if (!skip9) - { - float a9 = xAFlipMask1 + zAFlipMask1 + a1; - if (a9 > 0) - { - float x9 = (xNMask | 1) + x1; - float y9 = y1; - float z9 = (zNMask | 1) + z1; - value += (a9 * a9) * (a9 * a9) * GradCoord(seed2, - i + (xNMask & (PrimeX * 2)), j + PrimeY, k + (zNMask & (PrimeZ << 1)), x9, y9, z9); + if (!skip9) { + double a9 = xAFlipMask1 + zAFlipMask1 + a1; + if (a9 > 0) { + double x9 = (xNMask | 1) + x1; + double y9 = y1; + double z9 = (zNMask | 1) + z1; + value += + (a9 * a9) * (a9 * a9) * + GradCoord(seed2, i + (xNMask & (PrimeX * 2)), j + PrimeY, k + (zNMask & (PrimeZ << 1)), x9, y9, z9); } } - if (!skipD) - { - float aD = xAFlipMask1 + yAFlipMask1 + a1; - if (aD > 0) - { - float xD = (xNMask | 1) + x1; - float yD = (yNMask | 1) + y1; - float zD = z1; - value += (aD * aD) * (aD * aD) * GradCoord(seed2, - i + (xNMask & (PrimeX << 1)), j + (yNMask & (PrimeY << 1)), k + PrimeZ, xD, yD, zD); + if (!skipD) { + double aD = xAFlipMask1 + yAFlipMask1 + a1; + if (aD > 0) { + double xD = (xNMask | 1) + x1; + double yD = (yNMask | 1) + y1; + double zD = z1; + value += (aD * aD) * (aD * aD) * + GradCoord(seed2, i + (xNMask & (PrimeX << 1)), j + (yNMask & (PrimeY << 1)), k + PrimeZ, xD, + yD, zD); } } - return value * 9.046026385208288f; + return value * 9.046026385208288; } - // Cellular Noise template - float SingleCellular(int seed, FNfloat x, FNfloat y) - { - int xr = FastRound(x); - int yr = FastRound(y); - - float distance0 = 1e10f; - float distance1 = 1e10f; - int closestHash = 0; - - float cellularJitter = 0.43701595f * mCellularJitterModifier; - - int xPrimed = (xr - 1) * PrimeX; - int yPrimedBase = (yr - 1) * PrimeY; - - switch (mCellularDistanceFunction) - { - default: - case CellularDistanceFunction_Euclidean: - case CellularDistanceFunction_EuclideanSq: - for (int xi = xr - 1; xi <= xr + 1; xi++) - { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) - { - int hash = Hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - float vecX = (float)(xi - x) + Lookup::RandVecs2D[idx] * cellularJitter; - float vecY = (float)(yi - y) + Lookup::RandVecs2D[idx | 1] * cellularJitter; - - float newDistance = vecX * vecX + vecY * vecY; - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) - { - distance0 = newDistance; - closestHash = hash; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - case CellularDistanceFunction_Manhattan: - for (int xi = xr - 1; xi <= xr + 1; xi++) - { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) - { - int hash = Hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - float vecX = (float)(xi - x) + Lookup::RandVecs2D[idx] * cellularJitter; - float vecY = (float)(yi - y) + Lookup::RandVecs2D[idx | 1] * cellularJitter; - - float newDistance = FastAbs(vecX) + FastAbs(vecY); - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) - { - distance0 = newDistance; - closestHash = hash; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - case CellularDistanceFunction_Hybrid: - for (int xi = xr - 1; xi <= xr + 1; xi++) - { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) - { - int hash = Hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - float vecX = (float)(xi - x) + Lookup::RandVecs2D[idx] * cellularJitter; - float vecY = (float)(yi - y) + Lookup::RandVecs2D[idx | 1] * cellularJitter; - - float newDistance = (FastAbs(vecX) + FastAbs(vecY)) + (vecX * vecX + vecY * vecY); - - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) - { - distance0 = newDistance; - closestHash = hash; - } - yPrimed += PrimeY; - } - xPrimed += PrimeX; - } - break; - } - - if (mCellularDistanceFunction == CellularDistanceFunction_Euclidean && mCellularReturnType >= CellularReturnType_Distance) - { - distance0 = FastSqrt(distance0); + double SingleCellular(int64_t seed, FNfloat x, FNfloat y) { + int64_t xr = FastRound(x); + int64_t yr = FastRound(y); - if (mCellularReturnType >= CellularReturnType_Distance2) - { - distance1 = FastSqrt(distance1); - } - } + double distance0 = 1e10; + double distance1 = 1e10; + int64_t closestHash = 0; - switch (mCellularReturnType) - { - case CellularReturnType_CellValue: - return closestHash * (1 / 2147483648.0f); - case CellularReturnType_Distance: - return distance0 - 1; - case CellularReturnType_Distance2: - return distance1 - 1; - case CellularReturnType_Distance2Add: - return (distance1 + distance0) * 0.5f - 1; - case CellularReturnType_Distance2Sub: - return distance1 - distance0 - 1; - case CellularReturnType_Distance2Mul: - return distance1 * distance0 * 0.5f - 1; - case CellularReturnType_Distance2Div: - return distance0 / distance1 - 1; - default: - return 0; - } - } + double cellularJitter = 0.43701595 * mCellularJitterModifier; - template - float SingleCellular(int seed, FNfloat x, FNfloat y, FNfloat z) - { - int xr = FastRound(x); - int yr = FastRound(y); - int zr = FastRound(z); + int64_t xPrimed = (xr - 1) * PrimeX; + int64_t yPrimedBase = (yr - 1) * PrimeY; - float distance0 = 1e10f; - float distance1 = 1e10f; - int closestHash = 0; + switch (mCellularDistanceFunction) { + default: + case CellularDistanceFunction_Euclidean: + case CellularDistanceFunction_EuclideanSq: + for (int64_t xi = xr - 1; xi <= xr + 1; xi++) { + int64_t yPrimed = yPrimedBase; - float cellularJitter = 0.39614353f * mCellularJitterModifier; + for (int64_t yi = yr - 1; yi <= yr + 1; yi++) { + int64_t hash = Hash(seed, xPrimed, yPrimed); + int64_t idx = hash & (255 << 1); - int xPrimed = (xr - 1) * PrimeX; - int yPrimedBase = (yr - 1) * PrimeY; - int zPrimedBase = (zr - 1) * PrimeZ; + double vecX = (double)(xi - x) + Lookup::RandVecs2D[idx] * cellularJitter; + double vecY = (double)(yi - y) + Lookup::RandVecs2D[idx | 1] * cellularJitter; - switch (mCellularDistanceFunction) - { - case CellularDistanceFunction_Euclidean: - case CellularDistanceFunction_EuclideanSq: - for (int xi = xr - 1; xi <= xr + 1; xi++) - { - int yPrimed = yPrimedBase; + double newDistance = vecX * vecX + vecY * vecY; - for (int yi = yr - 1; yi <= yr + 1; yi++) - { - int zPrimed = zPrimedBase; + distance1 = FastMax(FastMin(distance1, newDistance), distance0); + if (newDistance < distance0) { + distance0 = newDistance; + closestHash = hash; + } + yPrimed += PrimeY; + } + xPrimed += PrimeX; + } + break; + case CellularDistanceFunction_Manhattan: + for (int64_t xi = xr - 1; xi <= xr + 1; xi++) { + int64_t yPrimed = yPrimedBase; - for (int zi = zr - 1; zi <= zr + 1; zi++) - { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); + for (int64_t yi = yr - 1; yi <= yr + 1; yi++) { + int64_t hash = Hash(seed, xPrimed, yPrimed); + int64_t idx = hash & (255 << 1); - float vecX = (float)(xi - x) + Lookup::RandVecs3D[idx] * cellularJitter; - float vecY = (float)(yi - y) + Lookup::RandVecs3D[idx | 1] * cellularJitter; - float vecZ = (float)(zi - z) + Lookup::RandVecs3D[idx | 2] * cellularJitter; + double vecX = (double)(xi - x) + Lookup::RandVecs2D[idx] * cellularJitter; + double vecY = (double)(yi - y) + Lookup::RandVecs2D[idx | 1] * cellularJitter; - float newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; + double newDistance = FastAbs(vecX) + FastAbs(vecY); distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) - { + if (newDistance < distance0) { distance0 = newDistance; closestHash = hash; } - zPrimed += PrimeZ; + yPrimed += PrimeY; } - yPrimed += PrimeY; + xPrimed += PrimeX; } - xPrimed += PrimeX; - } - break; - case CellularDistanceFunction_Manhattan: - for (int xi = xr - 1; xi <= xr + 1; xi++) - { - int yPrimed = yPrimedBase; - - for (int yi = yr - 1; yi <= yr + 1; yi++) - { - int zPrimed = zPrimedBase; + break; + case CellularDistanceFunction_Hybrid: + for (int64_t xi = xr - 1; xi <= xr + 1; xi++) { + int64_t yPrimed = yPrimedBase; - for (int zi = zr - 1; zi <= zr + 1; zi++) - { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); + for (int64_t yi = yr - 1; yi <= yr + 1; yi++) { + int64_t hash = Hash(seed, xPrimed, yPrimed); + int64_t idx = hash & (255 << 1); - float vecX = (float)(xi - x) + Lookup::RandVecs3D[idx] * cellularJitter; - float vecY = (float)(yi - y) + Lookup::RandVecs3D[idx | 1] * cellularJitter; - float vecZ = (float)(zi - z) + Lookup::RandVecs3D[idx | 2] * cellularJitter; + double vecX = (double)(xi - x) + Lookup::RandVecs2D[idx] * cellularJitter; + double vecY = (double)(yi - y) + Lookup::RandVecs2D[idx | 1] * cellularJitter; - float newDistance = FastAbs(vecX) + FastAbs(vecY) + FastAbs(vecZ); + double newDistance = (FastAbs(vecX) + FastAbs(vecY)) + (vecX * vecX + vecY * vecY); distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) - { + if (newDistance < distance0) { distance0 = newDistance; closestHash = hash; } - zPrimed += PrimeZ; + yPrimed += PrimeY; } - yPrimed += PrimeY; + xPrimed += PrimeX; } - xPrimed += PrimeX; + break; + } + + if (mCellularDistanceFunction == CellularDistanceFunction_Euclidean && + mCellularReturnType >= CellularReturnType_Distance) { + distance0 = FastSqrt(distance0); + + if (mCellularReturnType >= CellularReturnType_Distance2) { + distance1 = FastSqrt(distance1); } - break; - case CellularDistanceFunction_Hybrid: - for (int xi = xr - 1; xi <= xr + 1; xi++) - { - int yPrimed = yPrimedBase; + } - for (int yi = yr - 1; yi <= yr + 1; yi++) - { - int zPrimed = zPrimedBase; + switch (mCellularReturnType) { + case CellularReturnType_CellValue: + return toDouble(closestHash); + case CellularReturnType_Distance: + return distance0 - 1; + case CellularReturnType_Distance2: + return distance1 - 1; + case CellularReturnType_Distance2Add: + return (distance1 + distance0) * 0.5 - 1; + case CellularReturnType_Distance2Sub: + return distance1 - distance0 - 1; + case CellularReturnType_Distance2Mul: + return distance1 * distance0 * 0.5 - 1; + case CellularReturnType_Distance2Div: + return distance0 / distance1 - 1; + default: + return 0; + } + } - for (int zi = zr - 1; zi <= zr + 1; zi++) - { - int hash = Hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); + template + double SingleCellular(int64_t seed, FNfloat x, FNfloat y, FNfloat z) { + int64_t xr = FastRound(x); + int64_t yr = FastRound(y); + int64_t zr = FastRound(z); + + double distance0 = 1e10; + double distance1 = 1e10; + int64_t closestHash = 0; + + double cellularJitter = 0.39614353 * mCellularJitterModifier; + + int64_t xPrimed = (xr - 1) * PrimeX; + int64_t yPrimedBase = (yr - 1) * PrimeY; + int64_t zPrimedBase = (zr - 1) * PrimeZ; + + switch (mCellularDistanceFunction) { + case CellularDistanceFunction_Euclidean: + case CellularDistanceFunction_EuclideanSq: + for (int64_t xi = xr - 1; xi <= xr + 1; xi++) { + int64_t yPrimed = yPrimedBase; + + for (int64_t yi = yr - 1; yi <= yr + 1; yi++) { + int64_t zPrimed = zPrimedBase; + + for (int64_t zi = zr - 1; zi <= zr + 1; zi++) { + int64_t hash = Hash(seed, xPrimed, yPrimed, zPrimed); + int64_t idx = hash & (255 << 2); + + double vecX = (double)(xi - x) + Lookup::RandVecs3D[idx] * cellularJitter; + double vecY = (double)(yi - y) + Lookup::RandVecs3D[idx | 1] * cellularJitter; + double vecZ = (double)(zi - z) + Lookup::RandVecs3D[idx | 2] * cellularJitter; + + double newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; + + distance1 = FastMax(FastMin(distance1, newDistance), distance0); + if (newDistance < distance0) { + distance0 = newDistance; + closestHash = hash; + } + zPrimed += PrimeZ; + } + yPrimed += PrimeY; + } + xPrimed += PrimeX; + } + break; + case CellularDistanceFunction_Manhattan: + for (int64_t xi = xr - 1; xi <= xr + 1; xi++) { + int64_t yPrimed = yPrimedBase; - float vecX = (float)(xi - x) + Lookup::RandVecs3D[idx] * cellularJitter; - float vecY = (float)(yi - y) + Lookup::RandVecs3D[idx | 1] * cellularJitter; - float vecZ = (float)(zi - z) + Lookup::RandVecs3D[idx | 2] * cellularJitter; + for (int64_t yi = yr - 1; yi <= yr + 1; yi++) { + int64_t zPrimed = zPrimedBase; - float newDistance = (FastAbs(vecX) + FastAbs(vecY) + FastAbs(vecZ)) + (vecX * vecX + vecY * vecY + vecZ * vecZ); + for (int64_t zi = zr - 1; zi <= zr + 1; zi++) { + int64_t hash = Hash(seed, xPrimed, yPrimed, zPrimed); + int64_t idx = hash & (255 << 2); - distance1 = FastMax(FastMin(distance1, newDistance), distance0); - if (newDistance < distance0) - { - distance0 = newDistance; - closestHash = hash; + double vecX = (double)(xi - x) + Lookup::RandVecs3D[idx] * cellularJitter; + double vecY = (double)(yi - y) + Lookup::RandVecs3D[idx | 1] * cellularJitter; + double vecZ = (double)(zi - z) + Lookup::RandVecs3D[idx | 2] * cellularJitter; + + double newDistance = FastAbs(vecX) + FastAbs(vecY) + FastAbs(vecZ); + + distance1 = FastMax(FastMin(distance1, newDistance), distance0); + if (newDistance < distance0) { + distance0 = newDistance; + closestHash = hash; + } + zPrimed += PrimeZ; } - zPrimed += PrimeZ; + yPrimed += PrimeY; } - yPrimed += PrimeY; + xPrimed += PrimeX; } - xPrimed += PrimeX; - } - break; - default: - break; + break; + case CellularDistanceFunction_Hybrid: + for (int64_t xi = xr - 1; xi <= xr + 1; xi++) { + int64_t yPrimed = yPrimedBase; + + for (int64_t yi = yr - 1; yi <= yr + 1; yi++) { + int64_t zPrimed = zPrimedBase; + + for (int64_t zi = zr - 1; zi <= zr + 1; zi++) { + int64_t hash = Hash(seed, xPrimed, yPrimed, zPrimed); + int64_t idx = hash & (255 << 2); + + double vecX = (double)(xi - x) + Lookup::RandVecs3D[idx] * cellularJitter; + double vecY = (double)(yi - y) + Lookup::RandVecs3D[idx | 1] * cellularJitter; + double vecZ = (double)(zi - z) + Lookup::RandVecs3D[idx | 2] * cellularJitter; + + double newDistance = (FastAbs(vecX) + FastAbs(vecY) + FastAbs(vecZ)) + + (vecX * vecX + vecY * vecY + vecZ * vecZ); + + distance1 = FastMax(FastMin(distance1, newDistance), distance0); + if (newDistance < distance0) { + distance0 = newDistance; + closestHash = hash; + } + zPrimed += PrimeZ; + } + yPrimed += PrimeY; + } + xPrimed += PrimeX; + } + break; + default: + break; } - if (mCellularDistanceFunction == CellularDistanceFunction_Euclidean && mCellularReturnType >= CellularReturnType_Distance) - { + if (mCellularDistanceFunction == CellularDistanceFunction_Euclidean && + mCellularReturnType >= CellularReturnType_Distance) { distance0 = FastSqrt(distance0); - if (mCellularReturnType >= CellularReturnType_Distance2) - { + if (mCellularReturnType >= CellularReturnType_Distance2) { distance1 = FastSqrt(distance1); } } - switch (mCellularReturnType) - { - case CellularReturnType_CellValue: - return closestHash * (1 / 2147483648.0f); - case CellularReturnType_Distance: - return distance0 - 1; - case CellularReturnType_Distance2: - return distance1 - 1; - case CellularReturnType_Distance2Add: - return (distance1 + distance0) * 0.5f - 1; - case CellularReturnType_Distance2Sub: - return distance1 - distance0 - 1; - case CellularReturnType_Distance2Mul: - return distance1 * distance0 * 0.5f - 1; - case CellularReturnType_Distance2Div: - return distance0 / distance1 - 1; - default: - return 0; + switch (mCellularReturnType) { + case CellularReturnType_CellValue: + return toDouble(closestHash); + case CellularReturnType_Distance: + return distance0 - 1; + case CellularReturnType_Distance2: + return distance1 - 1; + case CellularReturnType_Distance2Add: + return (distance1 + distance0) * 0.5 - 1; + case CellularReturnType_Distance2Sub: + return distance1 - distance0 - 1; + case CellularReturnType_Distance2Mul: + return distance1 * distance0 * 0.5 - 1; + case CellularReturnType_Distance2Div: + return distance0 / distance1 - 1; + default: + return 0; } } - // Perlin Noise template - float SinglePerlin(int seed, FNfloat x, FNfloat y) - { - int x0 = FastFloor(x); - int y0 = FastFloor(y); + double SinglePerlin(int64_t seed, FNfloat x, FNfloat y) { + int64_t x0 = FastFloor(x); + int64_t y0 = FastFloor(y); - float xd0 = (float)(x - x0); - float yd0 = (float)(y - y0); - float xd1 = xd0 - 1; - float yd1 = yd0 - 1; + double xd0 = (double)(x - x0); + double yd0 = (double)(y - y0); + double xd1 = xd0 - 1; + double yd1 = yd0 - 1; - float xs = InterpQuintic(xd0); - float ys = InterpQuintic(yd0); + double xs = InterpQuintic(xd0); + double ys = InterpQuintic(yd0); x0 *= PrimeX; y0 *= PrimeY; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; + int64_t x1 = x0 + PrimeX; + int64_t y1 = y0 + PrimeY; - float xf0 = Lerp(GradCoord(seed, x0, y0, xd0, yd0), GradCoord(seed, x1, y0, xd1, yd0), xs); - float xf1 = Lerp(GradCoord(seed, x0, y1, xd0, yd1), GradCoord(seed, x1, y1, xd1, yd1), xs); + double xf0 = Lerp(GradCoord(seed, x0, y0, xd0, yd0), GradCoord(seed, x1, y0, xd1, yd0), xs); + double xf1 = Lerp(GradCoord(seed, x0, y1, xd0, yd1), GradCoord(seed, x1, y1, xd1, yd1), xs); - return Lerp(xf0, xf1, ys) * 1.4247691104677813f; + return Lerp(xf0, xf1, ys) * 1.4247691104677813; } template - float SinglePerlin(int seed, FNfloat x, FNfloat y, FNfloat z) - { - int x0 = FastFloor(x); - int y0 = FastFloor(y); - int z0 = FastFloor(z); - - float xd0 = (float)(x - x0); - float yd0 = (float)(y - y0); - float zd0 = (float)(z - z0); - float xd1 = xd0 - 1; - float yd1 = yd0 - 1; - float zd1 = zd0 - 1; - - float xs = InterpQuintic(xd0); - float ys = InterpQuintic(yd0); - float zs = InterpQuintic(zd0); + double SinglePerlin(int64_t seed, FNfloat x, FNfloat y, FNfloat z) { + int64_t x0 = FastFloor(x); + int64_t y0 = FastFloor(y); + int64_t z0 = FastFloor(z); + + double xd0 = (double)(x - x0); + double yd0 = (double)(y - y0); + double zd0 = (double)(z - z0); + double xd1 = xd0 - 1; + double yd1 = yd0 - 1; + double zd1 = zd0 - 1; + + double xs = InterpQuintic(xd0); + double ys = InterpQuintic(yd0); + double zs = InterpQuintic(zd0); x0 *= PrimeX; y0 *= PrimeY; z0 *= PrimeZ; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - int z1 = z0 + PrimeZ; + int64_t x1 = x0 + PrimeX; + int64_t y1 = y0 + PrimeY; + int64_t z1 = z0 + PrimeZ; - float xf00 = Lerp(GradCoord(seed, x0, y0, z0, xd0, yd0, zd0), GradCoord(seed, x1, y0, z0, xd1, yd0, zd0), xs); - float xf10 = Lerp(GradCoord(seed, x0, y1, z0, xd0, yd1, zd0), GradCoord(seed, x1, y1, z0, xd1, yd1, zd0), xs); - float xf01 = Lerp(GradCoord(seed, x0, y0, z1, xd0, yd0, zd1), GradCoord(seed, x1, y0, z1, xd1, yd0, zd1), xs); - float xf11 = Lerp(GradCoord(seed, x0, y1, z1, xd0, yd1, zd1), GradCoord(seed, x1, y1, z1, xd1, yd1, zd1), xs); + double xf00 = Lerp(GradCoord(seed, x0, y0, z0, xd0, yd0, zd0), GradCoord(seed, x1, y0, z0, xd1, yd0, zd0), xs); + double xf10 = Lerp(GradCoord(seed, x0, y1, z0, xd0, yd1, zd0), GradCoord(seed, x1, y1, z0, xd1, yd1, zd0), xs); + double xf01 = Lerp(GradCoord(seed, x0, y0, z1, xd0, yd0, zd1), GradCoord(seed, x1, y0, z1, xd1, yd0, zd1), xs); + double xf11 = Lerp(GradCoord(seed, x0, y1, z1, xd0, yd1, zd1), GradCoord(seed, x1, y1, z1, xd1, yd1, zd1), xs); - float yf0 = Lerp(xf00, xf10, ys); - float yf1 = Lerp(xf01, xf11, ys); + double yf0 = Lerp(xf00, xf10, ys); + double yf1 = Lerp(xf01, xf11, ys); - return Lerp(yf0, yf1, zs) * 0.964921414852142333984375f; + return Lerp(yf0, yf1, zs) * 0.964921414852142333984375; } - // Value Cubic Noise template - float SingleValueCubic(int seed, FNfloat x, FNfloat y) - { - int x1 = FastFloor(x); - int y1 = FastFloor(y); + double SingleValueCubic(int64_t seed, FNfloat x, FNfloat y) { + int64_t x1 = FastFloor(x); + int64_t y1 = FastFloor(y); - float xs = (float)(x - x1); - float ys = (float)(y - y1); + double xs = (double)(x - x1); + double ys = (double)(y - y1); x1 *= PrimeX; y1 *= PrimeY; - int x0 = x1 - PrimeX; - int y0 = y1 - PrimeY; - int x2 = x1 + PrimeX; - int y2 = y1 + PrimeY; - int x3 = x1 + (int)((long)PrimeX << 1); - int y3 = y1 + (int)((long)PrimeY << 1); - - return CubicLerp( - CubicLerp(ValCoord(seed, x0, y0), ValCoord(seed, x1, y0), ValCoord(seed, x2, y0), ValCoord(seed, x3, y0), - xs), - CubicLerp(ValCoord(seed, x0, y1), ValCoord(seed, x1, y1), ValCoord(seed, x2, y1), ValCoord(seed, x3, y1), - xs), - CubicLerp(ValCoord(seed, x0, y2), ValCoord(seed, x1, y2), ValCoord(seed, x2, y2), ValCoord(seed, x3, y2), - xs), - CubicLerp(ValCoord(seed, x0, y3), ValCoord(seed, x1, y3), ValCoord(seed, x2, y3), ValCoord(seed, x3, y3), - xs), - ys) * (1 / (1.5f * 1.5f)); + int64_t x0 = x1 - PrimeX; + int64_t y0 = y1 - PrimeY; + int64_t x2 = x1 + PrimeX; + int64_t y2 = y1 + PrimeY; + int64_t x3 = x1 + (int64_t)((long)PrimeX << 1); + int64_t y3 = y1 + (int64_t)((long)PrimeY << 1); + + return CubicLerp(CubicLerp(ValCoord(seed, x0, y0), ValCoord(seed, x1, y0), ValCoord(seed, x2, y0), + ValCoord(seed, x3, y0), xs), + CubicLerp(ValCoord(seed, x0, y1), ValCoord(seed, x1, y1), ValCoord(seed, x2, y1), + ValCoord(seed, x3, y1), xs), + CubicLerp(ValCoord(seed, x0, y2), ValCoord(seed, x1, y2), ValCoord(seed, x2, y2), + ValCoord(seed, x3, y2), xs), + CubicLerp(ValCoord(seed, x0, y3), ValCoord(seed, x1, y3), ValCoord(seed, x2, y3), + ValCoord(seed, x3, y3), xs), + ys) * + (1 / (1.5 * 1.5)); } template - float SingleValueCubic(int seed, FNfloat x, FNfloat y, FNfloat z) - { - int x1 = FastFloor(x); - int y1 = FastFloor(y); - int z1 = FastFloor(z); + double SingleValueCubic(int64_t seed, FNfloat x, FNfloat y, FNfloat z) { + int64_t x1 = FastFloor(x); + int64_t y1 = FastFloor(y); + int64_t z1 = FastFloor(z); - float xs = (float)(x - x1); - float ys = (float)(y - y1); - float zs = (float)(z - z1); + double xs = (double)(x - x1); + double ys = (double)(y - y1); + double zs = (double)(z - z1); x1 *= PrimeX; y1 *= PrimeY; z1 *= PrimeZ; - int x0 = x1 - PrimeX; - int y0 = y1 - PrimeY; - int z0 = z1 - PrimeZ; - int x2 = x1 + PrimeX; - int y2 = y1 + PrimeY; - int z2 = z1 + PrimeZ; - int x3 = x1 + (int)((long)PrimeX << 1); - int y3 = y1 + (int)((long)PrimeY << 1); - int z3 = z1 + (int)((long)PrimeZ << 1); - - - return CubicLerp( - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z0), ValCoord(seed, x1, y0, z0), ValCoord(seed, x2, y0, z0), ValCoord(seed, x3, y0, z0), xs), - CubicLerp(ValCoord(seed, x0, y1, z0), ValCoord(seed, x1, y1, z0), ValCoord(seed, x2, y1, z0), ValCoord(seed, x3, y1, z0), xs), - CubicLerp(ValCoord(seed, x0, y2, z0), ValCoord(seed, x1, y2, z0), ValCoord(seed, x2, y2, z0), ValCoord(seed, x3, y2, z0), xs), - CubicLerp(ValCoord(seed, x0, y3, z0), ValCoord(seed, x1, y3, z0), ValCoord(seed, x2, y3, z0), ValCoord(seed, x3, y3, z0), xs), - ys), - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z1), ValCoord(seed, x1, y0, z1), ValCoord(seed, x2, y0, z1), ValCoord(seed, x3, y0, z1), xs), - CubicLerp(ValCoord(seed, x0, y1, z1), ValCoord(seed, x1, y1, z1), ValCoord(seed, x2, y1, z1), ValCoord(seed, x3, y1, z1), xs), - CubicLerp(ValCoord(seed, x0, y2, z1), ValCoord(seed, x1, y2, z1), ValCoord(seed, x2, y2, z1), ValCoord(seed, x3, y2, z1), xs), - CubicLerp(ValCoord(seed, x0, y3, z1), ValCoord(seed, x1, y3, z1), ValCoord(seed, x2, y3, z1), ValCoord(seed, x3, y3, z1), xs), - ys), - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z2), ValCoord(seed, x1, y0, z2), ValCoord(seed, x2, y0, z2), ValCoord(seed, x3, y0, z2), xs), - CubicLerp(ValCoord(seed, x0, y1, z2), ValCoord(seed, x1, y1, z2), ValCoord(seed, x2, y1, z2), ValCoord(seed, x3, y1, z2), xs), - CubicLerp(ValCoord(seed, x0, y2, z2), ValCoord(seed, x1, y2, z2), ValCoord(seed, x2, y2, z2), ValCoord(seed, x3, y2, z2), xs), - CubicLerp(ValCoord(seed, x0, y3, z2), ValCoord(seed, x1, y3, z2), ValCoord(seed, x2, y3, z2), ValCoord(seed, x3, y3, z2), xs), - ys), - CubicLerp( - CubicLerp(ValCoord(seed, x0, y0, z3), ValCoord(seed, x1, y0, z3), ValCoord(seed, x2, y0, z3), ValCoord(seed, x3, y0, z3), xs), - CubicLerp(ValCoord(seed, x0, y1, z3), ValCoord(seed, x1, y1, z3), ValCoord(seed, x2, y1, z3), ValCoord(seed, x3, y1, z3), xs), - CubicLerp(ValCoord(seed, x0, y2, z3), ValCoord(seed, x1, y2, z3), ValCoord(seed, x2, y2, z3), ValCoord(seed, x3, y2, z3), xs), - CubicLerp(ValCoord(seed, x0, y3, z3), ValCoord(seed, x1, y3, z3), ValCoord(seed, x2, y3, z3), ValCoord(seed, x3, y3, z3), xs), - ys), - zs) * (1 / (1.5f * 1.5f * 1.5f)); + int64_t x0 = x1 - PrimeX; + int64_t y0 = y1 - PrimeY; + int64_t z0 = z1 - PrimeZ; + int64_t x2 = x1 + PrimeX; + int64_t y2 = y1 + PrimeY; + int64_t z2 = z1 + PrimeZ; + int64_t x3 = x1 + (int64_t)((long)PrimeX << 1); + int64_t y3 = y1 + (int64_t)((long)PrimeY << 1); + int64_t z3 = z1 + (int64_t)((long)PrimeZ << 1); + + return CubicLerp(CubicLerp(CubicLerp(ValCoord(seed, x0, y0, z0), ValCoord(seed, x1, y0, z0), + ValCoord(seed, x2, y0, z0), ValCoord(seed, x3, y0, z0), xs), + CubicLerp(ValCoord(seed, x0, y1, z0), ValCoord(seed, x1, y1, z0), + ValCoord(seed, x2, y1, z0), ValCoord(seed, x3, y1, z0), xs), + CubicLerp(ValCoord(seed, x0, y2, z0), ValCoord(seed, x1, y2, z0), + ValCoord(seed, x2, y2, z0), ValCoord(seed, x3, y2, z0), xs), + CubicLerp(ValCoord(seed, x0, y3, z0), ValCoord(seed, x1, y3, z0), + ValCoord(seed, x2, y3, z0), ValCoord(seed, x3, y3, z0), xs), + ys), + CubicLerp(CubicLerp(ValCoord(seed, x0, y0, z1), ValCoord(seed, x1, y0, z1), + ValCoord(seed, x2, y0, z1), ValCoord(seed, x3, y0, z1), xs), + CubicLerp(ValCoord(seed, x0, y1, z1), ValCoord(seed, x1, y1, z1), + ValCoord(seed, x2, y1, z1), ValCoord(seed, x3, y1, z1), xs), + CubicLerp(ValCoord(seed, x0, y2, z1), ValCoord(seed, x1, y2, z1), + ValCoord(seed, x2, y2, z1), ValCoord(seed, x3, y2, z1), xs), + CubicLerp(ValCoord(seed, x0, y3, z1), ValCoord(seed, x1, y3, z1), + ValCoord(seed, x2, y3, z1), ValCoord(seed, x3, y3, z1), xs), + ys), + CubicLerp(CubicLerp(ValCoord(seed, x0, y0, z2), ValCoord(seed, x1, y0, z2), + ValCoord(seed, x2, y0, z2), ValCoord(seed, x3, y0, z2), xs), + CubicLerp(ValCoord(seed, x0, y1, z2), ValCoord(seed, x1, y1, z2), + ValCoord(seed, x2, y1, z2), ValCoord(seed, x3, y1, z2), xs), + CubicLerp(ValCoord(seed, x0, y2, z2), ValCoord(seed, x1, y2, z2), + ValCoord(seed, x2, y2, z2), ValCoord(seed, x3, y2, z2), xs), + CubicLerp(ValCoord(seed, x0, y3, z2), ValCoord(seed, x1, y3, z2), + ValCoord(seed, x2, y3, z2), ValCoord(seed, x3, y3, z2), xs), + ys), + CubicLerp(CubicLerp(ValCoord(seed, x0, y0, z3), ValCoord(seed, x1, y0, z3), + ValCoord(seed, x2, y0, z3), ValCoord(seed, x3, y0, z3), xs), + CubicLerp(ValCoord(seed, x0, y1, z3), ValCoord(seed, x1, y1, z3), + ValCoord(seed, x2, y1, z3), ValCoord(seed, x3, y1, z3), xs), + CubicLerp(ValCoord(seed, x0, y2, z3), ValCoord(seed, x1, y2, z3), + ValCoord(seed, x2, y2, z3), ValCoord(seed, x3, y2, z3), xs), + CubicLerp(ValCoord(seed, x0, y3, z3), ValCoord(seed, x1, y3, z3), + ValCoord(seed, x2, y3, z3), ValCoord(seed, x3, y3, z3), xs), + ys), + zs) * + (1 / (1.5 * 1.5 * 1.5)); } - // Value Noise template - float SingleValue(int seed, FNfloat x, FNfloat y) - { - int x0 = FastFloor(x); - int y0 = FastFloor(y); + double SingleValue(int64_t seed, FNfloat x, FNfloat y) { + int64_t x0 = FastFloor(x); + int64_t y0 = FastFloor(y); - float xs = InterpHermite((float)(x - x0)); - float ys = InterpHermite((float)(y - y0)); + double xs = InterpHermite((double)(x - x0)); + double ys = InterpHermite((double)(y - y0)); x0 *= PrimeX; y0 *= PrimeY; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; + int64_t x1 = x0 + PrimeX; + int64_t y1 = y0 + PrimeY; - float xf0 = Lerp(ValCoord(seed, x0, y0), ValCoord(seed, x1, y0), xs); - float xf1 = Lerp(ValCoord(seed, x0, y1), ValCoord(seed, x1, y1), xs); + double xf0 = Lerp(ValCoord(seed, x0, y0), ValCoord(seed, x1, y0), xs); + double xf1 = Lerp(ValCoord(seed, x0, y1), ValCoord(seed, x1, y1), xs); return Lerp(xf0, xf1, ys); } template - float SingleValue(int seed, FNfloat x, FNfloat y, FNfloat z) - { - int x0 = FastFloor(x); - int y0 = FastFloor(y); - int z0 = FastFloor(z); + double SingleValue(int64_t seed, FNfloat x, FNfloat y, FNfloat z) { + int64_t x0 = FastFloor(x); + int64_t y0 = FastFloor(y); + int64_t z0 = FastFloor(z); - float xs = InterpHermite((float)(x - x0)); - float ys = InterpHermite((float)(y - y0)); - float zs = InterpHermite((float)(z - z0)); + double xs = InterpHermite((double)(x - x0)); + double ys = InterpHermite((double)(y - y0)); + double zs = InterpHermite((double)(z - z0)); x0 *= PrimeX; y0 *= PrimeY; z0 *= PrimeZ; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - int z1 = z0 + PrimeZ; + int64_t x1 = x0 + PrimeX; + int64_t y1 = y0 + PrimeY; + int64_t z1 = z0 + PrimeZ; - float xf00 = Lerp(ValCoord(seed, x0, y0, z0), ValCoord(seed, x1, y0, z0), xs); - float xf10 = Lerp(ValCoord(seed, x0, y1, z0), ValCoord(seed, x1, y1, z0), xs); - float xf01 = Lerp(ValCoord(seed, x0, y0, z1), ValCoord(seed, x1, y0, z1), xs); - float xf11 = Lerp(ValCoord(seed, x0, y1, z1), ValCoord(seed, x1, y1, z1), xs); + double xf00 = Lerp(ValCoord(seed, x0, y0, z0), ValCoord(seed, x1, y0, z0), xs); + double xf10 = Lerp(ValCoord(seed, x0, y1, z0), ValCoord(seed, x1, y1, z0), xs); + double xf01 = Lerp(ValCoord(seed, x0, y0, z1), ValCoord(seed, x1, y0, z1), xs); + double xf11 = Lerp(ValCoord(seed, x0, y1, z1), ValCoord(seed, x1, y1, z1), xs); - float yf0 = Lerp(xf00, xf10, ys); - float yf1 = Lerp(xf01, xf11, ys); + double yf0 = Lerp(xf00, xf10, ys); + double yf1 = Lerp(xf01, xf11, ys); return Lerp(yf0, yf1, zs); } - // Domain Warp template - void DoSingleDomainWarp(int seed, float amp, float freq, FNfloat x, FNfloat y, FNfloat& xr, FNfloat& yr) - { - switch (mDomainWarpType) - { - case DomainWarpType_OpenSimplex2: - SingleDomainWarpSimplexGradient(seed, amp * 38.283687591552734375f, freq, x, y, xr, yr, false); - break; - case DomainWarpType_OpenSimplex2Reduced: - SingleDomainWarpSimplexGradient(seed, amp * 16.0f, freq, x, y, xr, yr, true); - break; - case DomainWarpType_BasicGrid: - SingleDomainWarpBasicGrid(seed, amp, freq, x, y, xr, yr); - break; + void DoSingleDomainWarp(int64_t seed, double amp, double freq, FNfloat x, FNfloat y, FNfloat& xr, FNfloat& yr) { + switch (mDomainWarpType) { + case DomainWarpType_OpenSimplex2: + SingleDomainWarpSimplexGradient(seed, amp * 38.283687591552734375, freq, x, y, xr, yr, false); + break; + case DomainWarpType_OpenSimplex2Reduced: + SingleDomainWarpSimplexGradient(seed, amp * 16.0, freq, x, y, xr, yr, true); + break; + case DomainWarpType_BasicGrid: + SingleDomainWarpBasicGrid(seed, amp, freq, x, y, xr, yr); + break; } } template - void DoSingleDomainWarp(int seed, float amp, float freq, FNfloat x, FNfloat y, FNfloat z, FNfloat& xr, FNfloat& yr, FNfloat& zr) - { - switch (mDomainWarpType) - { - case DomainWarpType_OpenSimplex2: - SingleDomainWarpOpenSimplex2Gradient(seed, amp * 32.69428253173828125f, freq, x, y, z, xr, yr, zr, false); - break; - case DomainWarpType_OpenSimplex2Reduced: - SingleDomainWarpOpenSimplex2Gradient(seed, amp * 7.71604938271605f, freq, x, y, z, xr, yr, zr, true); - break; - case DomainWarpType_BasicGrid: - SingleDomainWarpBasicGrid(seed, amp, freq, x, y, z, xr, yr, zr); - break; + void DoSingleDomainWarp(int64_t seed, + double amp, + double freq, + FNfloat x, + FNfloat y, + FNfloat z, + FNfloat& xr, + FNfloat& yr, + FNfloat& zr) { + switch (mDomainWarpType) { + case DomainWarpType_OpenSimplex2: + SingleDomainWarpOpenSimplex2Gradient(seed, amp * 32.69428253173828125, freq, x, y, z, xr, yr, zr, + false); + break; + case DomainWarpType_OpenSimplex2Reduced: + SingleDomainWarpOpenSimplex2Gradient(seed, amp * 7.71604938271605, freq, x, y, z, xr, yr, zr, true); + break; + case DomainWarpType_BasicGrid: + SingleDomainWarpBasicGrid(seed, amp, freq, x, y, z, xr, yr, zr); + break; } } - // Domain Warp Single Wrapper template - void DomainWarpSingle(FNfloat& x, FNfloat& y) - { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; + void DomainWarpSingle(FNfloat& x, FNfloat& y) { + int64_t seed = mSeed; + double amp = mDomainWarpAmp * mFractalBounding; + double freq = 1; FNfloat xs = x; FNfloat ys = y; @@ -2021,11 +1567,10 @@ class FastNoiseLite } template - void DomainWarpSingle(FNfloat& x, FNfloat& y, FNfloat& z) - { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; + void DomainWarpSingle(FNfloat& x, FNfloat& y, FNfloat& z) { + int64_t seed = mSeed; + double amp = mDomainWarpAmp * mFractalBounding; + double freq = 1; FNfloat xs = x; FNfloat ys = y; @@ -2035,18 +1580,15 @@ class FastNoiseLite DoSingleDomainWarp(seed, amp, freq, xs, ys, zs, x, y, z); } - // Domain Warp Fractal Progressive template - void DomainWarpFractalProgressive(FNfloat& x, FNfloat& y) - { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - for (int i = 0; i < mOctaves; i++) - { + void DomainWarpFractalProgressive(FNfloat& x, FNfloat& y) { + int64_t seed = mSeed; + double amp = mDomainWarpAmp * mFractalBounding; + double freq = 1; + + for (int64_t i = 0; i < mOctaves; i++) { FNfloat xs = x; FNfloat ys = y; TransformDomainWarpCoordinate(xs, ys); @@ -2060,14 +1602,12 @@ class FastNoiseLite } template - void DomainWarpFractalProgressive(FNfloat& x, FNfloat& y, FNfloat& z) - { - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; - - for (int i = 0; i < mOctaves; i++) - { + void DomainWarpFractalProgressive(FNfloat& x, FNfloat& y, FNfloat& z) { + int64_t seed = mSeed; + double amp = mDomainWarpAmp * mFractalBounding; + double freq = 1; + + for (int64_t i = 0; i < mOctaves; i++) { FNfloat xs = x; FNfloat ys = y; FNfloat zs = z; @@ -2081,22 +1621,19 @@ class FastNoiseLite } } - // Domain Warp Fractal Independant template - void DomainWarpFractalIndependent(FNfloat& x, FNfloat& y) - { + void DomainWarpFractalIndependent(FNfloat& x, FNfloat& y) { FNfloat xs = x; FNfloat ys = y; TransformDomainWarpCoordinate(xs, ys); - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; + int64_t seed = mSeed; + double amp = mDomainWarpAmp * mFractalBounding; + double freq = 1; - for (int i = 0; i < mOctaves; i++) - { + for (int64_t i = 0; i < mOctaves; i++) { DoSingleDomainWarp(seed, amp, freq, xs, ys, x, y); seed++; @@ -2106,19 +1643,17 @@ class FastNoiseLite } template - void DomainWarpFractalIndependent(FNfloat& x, FNfloat& y, FNfloat& z) - { + void DomainWarpFractalIndependent(FNfloat& x, FNfloat& y, FNfloat& z) { FNfloat xs = x; FNfloat ys = y; FNfloat zs = z; TransformDomainWarpCoordinate(xs, ys, zs); - int seed = mSeed; - float amp = mDomainWarpAmp * mFractalBounding; - float freq = mFrequency; + int64_t seed = mSeed; + double amp = mDomainWarpAmp * mFractalBounding; + double freq = 1; - for (int i = 0; i < mOctaves; i++) - { + for (int64_t i = 0; i < mOctaves; i++) { DoSingleDomainWarp(seed, amp, freq, xs, ys, zs, x, y, z); seed++; @@ -2127,140 +1662,155 @@ class FastNoiseLite } } - // Domain Warp Basic Grid template - void SingleDomainWarpBasicGrid(int seed, float warpAmp, float frequency, FNfloat x, FNfloat y, FNfloat& xr, FNfloat& yr) - { + void SingleDomainWarpBasicGrid(int64_t seed, + double warpAmp, + double frequency, + FNfloat x, + FNfloat y, + FNfloat& xr, + FNfloat& yr) { FNfloat xf = x * frequency; FNfloat yf = y * frequency; - int x0 = FastFloor(xf); - int y0 = FastFloor(yf); + int64_t x0 = FastFloor(xf); + int64_t y0 = FastFloor(yf); - float xs = InterpHermite((float)(xf - x0)); - float ys = InterpHermite((float)(yf - y0)); + double xs = InterpHermite((double)(xf - x0)); + double ys = InterpHermite((double)(yf - y0)); x0 *= PrimeX; y0 *= PrimeY; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; + int64_t x1 = x0 + PrimeX; + int64_t y1 = y0 + PrimeY; - int hash0 = Hash(seed, x0, y0) & (255 << 1); - int hash1 = Hash(seed, x1, y0) & (255 << 1); + int64_t hash0 = Hash(seed, x0, y0) & (255 << 1); + int64_t hash1 = Hash(seed, x1, y0) & (255 << 1); - float lx0x = Lerp(Lookup::RandVecs2D[hash0], Lookup::RandVecs2D[hash1], xs); - float ly0x = Lerp(Lookup::RandVecs2D[hash0 | 1], Lookup::RandVecs2D[hash1 | 1], xs); + double lx0x = Lerp(Lookup::RandVecs2D[hash0], Lookup::RandVecs2D[hash1], xs); + double ly0x = Lerp(Lookup::RandVecs2D[hash0 | 1], Lookup::RandVecs2D[hash1 | 1], xs); hash0 = Hash(seed, x0, y1) & (255 << 1); hash1 = Hash(seed, x1, y1) & (255 << 1); - float lx1x = Lerp(Lookup::RandVecs2D[hash0], Lookup::RandVecs2D[hash1], xs); - float ly1x = Lerp(Lookup::RandVecs2D[hash0 | 1], Lookup::RandVecs2D[hash1 | 1], xs); + double lx1x = Lerp(Lookup::RandVecs2D[hash0], Lookup::RandVecs2D[hash1], xs); + double ly1x = Lerp(Lookup::RandVecs2D[hash0 | 1], Lookup::RandVecs2D[hash1 | 1], xs); xr += Lerp(lx0x, lx1x, ys) * warpAmp; yr += Lerp(ly0x, ly1x, ys) * warpAmp; } template - void SingleDomainWarpBasicGrid(int seed, float warpAmp, float frequency, FNfloat x, FNfloat y, FNfloat z, FNfloat& xr, FNfloat& yr, FNfloat& zr) - { + void SingleDomainWarpBasicGrid(int64_t seed, + double warpAmp, + double frequency, + FNfloat x, + FNfloat y, + FNfloat z, + FNfloat& xr, + FNfloat& yr, + FNfloat& zr) { FNfloat xf = x * frequency; FNfloat yf = y * frequency; FNfloat zf = z * frequency; - int x0 = FastFloor(xf); - int y0 = FastFloor(yf); - int z0 = FastFloor(zf); + int64_t x0 = FastFloor(xf); + int64_t y0 = FastFloor(yf); + int64_t z0 = FastFloor(zf); - float xs = InterpHermite((float)(xf - x0)); - float ys = InterpHermite((float)(yf - y0)); - float zs = InterpHermite((float)(zf - z0)); + double xs = InterpHermite((double)(xf - x0)); + double ys = InterpHermite((double)(yf - y0)); + double zs = InterpHermite((double)(zf - z0)); x0 *= PrimeX; y0 *= PrimeY; z0 *= PrimeZ; - int x1 = x0 + PrimeX; - int y1 = y0 + PrimeY; - int z1 = z0 + PrimeZ; + int64_t x1 = x0 + PrimeX; + int64_t y1 = y0 + PrimeY; + int64_t z1 = z0 + PrimeZ; - int hash0 = Hash(seed, x0, y0, z0) & (255 << 2); - int hash1 = Hash(seed, x1, y0, z0) & (255 << 2); + int64_t hash0 = Hash(seed, x0, y0, z0) & (255 << 2); + int64_t hash1 = Hash(seed, x1, y0, z0) & (255 << 2); - float lx0x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); - float ly0x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); - float lz0x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); + double lx0x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); + double ly0x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); + double lz0x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); hash0 = Hash(seed, x0, y1, z0) & (255 << 2); hash1 = Hash(seed, x1, y1, z0) & (255 << 2); - float lx1x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); - float ly1x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); - float lz1x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); + double lx1x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); + double ly1x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); + double lz1x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); - float lx0y = Lerp(lx0x, lx1x, ys); - float ly0y = Lerp(ly0x, ly1x, ys); - float lz0y = Lerp(lz0x, lz1x, ys); + double lx0y = Lerp(lx0x, lx1x, ys); + double ly0y = Lerp(ly0x, ly1x, ys); + double lz0y = Lerp(lz0x, lz1x, ys); hash0 = Hash(seed, x0, y0, z1) & (255 << 2); hash1 = Hash(seed, x1, y0, z1) & (255 << 2); - lx0x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); - ly0x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); - lz0x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); + lx0x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); + ly0x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); + lz0x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); hash0 = Hash(seed, x0, y1, z1) & (255 << 2); hash1 = Hash(seed, x1, y1, z1) & (255 << 2); - lx1x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); - ly1x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); - lz1x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); + lx1x = Lerp(Lookup::RandVecs3D[hash0], Lookup::RandVecs3D[hash1], xs); + ly1x = Lerp(Lookup::RandVecs3D[hash0 | 1], Lookup::RandVecs3D[hash1 | 1], xs); + lz1x = Lerp(Lookup::RandVecs3D[hash0 | 2], Lookup::RandVecs3D[hash1 | 2], xs); xr += Lerp(lx0y, Lerp(lx0x, lx1x, ys), zs) * warpAmp; yr += Lerp(ly0y, Lerp(ly0x, ly1x, ys), zs) * warpAmp; zr += Lerp(lz0y, Lerp(lz0x, lz1x, ys), zs) * warpAmp; } - // Domain Warp Simplex/OpenSimplex2 template - void SingleDomainWarpSimplexGradient(int seed, float warpAmp, float frequency, FNfloat x, FNfloat y, FNfloat& xr, FNfloat& yr, bool outGradOnly) - { - const float SQRT3 = 1.7320508075688772935274463415059f; - const float G2 = (3 - SQRT3) / 6; + void SingleDomainWarpSimplexGradient(int64_t seed, + double warpAmp, + double frequency, + FNfloat x, + FNfloat y, + FNfloat& xr, + FNfloat& yr, + bool outGradOnly) { + const double SQRT3 = 1.7320508075688772935274463415059; + const double G2 = (3 - SQRT3) / 6; x *= frequency; y *= frequency; /* * --- Skew moved to TransformNoiseCoordinate method --- - * const FNfloat F2 = 0.5f * (SQRT3 - 1); + * const FNfloat F2 = 0.5 * (SQRT3 - 1); * FNfloat s = (x + y) * F2; * x += s; y += s; - */ + */ - int i = FastFloor(x); - int j = FastFloor(y); - float xi = (float)(x - i); - float yi = (float)(y - j); + int64_t i = FastFloor(x); + int64_t j = FastFloor(y); + double xi = (double)(x - i); + double yi = (double)(y - j); - float t = (xi + yi) * G2; - float x0 = (float)(xi - t); - float y0 = (float)(yi - t); + double t = (xi + yi) * G2; + double x0 = (double)(xi - t); + double y0 = (double)(yi - t); i *= PrimeX; j *= PrimeY; - float vx, vy; + double vx, vy; vx = vy = 0; - float a = 0.5f - x0 * x0 - y0 * y0; - if (a > 0) - { - float aaaa = (a * a) * (a * a); - float xo, yo; + double a = 0.5 - x0 * x0 - y0 * y0; + if (a > 0) { + double aaaa = (a * a) * (a * a); + double xo, yo; if (outGradOnly) GradCoordOut(seed, i, j, xo, yo); else @@ -2269,13 +1819,12 @@ class FastNoiseLite vy += aaaa * yo; } - float c = (float)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((float)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); - if (c > 0) - { - float x2 = x0 + (2 * (float)G2 - 1); - float y2 = y0 + (2 * (float)G2 - 1); - float cccc = (c * c) * (c * c); - float xo, yo; + double c = (double)(2 * (1 - 2 * G2) * (1 / G2 - 2)) * t + ((double)(-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); + if (c > 0) { + double x2 = x0 + (2 * (double)G2 - 1); + double y2 = y0 + (2 * (double)G2 - 1); + double cccc = (c * c) * (c * c); + double xo, yo; if (outGradOnly) GradCoordOut(seed, i + PrimeX, j + PrimeY, xo, yo); else @@ -2284,15 +1833,13 @@ class FastNoiseLite vy += cccc * yo; } - if (y0 > x0) - { - float x1 = x0 + (float)G2; - float y1 = y0 + ((float)G2 - 1); - float b = 0.5f - x1 * x1 - y1 * y1; - if (b > 0) - { - float bbbb = (b * b) * (b * b); - float xo, yo; + if (y0 > x0) { + double x1 = x0 + (double)G2; + double y1 = y0 + ((double)G2 - 1); + double b = 0.5 - x1 * x1 - y1 * y1; + if (b > 0) { + double bbbb = (b * b) * (b * b); + double xo, yo; if (outGradOnly) GradCoordOut(seed, i, j + PrimeY, xo, yo); else @@ -2300,16 +1847,13 @@ class FastNoiseLite vx += bbbb * xo; vy += bbbb * yo; } - } - else - { - float x1 = x0 + ((float)G2 - 1); - float y1 = y0 + (float)G2; - float b = 0.5f - x1 * x1 - y1 * y1; - if (b > 0) - { - float bbbb = (b * b) * (b * b); - float xo, yo; + } else { + double x1 = x0 + ((double)G2 - 1); + double y1 = y0 + (double)G2; + double b = 0.5 - x1 * x1 - y1 * y1; + if (b > 0) { + double bbbb = (b * b) * (b * b); + double xo, yo; if (outGradOnly) GradCoordOut(seed, i + PrimeX, j, xo, yo); else @@ -2324,8 +1868,16 @@ class FastNoiseLite } template - void SingleDomainWarpOpenSimplex2Gradient(int seed, float warpAmp, float frequency, FNfloat x, FNfloat y, FNfloat z, FNfloat& xr, FNfloat& yr, FNfloat& zr, bool outGradOnly) - { + void SingleDomainWarpOpenSimplex2Gradient(int64_t seed, + double warpAmp, + double frequency, + FNfloat x, + FNfloat y, + FNfloat z, + FNfloat& xr, + FNfloat& yr, + FNfloat& zr, + bool outGradOnly) { x *= frequency; y *= frequency; z *= frequency; @@ -2335,37 +1887,35 @@ class FastNoiseLite * const FNfloat R3 = (FNfloat)(2.0 / 3.0); * FNfloat r = (x + y + z) * R3; // Rotation, not skew * x = r - x; y = r - y; z = r - z; - */ + */ - int i = FastRound(x); - int j = FastRound(y); - int k = FastRound(z); - float x0 = (float)x - i; - float y0 = (float)y - j; - float z0 = (float)z - k; + int64_t i = FastRound(x); + int64_t j = FastRound(y); + int64_t k = FastRound(z); + double x0 = (double)x - i; + double y0 = (double)y - j; + double z0 = (double)z - k; - int xNSign = (int)(-x0 - 1.0f) | 1; - int yNSign = (int)(-y0 - 1.0f) | 1; - int zNSign = (int)(-z0 - 1.0f) | 1; + int64_t xNSign = (int64_t)(-x0 - 1.0) | 1; + int64_t yNSign = (int64_t)(-y0 - 1.0) | 1; + int64_t zNSign = (int64_t)(-z0 - 1.0) | 1; - float ax0 = xNSign * -x0; - float ay0 = yNSign * -y0; - float az0 = zNSign * -z0; + double ax0 = xNSign * -x0; + double ay0 = yNSign * -y0; + double az0 = zNSign * -z0; i *= PrimeX; j *= PrimeY; k *= PrimeZ; - float vx, vy, vz; + double vx, vy, vz; vx = vy = vz = 0; - float a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0); - for (int l = 0; l < 2; l++) - { - if (a > 0) - { - float aaaa = (a * a) * (a * a); - float xo, yo, zo; + double a = (0.6 - x0 * x0) - (y0 * y0 + z0 * z0); + for (int64_t l = 0; l < 2; l++) { + if (a > 0) { + double aaaa = (a * a) * (a * a); + double xo, yo, zo; if (outGradOnly) GradCoordOut(seed, i, j, k, xo, yo, zo); else @@ -2375,37 +1925,31 @@ class FastNoiseLite vz += aaaa * zo; } - float b = a + 1; - int i1 = i; - int j1 = j; - int k1 = k; - float x1 = x0; - float y1 = y0; - float z1 = z0; + double b = a + 1; + int64_t i1 = i; + int64_t j1 = j; + int64_t k1 = k; + double x1 = x0; + double y1 = y0; + double z1 = z0; - if (ax0 >= ay0 && ax0 >= az0) - { + if (ax0 >= ay0 && ax0 >= az0) { x1 += xNSign; b -= xNSign * 2 * x1; i1 -= xNSign * PrimeX; - } - else if (ay0 > ax0 && ay0 >= az0) - { + } else if (ay0 > ax0 && ay0 >= az0) { y1 += yNSign; b -= yNSign * 2 * y1; j1 -= yNSign * PrimeY; - } - else - { + } else { z1 += zNSign; b -= zNSign * 2 * z1; k1 -= zNSign * PrimeZ; } - if (b > 0) - { - float bbbb = (b * b) * (b * b); - float xo, yo, zo; + if (b > 0) { + double bbbb = (b * b) * (b * b); + double xo, yo, zo; if (outGradOnly) GradCoordOut(seed, i1, j1, k1, xo, yo, zo); else @@ -2415,17 +1959,18 @@ class FastNoiseLite vz += bbbb * zo; } - if (l == 1) break; + if (l == 1) + break; - ax0 = 0.5f - ax0; - ay0 = 0.5f - ay0; - az0 = 0.5f - az0; + ax0 = 0.5 - ax0; + ay0 = 0.5 - ay0; + az0 = 0.5 - az0; x0 = xNSign * ax0; y0 = yNSign * ay0; z0 = zNSign * az0; - a += (0.75f - ax0) - (ay0 + az0); + a += (0.75 - ax0) - (ay0 + az0); i += (xNSign >> 1) & PrimeX; j += (yNSign >> 1) & PrimeY; @@ -2452,135 +1997,279 @@ template <> struct FastNoiseLite::Arguments_must_be_floating_point_values {}; template -const T FastNoiseLite::Lookup::Gradients2D[] = -{ - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, 0.793353340291235f, 0.608761429008721f, - 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, - 0.793353340291235f, -0.60876142900872f, 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, -0.793353340291235f, -0.608761429008721f, - -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, - -0.793353340291235f, 0.608761429008721f, -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.38268343236509f, 0.923879532511287f, 0.923879532511287f, 0.38268343236509f, 0.923879532511287f, -0.38268343236509f, 0.38268343236509f, -0.923879532511287f, - -0.38268343236509f, -0.923879532511287f, -0.923879532511287f, -0.38268343236509f, -0.923879532511287f, 0.38268343236509f, -0.38268343236509f, 0.923879532511287f, +const T FastNoiseLite::Lookup::Gradients2D[] = { + 0.130526192220052, 0.99144486137381, 0.38268343236509, 0.923879532511287, 0.608761429008721, + 0.793353340291235, 0.793353340291235, 0.608761429008721, 0.923879532511287, 0.38268343236509, + 0.99144486137381, 0.130526192220051, 0.99144486137381, -0.130526192220051, 0.923879532511287, + -0.38268343236509, 0.793353340291235, -0.60876142900872, 0.608761429008721, -0.793353340291235, + 0.38268343236509, -0.923879532511287, 0.130526192220052, -0.99144486137381, -0.130526192220052, + -0.99144486137381, -0.38268343236509, -0.923879532511287, -0.608761429008721, -0.793353340291235, + -0.793353340291235, -0.608761429008721, -0.923879532511287, -0.38268343236509, -0.99144486137381, + -0.130526192220052, -0.99144486137381, 0.130526192220051, -0.923879532511287, 0.38268343236509, + -0.793353340291235, 0.608761429008721, -0.608761429008721, 0.793353340291235, -0.38268343236509, + 0.923879532511287, -0.130526192220052, 0.99144486137381, 0.130526192220052, 0.99144486137381, + 0.38268343236509, 0.923879532511287, 0.608761429008721, 0.793353340291235, 0.793353340291235, + 0.608761429008721, 0.923879532511287, 0.38268343236509, 0.99144486137381, 0.130526192220051, + 0.99144486137381, -0.130526192220051, 0.923879532511287, -0.38268343236509, 0.793353340291235, + -0.60876142900872, 0.608761429008721, -0.793353340291235, 0.38268343236509, -0.923879532511287, + 0.130526192220052, -0.99144486137381, -0.130526192220052, -0.99144486137381, -0.38268343236509, + -0.923879532511287, -0.608761429008721, -0.793353340291235, -0.793353340291235, -0.608761429008721, + -0.923879532511287, -0.38268343236509, -0.99144486137381, -0.130526192220052, -0.99144486137381, + 0.130526192220051, -0.923879532511287, 0.38268343236509, -0.793353340291235, 0.608761429008721, + -0.608761429008721, 0.793353340291235, -0.38268343236509, 0.923879532511287, -0.130526192220052, + 0.99144486137381, 0.130526192220052, 0.99144486137381, 0.38268343236509, 0.923879532511287, + 0.608761429008721, 0.793353340291235, 0.793353340291235, 0.608761429008721, 0.923879532511287, + 0.38268343236509, 0.99144486137381, 0.130526192220051, 0.99144486137381, -0.130526192220051, + 0.923879532511287, -0.38268343236509, 0.793353340291235, -0.60876142900872, 0.608761429008721, + -0.793353340291235, 0.38268343236509, -0.923879532511287, 0.130526192220052, -0.99144486137381, + -0.130526192220052, -0.99144486137381, -0.38268343236509, -0.923879532511287, -0.608761429008721, + -0.793353340291235, -0.793353340291235, -0.608761429008721, -0.923879532511287, -0.38268343236509, + -0.99144486137381, -0.130526192220052, -0.99144486137381, 0.130526192220051, -0.923879532511287, + 0.38268343236509, -0.793353340291235, 0.608761429008721, -0.608761429008721, 0.793353340291235, + -0.38268343236509, 0.923879532511287, -0.130526192220052, 0.99144486137381, 0.130526192220052, + 0.99144486137381, 0.38268343236509, 0.923879532511287, 0.608761429008721, 0.793353340291235, + 0.793353340291235, 0.608761429008721, 0.923879532511287, 0.38268343236509, 0.99144486137381, + 0.130526192220051, 0.99144486137381, -0.130526192220051, 0.923879532511287, -0.38268343236509, + 0.793353340291235, -0.60876142900872, 0.608761429008721, -0.793353340291235, 0.38268343236509, + -0.923879532511287, 0.130526192220052, -0.99144486137381, -0.130526192220052, -0.99144486137381, + -0.38268343236509, -0.923879532511287, -0.608761429008721, -0.793353340291235, -0.793353340291235, + -0.608761429008721, -0.923879532511287, -0.38268343236509, -0.99144486137381, -0.130526192220052, + -0.99144486137381, 0.130526192220051, -0.923879532511287, 0.38268343236509, -0.793353340291235, + 0.608761429008721, -0.608761429008721, 0.793353340291235, -0.38268343236509, 0.923879532511287, + -0.130526192220052, 0.99144486137381, 0.130526192220052, 0.99144486137381, 0.38268343236509, + 0.923879532511287, 0.608761429008721, 0.793353340291235, 0.793353340291235, 0.608761429008721, + 0.923879532511287, 0.38268343236509, 0.99144486137381, 0.130526192220051, 0.99144486137381, + -0.130526192220051, 0.923879532511287, -0.38268343236509, 0.793353340291235, -0.60876142900872, + 0.608761429008721, -0.793353340291235, 0.38268343236509, -0.923879532511287, 0.130526192220052, + -0.99144486137381, -0.130526192220052, -0.99144486137381, -0.38268343236509, -0.923879532511287, + -0.608761429008721, -0.793353340291235, -0.793353340291235, -0.608761429008721, -0.923879532511287, + -0.38268343236509, -0.99144486137381, -0.130526192220052, -0.99144486137381, 0.130526192220051, + -0.923879532511287, 0.38268343236509, -0.793353340291235, 0.608761429008721, -0.608761429008721, + 0.793353340291235, -0.38268343236509, 0.923879532511287, -0.130526192220052, 0.99144486137381, + 0.38268343236509, 0.923879532511287, 0.923879532511287, 0.38268343236509, 0.923879532511287, + -0.38268343236509, 0.38268343236509, -0.923879532511287, -0.38268343236509, -0.923879532511287, + -0.923879532511287, -0.38268343236509, -0.923879532511287, 0.38268343236509, -0.38268343236509, + 0.923879532511287, }; template -const T FastNoiseLite::Lookup::RandVecs2D[] = -{ - -0.2700222198f, -0.9628540911f, 0.3863092627f, -0.9223693152f, 0.04444859006f, -0.999011673f, -0.5992523158f, -0.8005602176f, -0.7819280288f, 0.6233687174f, 0.9464672271f, 0.3227999196f, -0.6514146797f, -0.7587218957f, 0.9378472289f, 0.347048376f, - -0.8497875957f, -0.5271252623f, -0.879042592f, 0.4767432447f, -0.892300288f, -0.4514423508f, -0.379844434f, -0.9250503802f, -0.9951650832f, 0.0982163789f, 0.7724397808f, -0.6350880136f, 0.7573283322f, -0.6530343002f, -0.9928004525f, -0.119780055f, - -0.0532665713f, 0.9985803285f, 0.9754253726f, -0.2203300762f, -0.7665018163f, 0.6422421394f, 0.991636706f, 0.1290606184f, -0.994696838f, 0.1028503788f, -0.5379205513f, -0.84299554f, 0.5022815471f, -0.8647041387f, 0.4559821461f, -0.8899889226f, - -0.8659131224f, -0.5001944266f, 0.0879458407f, -0.9961252577f, -0.5051684983f, 0.8630207346f, 0.7753185226f, -0.6315704146f, -0.6921944612f, 0.7217110418f, -0.5191659449f, -0.8546734591f, 0.8978622882f, -0.4402764035f, -0.1706774107f, 0.9853269617f, - -0.9353430106f, -0.3537420705f, -0.9992404798f, 0.03896746794f, -0.2882064021f, -0.9575683108f, -0.9663811329f, 0.2571137995f, -0.8759714238f, -0.4823630009f, -0.8303123018f, -0.5572983775f, 0.05110133755f, -0.9986934731f, -0.8558373281f, -0.5172450752f, - 0.09887025282f, 0.9951003332f, 0.9189016087f, 0.3944867976f, -0.2439375892f, -0.9697909324f, -0.8121409387f, -0.5834613061f, -0.9910431363f, 0.1335421355f, 0.8492423985f, -0.5280031709f, -0.9717838994f, -0.2358729591f, 0.9949457207f, 0.1004142068f, - 0.6241065508f, -0.7813392434f, 0.662910307f, 0.7486988212f, -0.7197418176f, 0.6942418282f, -0.8143370775f, -0.5803922158f, 0.104521054f, -0.9945226741f, -0.1065926113f, -0.9943027784f, 0.445799684f, -0.8951327509f, 0.105547406f, 0.9944142724f, - -0.992790267f, 0.1198644477f, -0.8334366408f, 0.552615025f, 0.9115561563f, -0.4111755999f, 0.8285544909f, -0.5599084351f, 0.7217097654f, -0.6921957921f, 0.4940492677f, -0.8694339084f, -0.3652321272f, -0.9309164803f, -0.9696606758f, 0.2444548501f, - 0.08925509731f, -0.996008799f, 0.5354071276f, -0.8445941083f, -0.1053576186f, 0.9944343981f, -0.9890284586f, 0.1477251101f, 0.004856104961f, 0.9999882091f, 0.9885598478f, 0.1508291331f, 0.9286129562f, -0.3710498316f, -0.5832393863f, -0.8123003252f, - 0.3015207509f, 0.9534596146f, -0.9575110528f, 0.2883965738f, 0.9715802154f, -0.2367105511f, 0.229981792f, 0.9731949318f, 0.955763816f, -0.2941352207f, 0.740956116f, 0.6715534485f, -0.9971513787f, -0.07542630764f, 0.6905710663f, -0.7232645452f, - -0.290713703f, -0.9568100872f, 0.5912777791f, -0.8064679708f, -0.9454592212f, -0.325740481f, 0.6664455681f, 0.74555369f, 0.6236134912f, 0.7817328275f, 0.9126993851f, -0.4086316587f, -0.8191762011f, 0.5735419353f, -0.8812745759f, -0.4726046147f, - 0.9953313627f, 0.09651672651f, 0.9855650846f, -0.1692969699f, -0.8495980887f, 0.5274306472f, 0.6174853946f, -0.7865823463f, 0.8508156371f, 0.52546432f, 0.9985032451f, -0.05469249926f, 0.1971371563f, -0.9803759185f, 0.6607855748f, -0.7505747292f, - -0.03097494063f, 0.9995201614f, -0.6731660801f, 0.739491331f, -0.7195018362f, -0.6944905383f, 0.9727511689f, 0.2318515979f, 0.9997059088f, -0.0242506907f, 0.4421787429f, -0.8969269532f, 0.9981350961f, -0.061043673f, -0.9173660799f, -0.3980445648f, - -0.8150056635f, -0.5794529907f, -0.8789331304f, 0.4769450202f, 0.0158605829f, 0.999874213f, -0.8095464474f, 0.5870558317f, -0.9165898907f, -0.3998286786f, -0.8023542565f, 0.5968480938f, -0.5176737917f, 0.8555780767f, -0.8154407307f, -0.5788405779f, - 0.4022010347f, -0.9155513791f, -0.9052556868f, -0.4248672045f, 0.7317445619f, 0.6815789728f, -0.5647632201f, -0.8252529947f, -0.8403276335f, -0.5420788397f, -0.9314281527f, 0.363925262f, 0.5238198472f, 0.8518290719f, 0.7432803869f, -0.6689800195f, - -0.985371561f, -0.1704197369f, 0.4601468731f, 0.88784281f, 0.825855404f, 0.5638819483f, 0.6182366099f, 0.7859920446f, 0.8331502863f, -0.553046653f, 0.1500307506f, 0.9886813308f, -0.662330369f, -0.7492119075f, -0.668598664f, 0.743623444f, - 0.7025606278f, 0.7116238924f, -0.5419389763f, -0.8404178401f, -0.3388616456f, 0.9408362159f, 0.8331530315f, 0.5530425174f, -0.2989720662f, -0.9542618632f, 0.2638522993f, 0.9645630949f, 0.124108739f, -0.9922686234f, -0.7282649308f, -0.6852956957f, - 0.6962500149f, 0.7177993569f, -0.9183535368f, 0.3957610156f, -0.6326102274f, -0.7744703352f, -0.9331891859f, -0.359385508f, -0.1153779357f, -0.9933216659f, 0.9514974788f, -0.3076565421f, -0.08987977445f, -0.9959526224f, 0.6678496916f, 0.7442961705f, - 0.7952400393f, -0.6062947138f, -0.6462007402f, -0.7631674805f, -0.2733598753f, 0.9619118351f, 0.9669590226f, -0.254931851f, -0.9792894595f, 0.2024651934f, -0.5369502995f, -0.8436138784f, -0.270036471f, -0.9628500944f, -0.6400277131f, 0.7683518247f, - -0.7854537493f, -0.6189203566f, 0.06005905383f, -0.9981948257f, -0.02455770378f, 0.9996984141f, -0.65983623f, 0.751409442f, -0.6253894466f, -0.7803127835f, -0.6210408851f, -0.7837781695f, 0.8348888491f, 0.5504185768f, -0.1592275245f, 0.9872419133f, - 0.8367622488f, 0.5475663786f, -0.8675753916f, -0.4973056806f, -0.2022662628f, -0.9793305667f, 0.9399189937f, 0.3413975472f, 0.9877404807f, -0.1561049093f, -0.9034455656f, 0.4287028224f, 0.1269804218f, -0.9919052235f, -0.3819600854f, 0.924178821f, - 0.9754625894f, 0.2201652486f, -0.3204015856f, -0.9472818081f, -0.9874760884f, 0.1577687387f, 0.02535348474f, -0.9996785487f, 0.4835130794f, -0.8753371362f, -0.2850799925f, -0.9585037287f, -0.06805516006f, -0.99768156f, -0.7885244045f, -0.6150034663f, - 0.3185392127f, -0.9479096845f, 0.8880043089f, 0.4598351306f, 0.6476921488f, -0.7619021462f, 0.9820241299f, 0.1887554194f, 0.9357275128f, -0.3527237187f, -0.8894895414f, 0.4569555293f, 0.7922791302f, 0.6101588153f, 0.7483818261f, 0.6632681526f, - -0.7288929755f, -0.6846276581f, 0.8729032783f, -0.4878932944f, 0.8288345784f, 0.5594937369f, 0.08074567077f, 0.9967347374f, 0.9799148216f, -0.1994165048f, -0.580730673f, -0.8140957471f, -0.4700049791f, -0.8826637636f, 0.2409492979f, 0.9705377045f, - 0.9437816757f, -0.3305694308f, -0.8927998638f, -0.4504535528f, -0.8069622304f, 0.5906030467f, 0.06258973166f, 0.9980393407f, -0.9312597469f, 0.3643559849f, 0.5777449785f, 0.8162173362f, -0.3360095855f, -0.941858566f, 0.697932075f, -0.7161639607f, - -0.002008157227f, -0.9999979837f, -0.1827294312f, -0.9831632392f, -0.6523911722f, 0.7578824173f, -0.4302626911f, -0.9027037258f, -0.9985126289f, -0.05452091251f, -0.01028102172f, -0.9999471489f, -0.4946071129f, 0.8691166802f, -0.2999350194f, 0.9539596344f, - 0.8165471961f, 0.5772786819f, 0.2697460475f, 0.962931498f, -0.7306287391f, -0.6827749597f, -0.7590952064f, -0.6509796216f, -0.907053853f, 0.4210146171f, -0.5104861064f, -0.8598860013f, 0.8613350597f, 0.5080373165f, 0.5007881595f, -0.8655698812f, - -0.654158152f, 0.7563577938f, -0.8382755311f, -0.545246856f, 0.6940070834f, 0.7199681717f, 0.06950936031f, 0.9975812994f, 0.1702942185f, -0.9853932612f, 0.2695973274f, 0.9629731466f, 0.5519612192f, -0.8338697815f, 0.225657487f, -0.9742067022f, - 0.4215262855f, -0.9068161835f, 0.4881873305f, -0.8727388672f, -0.3683854996f, -0.9296731273f, -0.9825390578f, 0.1860564427f, 0.81256471f, 0.5828709909f, 0.3196460933f, -0.9475370046f, 0.9570913859f, 0.2897862643f, -0.6876655497f, -0.7260276109f, - -0.9988770922f, -0.047376731f, -0.1250179027f, 0.992154486f, -0.8280133617f, 0.560708367f, 0.9324863769f, -0.3612051451f, 0.6394653183f, 0.7688199442f, -0.01623847064f, -0.9998681473f, -0.9955014666f, -0.09474613458f, -0.81453315f, 0.580117012f, - 0.4037327978f, -0.9148769469f, 0.9944263371f, 0.1054336766f, -0.1624711654f, 0.9867132919f, -0.9949487814f, -0.100383875f, -0.6995302564f, 0.7146029809f, 0.5263414922f, -0.85027327f, -0.5395221479f, 0.841971408f, 0.6579370318f, 0.7530729462f, - 0.01426758847f, -0.9998982128f, -0.6734383991f, 0.7392433447f, 0.639412098f, -0.7688642071f, 0.9211571421f, 0.3891908523f, -0.146637214f, -0.9891903394f, -0.782318098f, 0.6228791163f, -0.5039610839f, -0.8637263605f, -0.7743120191f, -0.6328039957f, +const T FastNoiseLite::Lookup::RandVecs2D[] = { + -0.2700222198, -0.9628540911, 0.3863092627, -0.9223693152, 0.04444859006, -0.999011673, -0.5992523158, + -0.8005602176, -0.7819280288, 0.6233687174, 0.9464672271, 0.3227999196, -0.6514146797, -0.7587218957, + 0.9378472289, 0.347048376, -0.8497875957, -0.5271252623, -0.879042592, 0.4767432447, -0.892300288, + -0.4514423508, -0.379844434, -0.9250503802, -0.9951650832, 0.0982163789, 0.7724397808, -0.6350880136, + 0.7573283322, -0.6530343002, -0.9928004525, -0.119780055, -0.0532665713, 0.9985803285, 0.9754253726, + -0.2203300762, -0.7665018163, 0.6422421394, 0.991636706, 0.1290606184, -0.994696838, 0.1028503788, + -0.5379205513, -0.84299554, 0.5022815471, -0.8647041387, 0.4559821461, -0.8899889226, -0.8659131224, + -0.5001944266, 0.0879458407, -0.9961252577, -0.5051684983, 0.8630207346, 0.7753185226, -0.6315704146, + -0.6921944612, 0.7217110418, -0.5191659449, -0.8546734591, 0.8978622882, -0.4402764035, -0.1706774107, + 0.9853269617, -0.9353430106, -0.3537420705, -0.9992404798, 0.03896746794, -0.2882064021, -0.9575683108, + -0.9663811329, 0.2571137995, -0.8759714238, -0.4823630009, -0.8303123018, -0.5572983775, 0.05110133755, + -0.9986934731, -0.8558373281, -0.5172450752, 0.09887025282, 0.9951003332, 0.9189016087, 0.3944867976, + -0.2439375892, -0.9697909324, -0.8121409387, -0.5834613061, -0.9910431363, 0.1335421355, 0.8492423985, + -0.5280031709, -0.9717838994, -0.2358729591, 0.9949457207, 0.1004142068, 0.6241065508, -0.7813392434, + 0.662910307, 0.7486988212, -0.7197418176, 0.6942418282, -0.8143370775, -0.5803922158, 0.104521054, + -0.9945226741, -0.1065926113, -0.9943027784, 0.445799684, -0.8951327509, 0.105547406, 0.9944142724, + -0.992790267, 0.1198644477, -0.8334366408, 0.552615025, 0.9115561563, -0.4111755999, 0.8285544909, + -0.5599084351, 0.7217097654, -0.6921957921, 0.4940492677, -0.8694339084, -0.3652321272, -0.9309164803, + -0.9696606758, 0.2444548501, 0.08925509731, -0.996008799, 0.5354071276, -0.8445941083, -0.1053576186, + 0.9944343981, -0.9890284586, 0.1477251101, 0.004856104961, 0.9999882091, 0.9885598478, 0.1508291331, + 0.9286129562, -0.3710498316, -0.5832393863, -0.8123003252, 0.3015207509, 0.9534596146, -0.9575110528, + 0.2883965738, 0.9715802154, -0.2367105511, 0.229981792, 0.9731949318, 0.955763816, -0.2941352207, + 0.740956116, 0.6715534485, -0.9971513787, -0.07542630764, 0.6905710663, -0.7232645452, -0.290713703, + -0.9568100872, 0.5912777791, -0.8064679708, -0.9454592212, -0.325740481, 0.6664455681, 0.74555369, + 0.6236134912, 0.7817328275, 0.9126993851, -0.4086316587, -0.8191762011, 0.5735419353, -0.8812745759, + -0.4726046147, 0.9953313627, 0.09651672651, 0.9855650846, -0.1692969699, -0.8495980887, 0.5274306472, + 0.6174853946, -0.7865823463, 0.8508156371, 0.52546432, 0.9985032451, -0.05469249926, 0.1971371563, + -0.9803759185, 0.6607855748, -0.7505747292, -0.03097494063, 0.9995201614, -0.6731660801, 0.739491331, + -0.7195018362, -0.6944905383, 0.9727511689, 0.2318515979, 0.9997059088, -0.0242506907, 0.4421787429, + -0.8969269532, 0.9981350961, -0.061043673, -0.9173660799, -0.3980445648, -0.8150056635, -0.5794529907, + -0.8789331304, 0.4769450202, 0.0158605829, 0.999874213, -0.8095464474, 0.5870558317, -0.9165898907, + -0.3998286786, -0.8023542565, 0.5968480938, -0.5176737917, 0.8555780767, -0.8154407307, -0.5788405779, + 0.4022010347, -0.9155513791, -0.9052556868, -0.4248672045, 0.7317445619, 0.6815789728, -0.5647632201, + -0.8252529947, -0.8403276335, -0.5420788397, -0.9314281527, 0.363925262, 0.5238198472, 0.8518290719, + 0.7432803869, -0.6689800195, -0.985371561, -0.1704197369, 0.4601468731, 0.88784281, 0.825855404, + 0.5638819483, 0.6182366099, 0.7859920446, 0.8331502863, -0.553046653, 0.1500307506, 0.9886813308, + -0.662330369, -0.7492119075, -0.668598664, 0.743623444, 0.7025606278, 0.7116238924, -0.5419389763, + -0.8404178401, -0.3388616456, 0.9408362159, 0.8331530315, 0.5530425174, -0.2989720662, -0.9542618632, + 0.2638522993, 0.9645630949, 0.124108739, -0.9922686234, -0.7282649308, -0.6852956957, 0.6962500149, + 0.7177993569, -0.9183535368, 0.3957610156, -0.6326102274, -0.7744703352, -0.9331891859, -0.359385508, + -0.1153779357, -0.9933216659, 0.9514974788, -0.3076565421, -0.08987977445, -0.9959526224, 0.6678496916, + 0.7442961705, 0.7952400393, -0.6062947138, -0.6462007402, -0.7631674805, -0.2733598753, 0.9619118351, + 0.9669590226, -0.254931851, -0.9792894595, 0.2024651934, -0.5369502995, -0.8436138784, -0.270036471, + -0.9628500944, -0.6400277131, 0.7683518247, -0.7854537493, -0.6189203566, 0.06005905383, -0.9981948257, + -0.02455770378, 0.9996984141, -0.65983623, 0.751409442, -0.6253894466, -0.7803127835, -0.6210408851, + -0.7837781695, 0.8348888491, 0.5504185768, -0.1592275245, 0.9872419133, 0.8367622488, 0.5475663786, + -0.8675753916, -0.4973056806, -0.2022662628, -0.9793305667, 0.9399189937, 0.3413975472, 0.9877404807, + -0.1561049093, -0.9034455656, 0.4287028224, 0.1269804218, -0.9919052235, -0.3819600854, 0.924178821, + 0.9754625894, 0.2201652486, -0.3204015856, -0.9472818081, -0.9874760884, 0.1577687387, 0.02535348474, + -0.9996785487, 0.4835130794, -0.8753371362, -0.2850799925, -0.9585037287, -0.06805516006, -0.99768156, + -0.7885244045, -0.6150034663, 0.3185392127, -0.9479096845, 0.8880043089, 0.4598351306, 0.6476921488, + -0.7619021462, 0.9820241299, 0.1887554194, 0.9357275128, -0.3527237187, -0.8894895414, 0.4569555293, + 0.7922791302, 0.6101588153, 0.7483818261, 0.6632681526, -0.7288929755, -0.6846276581, 0.8729032783, + -0.4878932944, 0.8288345784, 0.5594937369, 0.08074567077, 0.9967347374, 0.9799148216, -0.1994165048, + -0.580730673, -0.8140957471, -0.4700049791, -0.8826637636, 0.2409492979, 0.9705377045, 0.9437816757, + -0.3305694308, -0.8927998638, -0.4504535528, -0.8069622304, 0.5906030467, 0.06258973166, 0.9980393407, + -0.9312597469, 0.3643559849, 0.5777449785, 0.8162173362, -0.3360095855, -0.941858566, 0.697932075, + -0.7161639607, -0.002008157227, -0.9999979837, -0.1827294312, -0.9831632392, -0.6523911722, 0.7578824173, + -0.4302626911, -0.9027037258, -0.9985126289, -0.05452091251, -0.01028102172, -0.9999471489, -0.4946071129, + 0.8691166802, -0.2999350194, 0.9539596344, 0.8165471961, 0.5772786819, 0.2697460475, 0.962931498, + -0.7306287391, -0.6827749597, -0.7590952064, -0.6509796216, -0.907053853, 0.4210146171, -0.5104861064, + -0.8598860013, 0.8613350597, 0.5080373165, 0.5007881595, -0.8655698812, -0.654158152, 0.7563577938, + -0.8382755311, -0.545246856, 0.6940070834, 0.7199681717, 0.06950936031, 0.9975812994, 0.1702942185, + -0.9853932612, 0.2695973274, 0.9629731466, 0.5519612192, -0.8338697815, 0.225657487, -0.9742067022, + 0.4215262855, -0.9068161835, 0.4881873305, -0.8727388672, -0.3683854996, -0.9296731273, -0.9825390578, + 0.1860564427, 0.81256471, 0.5828709909, 0.3196460933, -0.9475370046, 0.9570913859, 0.2897862643, + -0.6876655497, -0.7260276109, -0.9988770922, -0.047376731, -0.1250179027, 0.992154486, -0.8280133617, + 0.560708367, 0.9324863769, -0.3612051451, 0.6394653183, 0.7688199442, -0.01623847064, -0.9998681473, + -0.9955014666, -0.09474613458, -0.81453315, 0.580117012, 0.4037327978, -0.9148769469, 0.9944263371, + 0.1054336766, -0.1624711654, 0.9867132919, -0.9949487814, -0.100383875, -0.6995302564, 0.7146029809, + 0.5263414922, -0.85027327, -0.5395221479, 0.841971408, 0.6579370318, 0.7530729462, 0.01426758847, + -0.9998982128, -0.6734383991, 0.7392433447, 0.639412098, -0.7688642071, 0.9211571421, 0.3891908523, + -0.146637214, -0.9891903394, -0.782318098, 0.6228791163, -0.5039610839, -0.8637263605, -0.7743120191, + -0.6328039957, }; template -const T FastNoiseLite::Lookup::Gradients3D[] = -{ - 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, - 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, - 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, - 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, - 0, 1, 1, 0, 0,-1, 1, 0, 0, 1,-1, 0, 0,-1,-1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0,-1, 0, -1, 0,-1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1,-1, 0, 0, -1,-1, 0, 0, - 1, 1, 0, 0, 0,-1, 1, 0, -1, 1, 0, 0, 0,-1,-1, 0 -}; +const T FastNoiseLite::Lookup::Gradients3D[] = { + 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, + 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, + 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, + 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, + 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, + 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, 1, 1, 0, 0, 0, -1, 1, 0, -1, 1, 0, 0, 0, -1, -1, 0}; template -const T FastNoiseLite::Lookup::RandVecs3D[] = -{ - -0.7292736885f, -0.6618439697f, 0.1735581948f, 0, 0.790292081f, -0.5480887466f, -0.2739291014f, 0, 0.7217578935f, 0.6226212466f, -0.3023380997f, 0, 0.565683137f, -0.8208298145f, -0.0790000257f, 0, 0.760049034f, -0.5555979497f, -0.3370999617f, 0, 0.3713945616f, 0.5011264475f, 0.7816254623f, 0, -0.1277062463f, -0.4254438999f, -0.8959289049f, 0, -0.2881560924f, -0.5815838982f, 0.7607405838f, 0, - 0.5849561111f, -0.662820239f, -0.4674352136f, 0, 0.3307171178f, 0.0391653737f, 0.94291689f, 0, 0.8712121778f, -0.4113374369f, -0.2679381538f, 0, 0.580981015f, 0.7021915846f, 0.4115677815f, 0, 0.503756873f, 0.6330056931f, -0.5878203852f, 0, 0.4493712205f, 0.601390195f, 0.6606022552f, 0, -0.6878403724f, 0.09018890807f, -0.7202371714f, 0, -0.5958956522f, -0.6469350577f, 0.475797649f, 0, - -0.5127052122f, 0.1946921978f, -0.8361987284f, 0, -0.9911507142f, -0.05410276466f, -0.1212153153f, 0, -0.2149721042f, 0.9720882117f, -0.09397607749f, 0, -0.7518650936f, -0.5428057603f, 0.3742469607f, 0, 0.5237068895f, 0.8516377189f, -0.02107817834f, 0, 0.6333504779f, 0.1926167129f, -0.7495104896f, 0, -0.06788241606f, 0.3998305789f, 0.9140719259f, 0, -0.5538628599f, -0.4729896695f, -0.6852128902f, 0, - -0.7261455366f, -0.5911990757f, 0.3509933228f, 0, -0.9229274737f, -0.1782808786f, 0.3412049336f, 0, -0.6968815002f, 0.6511274338f, 0.3006480328f, 0, 0.9608044783f, -0.2098363234f, -0.1811724921f, 0, 0.06817146062f, -0.9743405129f, 0.2145069156f, 0, -0.3577285196f, -0.6697087264f, -0.6507845481f, 0, -0.1868621131f, 0.7648617052f, -0.6164974636f, 0, -0.6541697588f, 0.3967914832f, 0.6439087246f, 0, - 0.6993340405f, -0.6164538506f, 0.3618239211f, 0, -0.1546665739f, 0.6291283928f, 0.7617583057f, 0, -0.6841612949f, -0.2580482182f, -0.6821542638f, 0, 0.5383980957f, 0.4258654885f, 0.7271630328f, 0, -0.5026987823f, -0.7939832935f, -0.3418836993f, 0, 0.3202971715f, 0.2834415347f, 0.9039195862f, 0, 0.8683227101f, -0.0003762656404f, -0.4959995258f, 0, 0.791120031f, -0.08511045745f, 0.6057105799f, 0, - -0.04011016052f, -0.4397248749f, 0.8972364289f, 0, 0.9145119872f, 0.3579346169f, -0.1885487608f, 0, -0.9612039066f, -0.2756484276f, 0.01024666929f, 0, 0.6510361721f, -0.2877799159f, -0.7023778346f, 0, -0.2041786351f, 0.7365237271f, 0.644859585f, 0, -0.7718263711f, 0.3790626912f, 0.5104855816f, 0, -0.3060082741f, -0.7692987727f, 0.5608371729f, 0, 0.454007341f, -0.5024843065f, 0.7357899537f, 0, - 0.4816795475f, 0.6021208291f, -0.6367380315f, 0, 0.6961980369f, -0.3222197429f, 0.641469197f, 0, -0.6532160499f, -0.6781148932f, 0.3368515753f, 0, 0.5089301236f, -0.6154662304f, -0.6018234363f, 0, -0.1635919754f, -0.9133604627f, -0.372840892f, 0, 0.52408019f, -0.8437664109f, 0.1157505864f, 0, 0.5902587356f, 0.4983817807f, -0.6349883666f, 0, 0.5863227872f, 0.494764745f, 0.6414307729f, 0, - 0.6779335087f, 0.2341345225f, 0.6968408593f, 0, 0.7177054546f, -0.6858979348f, 0.120178631f, 0, -0.5328819713f, -0.5205125012f, 0.6671608058f, 0, -0.8654874251f, -0.0700727088f, -0.4960053754f, 0, -0.2861810166f, 0.7952089234f, 0.5345495242f, 0, -0.04849529634f, 0.9810836427f, -0.1874115585f, 0, -0.6358521667f, 0.6058348682f, 0.4781800233f, 0, 0.6254794696f, -0.2861619734f, 0.7258696564f, 0, - -0.2585259868f, 0.5061949264f, -0.8227581726f, 0, 0.02136306781f, 0.5064016808f, -0.8620330371f, 0, 0.200111773f, 0.8599263484f, 0.4695550591f, 0, 0.4743561372f, 0.6014985084f, -0.6427953014f, 0, 0.6622993731f, -0.5202474575f, -0.5391679918f, 0, 0.08084972818f, -0.6532720452f, 0.7527940996f, 0, -0.6893687501f, 0.0592860349f, 0.7219805347f, 0, -0.1121887082f, -0.9673185067f, 0.2273952515f, 0, - 0.7344116094f, 0.5979668656f, -0.3210532909f, 0, 0.5789393465f, -0.2488849713f, 0.7764570201f, 0, 0.6988182827f, 0.3557169806f, -0.6205791146f, 0, -0.8636845529f, -0.2748771249f, -0.4224826141f, 0, -0.4247027957f, -0.4640880967f, 0.777335046f, 0, 0.5257722489f, -0.8427017621f, 0.1158329937f, 0, 0.9343830603f, 0.316302472f, -0.1639543925f, 0, -0.1016836419f, -0.8057303073f, -0.5834887393f, 0, - -0.6529238969f, 0.50602126f, -0.5635892736f, 0, -0.2465286165f, -0.9668205684f, -0.06694497494f, 0, -0.9776897119f, -0.2099250524f, -0.007368825344f, 0, 0.7736893337f, 0.5734244712f, 0.2694238123f, 0, -0.6095087895f, 0.4995678998f, 0.6155736747f, 0, 0.5794535482f, 0.7434546771f, 0.3339292269f, 0, -0.8226211154f, 0.08142581855f, 0.5627293636f, 0, -0.510385483f, 0.4703667658f, 0.7199039967f, 0, - -0.5764971849f, -0.07231656274f, -0.8138926898f, 0, 0.7250628871f, 0.3949971505f, -0.5641463116f, 0, -0.1525424005f, 0.4860840828f, -0.8604958341f, 0, -0.5550976208f, -0.4957820792f, 0.667882296f, 0, -0.1883614327f, 0.9145869398f, 0.357841725f, 0, 0.7625556724f, -0.5414408243f, -0.3540489801f, 0, -0.5870231946f, -0.3226498013f, -0.7424963803f, 0, 0.3051124198f, 0.2262544068f, -0.9250488391f, 0, - 0.6379576059f, 0.577242424f, -0.5097070502f, 0, -0.5966775796f, 0.1454852398f, -0.7891830656f, 0, -0.658330573f, 0.6555487542f, -0.3699414651f, 0, 0.7434892426f, 0.2351084581f, 0.6260573129f, 0, 0.5562114096f, 0.8264360377f, -0.0873632843f, 0, -0.3028940016f, -0.8251527185f, 0.4768419182f, 0, 0.1129343818f, -0.985888439f, -0.1235710781f, 0, 0.5937652891f, -0.5896813806f, 0.5474656618f, 0, - 0.6757964092f, -0.5835758614f, -0.4502648413f, 0, 0.7242302609f, -0.1152719764f, 0.6798550586f, 0, -0.9511914166f, 0.0753623979f, -0.2992580792f, 0, 0.2539470961f, -0.1886339355f, 0.9486454084f, 0, 0.571433621f, -0.1679450851f, -0.8032795685f, 0, -0.06778234979f, 0.3978269256f, 0.9149531629f, 0, 0.6074972649f, 0.733060024f, -0.3058922593f, 0, -0.5435478392f, 0.1675822484f, 0.8224791405f, 0, - -0.5876678086f, -0.3380045064f, -0.7351186982f, 0, -0.7967562402f, 0.04097822706f, -0.6029098428f, 0, -0.1996350917f, 0.8706294745f, 0.4496111079f, 0, -0.02787660336f, -0.9106232682f, -0.4122962022f, 0, -0.7797625996f, -0.6257634692f, 0.01975775581f, 0, -0.5211232846f, 0.7401644346f, -0.4249554471f, 0, 0.8575424857f, 0.4053272873f, -0.3167501783f, 0, 0.1045223322f, 0.8390195772f, -0.5339674439f, 0, - 0.3501822831f, 0.9242524096f, -0.1520850155f, 0, 0.1987849858f, 0.07647613266f, 0.9770547224f, 0, 0.7845996363f, 0.6066256811f, -0.1280964233f, 0, 0.09006737436f, -0.9750989929f, -0.2026569073f, 0, -0.8274343547f, -0.542299559f, 0.1458203587f, 0, -0.3485797732f, -0.415802277f, 0.840000362f, 0, -0.2471778936f, -0.7304819962f, -0.6366310879f, 0, -0.3700154943f, 0.8577948156f, 0.3567584454f, 0, - 0.5913394901f, -0.548311967f, -0.5913303597f, 0, 0.1204873514f, -0.7626472379f, -0.6354935001f, 0, 0.616959265f, 0.03079647928f, 0.7863922953f, 0, 0.1258156836f, -0.6640829889f, -0.7369967419f, 0, -0.6477565124f, -0.1740147258f, -0.7417077429f, 0, 0.6217889313f, -0.7804430448f, -0.06547655076f, 0, 0.6589943422f, -0.6096987708f, 0.4404473475f, 0, -0.2689837504f, -0.6732403169f, -0.6887635427f, 0, - -0.3849775103f, 0.5676542638f, 0.7277093879f, 0, 0.5754444408f, 0.8110471154f, -0.1051963504f, 0, 0.9141593684f, 0.3832947817f, 0.131900567f, 0, -0.107925319f, 0.9245493968f, 0.3654593525f, 0, 0.377977089f, 0.3043148782f, 0.8743716458f, 0, -0.2142885215f, -0.8259286236f, 0.5214617324f, 0, 0.5802544474f, 0.4148098596f, -0.7008834116f, 0, -0.1982660881f, 0.8567161266f, -0.4761596756f, 0, - -0.03381553704f, 0.3773180787f, -0.9254661404f, 0, -0.6867922841f, -0.6656597827f, 0.2919133642f, 0, 0.7731742607f, -0.2875793547f, -0.5652430251f, 0, -0.09655941928f, 0.9193708367f, -0.3813575004f, 0, 0.2715702457f, -0.9577909544f, -0.09426605581f, 0, 0.2451015704f, -0.6917998565f, -0.6792188003f, 0, 0.977700782f, -0.1753855374f, 0.1155036542f, 0, -0.5224739938f, 0.8521606816f, 0.02903615945f, 0, - -0.7734880599f, -0.5261292347f, 0.3534179531f, 0, -0.7134492443f, -0.269547243f, 0.6467878011f, 0, 0.1644037271f, 0.5105846203f, -0.8439637196f, 0, 0.6494635788f, 0.05585611296f, 0.7583384168f, 0, -0.4711970882f, 0.5017280509f, -0.7254255765f, 0, -0.6335764307f, -0.2381686273f, -0.7361091029f, 0, -0.9021533097f, -0.270947803f, -0.3357181763f, 0, -0.3793711033f, 0.872258117f, 0.3086152025f, 0, - -0.6855598966f, -0.3250143309f, 0.6514394162f, 0, 0.2900942212f, -0.7799057743f, -0.5546100667f, 0, -0.2098319339f, 0.85037073f, 0.4825351604f, 0, -0.4592603758f, 0.6598504336f, -0.5947077538f, 0, 0.8715945488f, 0.09616365406f, -0.4807031248f, 0, -0.6776666319f, 0.7118504878f, -0.1844907016f, 0, 0.7044377633f, 0.312427597f, 0.637304036f, 0, -0.7052318886f, -0.2401093292f, -0.6670798253f, 0, - 0.081921007f, -0.7207336136f, -0.6883545647f, 0, -0.6993680906f, -0.5875763221f, -0.4069869034f, 0, -0.1281454481f, 0.6419895885f, 0.7559286424f, 0, -0.6337388239f, -0.6785471501f, -0.3714146849f, 0, 0.5565051903f, -0.2168887573f, -0.8020356851f, 0, -0.5791554484f, 0.7244372011f, -0.3738578718f, 0, 0.1175779076f, -0.7096451073f, 0.6946792478f, 0, -0.6134619607f, 0.1323631078f, 0.7785527795f, 0, - 0.6984635305f, -0.02980516237f, -0.715024719f, 0, 0.8318082963f, -0.3930171956f, 0.3919597455f, 0, 0.1469576422f, 0.05541651717f, -0.9875892167f, 0, 0.708868575f, -0.2690503865f, 0.6520101478f, 0, 0.2726053183f, 0.67369766f, -0.68688995f, 0, -0.6591295371f, 0.3035458599f, -0.6880466294f, 0, 0.4815131379f, -0.7528270071f, 0.4487723203f, 0, 0.9430009463f, 0.1675647412f, -0.2875261255f, 0, - 0.434802957f, 0.7695304522f, -0.4677277752f, 0, 0.3931996188f, 0.594473625f, 0.7014236729f, 0, 0.7254336655f, -0.603925654f, 0.3301814672f, 0, 0.7590235227f, -0.6506083235f, 0.02433313207f, 0, -0.8552768592f, -0.3430042733f, 0.3883935666f, 0, -0.6139746835f, 0.6981725247f, 0.3682257648f, 0, -0.7465905486f, -0.5752009504f, 0.3342849376f, 0, 0.5730065677f, 0.810555537f, -0.1210916791f, 0, - -0.9225877367f, -0.3475211012f, -0.167514036f, 0, -0.7105816789f, -0.4719692027f, -0.5218416899f, 0, -0.08564609717f, 0.3583001386f, 0.929669703f, 0, -0.8279697606f, -0.2043157126f, 0.5222271202f, 0, 0.427944023f, 0.278165994f, 0.8599346446f, 0, 0.5399079671f, -0.7857120652f, -0.3019204161f, 0, 0.5678404253f, -0.5495413974f, -0.6128307303f, 0, -0.9896071041f, 0.1365639107f, -0.04503418428f, 0, - -0.6154342638f, -0.6440875597f, 0.4543037336f, 0, 0.1074204368f, -0.7946340692f, 0.5975094525f, 0, -0.3595449969f, -0.8885529948f, 0.28495784f, 0, -0.2180405296f, 0.1529888965f, 0.9638738118f, 0, -0.7277432317f, -0.6164050508f, -0.3007234646f, 0, 0.7249729114f, -0.00669719484f, 0.6887448187f, 0, -0.5553659455f, -0.5336586252f, 0.6377908264f, 0, 0.5137558015f, 0.7976208196f, -0.3160000073f, 0, - -0.3794024848f, 0.9245608561f, -0.03522751494f, 0, 0.8229248658f, 0.2745365933f, -0.4974176556f, 0, -0.5404114394f, 0.6091141441f, 0.5804613989f, 0, 0.8036581901f, -0.2703029469f, 0.5301601931f, 0, 0.6044318879f, 0.6832968393f, 0.4095943388f, 0, 0.06389988817f, 0.9658208605f, -0.2512108074f, 0, 0.1087113286f, 0.7402471173f, -0.6634877936f, 0, -0.713427712f, -0.6926784018f, 0.1059128479f, 0, - 0.6458897819f, -0.5724548511f, -0.5050958653f, 0, -0.6553931414f, 0.7381471625f, 0.159995615f, 0, 0.3910961323f, 0.9188871375f, -0.05186755998f, 0, -0.4879022471f, -0.5904376907f, 0.6429111375f, 0, 0.6014790094f, 0.7707441366f, -0.2101820095f, 0, -0.5677173047f, 0.7511360995f, 0.3368851762f, 0, 0.7858573506f, 0.226674665f, 0.5753666838f, 0, -0.4520345543f, -0.604222686f, -0.6561857263f, 0, - 0.002272116345f, 0.4132844051f, -0.9105991643f, 0, -0.5815751419f, -0.5162925989f, 0.6286591339f, 0, -0.03703704785f, 0.8273785755f, 0.5604221175f, 0, -0.5119692504f, 0.7953543429f, -0.3244980058f, 0, -0.2682417366f, -0.9572290247f, -0.1084387619f, 0, -0.2322482736f, -0.9679131102f, -0.09594243324f, 0, 0.3554328906f, -0.8881505545f, 0.2913006227f, 0, 0.7346520519f, -0.4371373164f, 0.5188422971f, 0, - 0.9985120116f, 0.04659011161f, -0.02833944577f, 0, -0.3727687496f, -0.9082481361f, 0.1900757285f, 0, 0.91737377f, -0.3483642108f, 0.1925298489f, 0, 0.2714911074f, 0.4147529736f, -0.8684886582f, 0, 0.5131763485f, -0.7116334161f, 0.4798207128f, 0, -0.8737353606f, 0.18886992f, -0.4482350644f, 0, 0.8460043821f, -0.3725217914f, 0.3814499973f, 0, 0.8978727456f, -0.1780209141f, -0.4026575304f, 0, - 0.2178065647f, -0.9698322841f, -0.1094789531f, 0, -0.1518031304f, -0.7788918132f, -0.6085091231f, 0, -0.2600384876f, -0.4755398075f, -0.8403819825f, 0, 0.572313509f, -0.7474340931f, -0.3373418503f, 0, -0.7174141009f, 0.1699017182f, -0.6756111411f, 0, -0.684180784f, 0.02145707593f, -0.7289967412f, 0, -0.2007447902f, 0.06555605789f, -0.9774476623f, 0, -0.1148803697f, -0.8044887315f, 0.5827524187f, 0, - -0.7870349638f, 0.03447489231f, 0.6159443543f, 0, -0.2015596421f, 0.6859872284f, 0.6991389226f, 0, -0.08581082512f, -0.10920836f, -0.9903080513f, 0, 0.5532693395f, 0.7325250401f, -0.396610771f, 0, -0.1842489331f, -0.9777375055f, -0.1004076743f, 0, 0.0775473789f, -0.9111505856f, 0.4047110257f, 0, 0.1399838409f, 0.7601631212f, -0.6344734459f, 0, 0.4484419361f, -0.845289248f, 0.2904925424f, 0 -}; +const T FastNoiseLite::Lookup::RandVecs3D[] = { + -0.7292736885, -0.6618439697, 0.1735581948, 0, 0.790292081, -0.5480887466, -0.2739291014, 0, + 0.7217578935, 0.6226212466, -0.3023380997, 0, 0.565683137, -0.8208298145, -0.0790000257, 0, + 0.760049034, -0.5555979497, -0.3370999617, 0, 0.3713945616, 0.5011264475, 0.7816254623, 0, + -0.1277062463, -0.4254438999, -0.8959289049, 0, -0.2881560924, -0.5815838982, 0.7607405838, 0, + 0.5849561111, -0.662820239, -0.4674352136, 0, 0.3307171178, 0.0391653737, 0.94291689, 0, + 0.8712121778, -0.4113374369, -0.2679381538, 0, 0.580981015, 0.7021915846, 0.4115677815, 0, + 0.503756873, 0.6330056931, -0.5878203852, 0, 0.4493712205, 0.601390195, 0.6606022552, 0, + -0.6878403724, 0.09018890807, -0.7202371714, 0, -0.5958956522, -0.6469350577, 0.475797649, 0, + -0.5127052122, 0.1946921978, -0.8361987284, 0, -0.9911507142, -0.05410276466, -0.1212153153, 0, + -0.2149721042, 0.9720882117, -0.09397607749, 0, -0.7518650936, -0.5428057603, 0.3742469607, 0, + 0.5237068895, 0.8516377189, -0.02107817834, 0, 0.6333504779, 0.1926167129, -0.7495104896, 0, + -0.06788241606, 0.3998305789, 0.9140719259, 0, -0.5538628599, -0.4729896695, -0.6852128902, 0, + -0.7261455366, -0.5911990757, 0.3509933228, 0, -0.9229274737, -0.1782808786, 0.3412049336, 0, + -0.6968815002, 0.6511274338, 0.3006480328, 0, 0.9608044783, -0.2098363234, -0.1811724921, 0, + 0.06817146062, -0.9743405129, 0.2145069156, 0, -0.3577285196, -0.6697087264, -0.6507845481, 0, + -0.1868621131, 0.7648617052, -0.6164974636, 0, -0.6541697588, 0.3967914832, 0.6439087246, 0, + 0.6993340405, -0.6164538506, 0.3618239211, 0, -0.1546665739, 0.6291283928, 0.7617583057, 0, + -0.6841612949, -0.2580482182, -0.6821542638, 0, 0.5383980957, 0.4258654885, 0.7271630328, 0, + -0.5026987823, -0.7939832935, -0.3418836993, 0, 0.3202971715, 0.2834415347, 0.9039195862, 0, + 0.8683227101, -0.0003762656404, -0.4959995258, 0, 0.791120031, -0.08511045745, 0.6057105799, 0, + -0.04011016052, -0.4397248749, 0.8972364289, 0, 0.9145119872, 0.3579346169, -0.1885487608, 0, + -0.9612039066, -0.2756484276, 0.01024666929, 0, 0.6510361721, -0.2877799159, -0.7023778346, 0, + -0.2041786351, 0.7365237271, 0.644859585, 0, -0.7718263711, 0.3790626912, 0.5104855816, 0, + -0.3060082741, -0.7692987727, 0.5608371729, 0, 0.454007341, -0.5024843065, 0.7357899537, 0, + 0.4816795475, 0.6021208291, -0.6367380315, 0, 0.6961980369, -0.3222197429, 0.641469197, 0, + -0.6532160499, -0.6781148932, 0.3368515753, 0, 0.5089301236, -0.6154662304, -0.6018234363, 0, + -0.1635919754, -0.9133604627, -0.372840892, 0, 0.52408019, -0.8437664109, 0.1157505864, 0, + 0.5902587356, 0.4983817807, -0.6349883666, 0, 0.5863227872, 0.494764745, 0.6414307729, 0, + 0.6779335087, 0.2341345225, 0.6968408593, 0, 0.7177054546, -0.6858979348, 0.120178631, 0, + -0.5328819713, -0.5205125012, 0.6671608058, 0, -0.8654874251, -0.0700727088, -0.4960053754, 0, + -0.2861810166, 0.7952089234, 0.5345495242, 0, -0.04849529634, 0.9810836427, -0.1874115585, 0, + -0.6358521667, 0.6058348682, 0.4781800233, 0, 0.6254794696, -0.2861619734, 0.7258696564, 0, + -0.2585259868, 0.5061949264, -0.8227581726, 0, 0.02136306781, 0.5064016808, -0.8620330371, 0, + 0.200111773, 0.8599263484, 0.4695550591, 0, 0.4743561372, 0.6014985084, -0.6427953014, 0, + 0.6622993731, -0.5202474575, -0.5391679918, 0, 0.08084972818, -0.6532720452, 0.7527940996, 0, + -0.6893687501, 0.0592860349, 0.7219805347, 0, -0.1121887082, -0.9673185067, 0.2273952515, 0, + 0.7344116094, 0.5979668656, -0.3210532909, 0, 0.5789393465, -0.2488849713, 0.7764570201, 0, + 0.6988182827, 0.3557169806, -0.6205791146, 0, -0.8636845529, -0.2748771249, -0.4224826141, 0, + -0.4247027957, -0.4640880967, 0.777335046, 0, 0.5257722489, -0.8427017621, 0.1158329937, 0, + 0.9343830603, 0.316302472, -0.1639543925, 0, -0.1016836419, -0.8057303073, -0.5834887393, 0, + -0.6529238969, 0.50602126, -0.5635892736, 0, -0.2465286165, -0.9668205684, -0.06694497494, 0, + -0.9776897119, -0.2099250524, -0.007368825344, 0, 0.7736893337, 0.5734244712, 0.2694238123, 0, + -0.6095087895, 0.4995678998, 0.6155736747, 0, 0.5794535482, 0.7434546771, 0.3339292269, 0, + -0.8226211154, 0.08142581855, 0.5627293636, 0, -0.510385483, 0.4703667658, 0.7199039967, 0, + -0.5764971849, -0.07231656274, -0.8138926898, 0, 0.7250628871, 0.3949971505, -0.5641463116, 0, + -0.1525424005, 0.4860840828, -0.8604958341, 0, -0.5550976208, -0.4957820792, 0.667882296, 0, + -0.1883614327, 0.9145869398, 0.357841725, 0, 0.7625556724, -0.5414408243, -0.3540489801, 0, + -0.5870231946, -0.3226498013, -0.7424963803, 0, 0.3051124198, 0.2262544068, -0.9250488391, 0, + 0.6379576059, 0.577242424, -0.5097070502, 0, -0.5966775796, 0.1454852398, -0.7891830656, 0, + -0.658330573, 0.6555487542, -0.3699414651, 0, 0.7434892426, 0.2351084581, 0.6260573129, 0, + 0.5562114096, 0.8264360377, -0.0873632843, 0, -0.3028940016, -0.8251527185, 0.4768419182, 0, + 0.1129343818, -0.985888439, -0.1235710781, 0, 0.5937652891, -0.5896813806, 0.5474656618, 0, + 0.6757964092, -0.5835758614, -0.4502648413, 0, 0.7242302609, -0.1152719764, 0.6798550586, 0, + -0.9511914166, 0.0753623979, -0.2992580792, 0, 0.2539470961, -0.1886339355, 0.9486454084, 0, + 0.571433621, -0.1679450851, -0.8032795685, 0, -0.06778234979, 0.3978269256, 0.9149531629, 0, + 0.6074972649, 0.733060024, -0.3058922593, 0, -0.5435478392, 0.1675822484, 0.8224791405, 0, + -0.5876678086, -0.3380045064, -0.7351186982, 0, -0.7967562402, 0.04097822706, -0.6029098428, 0, + -0.1996350917, 0.8706294745, 0.4496111079, 0, -0.02787660336, -0.9106232682, -0.4122962022, 0, + -0.7797625996, -0.6257634692, 0.01975775581, 0, -0.5211232846, 0.7401644346, -0.4249554471, 0, + 0.8575424857, 0.4053272873, -0.3167501783, 0, 0.1045223322, 0.8390195772, -0.5339674439, 0, + 0.3501822831, 0.9242524096, -0.1520850155, 0, 0.1987849858, 0.07647613266, 0.9770547224, 0, + 0.7845996363, 0.6066256811, -0.1280964233, 0, 0.09006737436, -0.9750989929, -0.2026569073, 0, + -0.8274343547, -0.542299559, 0.1458203587, 0, -0.3485797732, -0.415802277, 0.840000362, 0, + -0.2471778936, -0.7304819962, -0.6366310879, 0, -0.3700154943, 0.8577948156, 0.3567584454, 0, + 0.5913394901, -0.548311967, -0.5913303597, 0, 0.1204873514, -0.7626472379, -0.6354935001, 0, + 0.616959265, 0.03079647928, 0.7863922953, 0, 0.1258156836, -0.6640829889, -0.7369967419, 0, + -0.6477565124, -0.1740147258, -0.7417077429, 0, 0.6217889313, -0.7804430448, -0.06547655076, 0, + 0.6589943422, -0.6096987708, 0.4404473475, 0, -0.2689837504, -0.6732403169, -0.6887635427, 0, + -0.3849775103, 0.5676542638, 0.7277093879, 0, 0.5754444408, 0.8110471154, -0.1051963504, 0, + 0.9141593684, 0.3832947817, 0.131900567, 0, -0.107925319, 0.9245493968, 0.3654593525, 0, + 0.377977089, 0.3043148782, 0.8743716458, 0, -0.2142885215, -0.8259286236, 0.5214617324, 0, + 0.5802544474, 0.4148098596, -0.7008834116, 0, -0.1982660881, 0.8567161266, -0.4761596756, 0, + -0.03381553704, 0.3773180787, -0.9254661404, 0, -0.6867922841, -0.6656597827, 0.2919133642, 0, + 0.7731742607, -0.2875793547, -0.5652430251, 0, -0.09655941928, 0.9193708367, -0.3813575004, 0, + 0.2715702457, -0.9577909544, -0.09426605581, 0, 0.2451015704, -0.6917998565, -0.6792188003, 0, + 0.977700782, -0.1753855374, 0.1155036542, 0, -0.5224739938, 0.8521606816, 0.02903615945, 0, + -0.7734880599, -0.5261292347, 0.3534179531, 0, -0.7134492443, -0.269547243, 0.6467878011, 0, + 0.1644037271, 0.5105846203, -0.8439637196, 0, 0.6494635788, 0.05585611296, 0.7583384168, 0, + -0.4711970882, 0.5017280509, -0.7254255765, 0, -0.6335764307, -0.2381686273, -0.7361091029, 0, + -0.9021533097, -0.270947803, -0.3357181763, 0, -0.3793711033, 0.872258117, 0.3086152025, 0, + -0.6855598966, -0.3250143309, 0.6514394162, 0, 0.2900942212, -0.7799057743, -0.5546100667, 0, + -0.2098319339, 0.85037073, 0.4825351604, 0, -0.4592603758, 0.6598504336, -0.5947077538, 0, + 0.8715945488, 0.09616365406, -0.4807031248, 0, -0.6776666319, 0.7118504878, -0.1844907016, 0, + 0.7044377633, 0.312427597, 0.637304036, 0, -0.7052318886, -0.2401093292, -0.6670798253, 0, + 0.081921007, -0.7207336136, -0.6883545647, 0, -0.6993680906, -0.5875763221, -0.4069869034, 0, + -0.1281454481, 0.6419895885, 0.7559286424, 0, -0.6337388239, -0.6785471501, -0.3714146849, 0, + 0.5565051903, -0.2168887573, -0.8020356851, 0, -0.5791554484, 0.7244372011, -0.3738578718, 0, + 0.1175779076, -0.7096451073, 0.6946792478, 0, -0.6134619607, 0.1323631078, 0.7785527795, 0, + 0.6984635305, -0.02980516237, -0.715024719, 0, 0.8318082963, -0.3930171956, 0.3919597455, 0, + 0.1469576422, 0.05541651717, -0.9875892167, 0, 0.708868575, -0.2690503865, 0.6520101478, 0, + 0.2726053183, 0.67369766, -0.68688995, 0, -0.6591295371, 0.3035458599, -0.6880466294, 0, + 0.4815131379, -0.7528270071, 0.4487723203, 0, 0.9430009463, 0.1675647412, -0.2875261255, 0, + 0.434802957, 0.7695304522, -0.4677277752, 0, 0.3931996188, 0.594473625, 0.7014236729, 0, + 0.7254336655, -0.603925654, 0.3301814672, 0, 0.7590235227, -0.6506083235, 0.02433313207, 0, + -0.8552768592, -0.3430042733, 0.3883935666, 0, -0.6139746835, 0.6981725247, 0.3682257648, 0, + -0.7465905486, -0.5752009504, 0.3342849376, 0, 0.5730065677, 0.810555537, -0.1210916791, 0, + -0.9225877367, -0.3475211012, -0.167514036, 0, -0.7105816789, -0.4719692027, -0.5218416899, 0, + -0.08564609717, 0.3583001386, 0.929669703, 0, -0.8279697606, -0.2043157126, 0.5222271202, 0, + 0.427944023, 0.278165994, 0.8599346446, 0, 0.5399079671, -0.7857120652, -0.3019204161, 0, + 0.5678404253, -0.5495413974, -0.6128307303, 0, -0.9896071041, 0.1365639107, -0.04503418428, 0, + -0.6154342638, -0.6440875597, 0.4543037336, 0, 0.1074204368, -0.7946340692, 0.5975094525, 0, + -0.3595449969, -0.8885529948, 0.28495784, 0, -0.2180405296, 0.1529888965, 0.9638738118, 0, + -0.7277432317, -0.6164050508, -0.3007234646, 0, 0.7249729114, -0.00669719484, 0.6887448187, 0, + -0.5553659455, -0.5336586252, 0.6377908264, 0, 0.5137558015, 0.7976208196, -0.3160000073, 0, + -0.3794024848, 0.9245608561, -0.03522751494, 0, 0.8229248658, 0.2745365933, -0.4974176556, 0, + -0.5404114394, 0.6091141441, 0.5804613989, 0, 0.8036581901, -0.2703029469, 0.5301601931, 0, + 0.6044318879, 0.6832968393, 0.4095943388, 0, 0.06389988817, 0.9658208605, -0.2512108074, 0, + 0.1087113286, 0.7402471173, -0.6634877936, 0, -0.713427712, -0.6926784018, 0.1059128479, 0, + 0.6458897819, -0.5724548511, -0.5050958653, 0, -0.6553931414, 0.7381471625, 0.159995615, 0, + 0.3910961323, 0.9188871375, -0.05186755998, 0, -0.4879022471, -0.5904376907, 0.6429111375, 0, + 0.6014790094, 0.7707441366, -0.2101820095, 0, -0.5677173047, 0.7511360995, 0.3368851762, 0, + 0.7858573506, 0.226674665, 0.5753666838, 0, -0.4520345543, -0.604222686, -0.6561857263, 0, + 0.002272116345, 0.4132844051, -0.9105991643, 0, -0.5815751419, -0.5162925989, 0.6286591339, 0, + -0.03703704785, 0.8273785755, 0.5604221175, 0, -0.5119692504, 0.7953543429, -0.3244980058, 0, + -0.2682417366, -0.9572290247, -0.1084387619, 0, -0.2322482736, -0.9679131102, -0.09594243324, 0, + 0.3554328906, -0.8881505545, 0.2913006227, 0, 0.7346520519, -0.4371373164, 0.5188422971, 0, + 0.9985120116, 0.04659011161, -0.02833944577, 0, -0.3727687496, -0.9082481361, 0.1900757285, 0, + 0.91737377, -0.3483642108, 0.1925298489, 0, 0.2714911074, 0.4147529736, -0.8684886582, 0, + 0.5131763485, -0.7116334161, 0.4798207128, 0, -0.8737353606, 0.18886992, -0.4482350644, 0, + 0.8460043821, -0.3725217914, 0.3814499973, 0, 0.8978727456, -0.1780209141, -0.4026575304, 0, + 0.2178065647, -0.9698322841, -0.1094789531, 0, -0.1518031304, -0.7788918132, -0.6085091231, 0, + -0.2600384876, -0.4755398075, -0.8403819825, 0, 0.572313509, -0.7474340931, -0.3373418503, 0, + -0.7174141009, 0.1699017182, -0.6756111411, 0, -0.684180784, 0.02145707593, -0.7289967412, 0, + -0.2007447902, 0.06555605789, -0.9774476623, 0, -0.1148803697, -0.8044887315, 0.5827524187, 0, + -0.7870349638, 0.03447489231, 0.6159443543, 0, -0.2015596421, 0.6859872284, 0.6991389226, 0, + -0.08581082512, -0.10920836, -0.9903080513, 0, 0.5532693395, 0.7325250401, -0.396610771, 0, + -0.1842489331, -0.9777375055, -0.1004076743, 0, 0.0775473789, -0.9111505856, 0.4047110257, 0, + 0.1399838409, 0.7601631212, -0.6344734459, 0, 0.4484419361, -0.845289248, 0.2904925424, 0}; #endif \ No newline at end of file diff --git a/Template/WorldEdit.h b/Template/WorldEdit.h index 5431215..457d987 100644 --- a/Template/WorldEdit.h +++ b/Template/WorldEdit.h @@ -42,7 +42,7 @@ namespace worldedit { std::unordered_map>> playerMainPosMap; std::unordered_map>> playerVicePosMap; std::unordered_map playerClipboardMap; - std::unordered_map> playerHandToolMap; + std::unordered_map> playerHandToolMap; std::unordered_map> playerBrushMap; std::unordered_map playerGMaskMap; std::unordered_map, std::pair>> playerHistoryMap; diff --git a/core/brush/Brush.h b/core/brush/Brush.h index abb6c77..f65eb09 100644 --- a/core/brush/Brush.h +++ b/core/brush/Brush.h @@ -11,6 +11,7 @@ namespace worldedit { class BlockPattern* pattern = nullptr; bool setted = false; std::string mask = ""; + bool needFace = false; Brush() = default; Brush(unsigned short, BlockPattern*); void setMask(std::string const& str = "") { mask = str; }; diff --git a/core/command/BrushCommand.cpp b/core/command/BrushCommand.cpp index 3a9982e..2b38228 100644 --- a/core/command/BrushCommand.cpp +++ b/core/command/BrushCommand.cpp @@ -13,7 +13,7 @@ namespace worldedit { using ParamType = DynamicCommand::ParameterType; using ParamData = DynamicCommand::ParameterData; - // brush bmask bsize + // brush bmask bsize ruseface void brushCommandSetup() { DynamicCommand::setup( @@ -247,5 +247,40 @@ namespace worldedit { } }, CommandPermissionLevel::GameMasters); + + DynamicCommand::setup( + "ruseface", // command name + "set right click useface", // command description + {}, {ParamData("bool", ParamType::Bool, "bool")}, {{"bool"}}, + // dynamic command callback + [](DynamicCommand const& command, CommandOrigin const& origin, CommandOutput& output, + std::unordered_map& results) { + auto& mod = worldedit::getMod(); + auto player = origin.getPlayer(); + auto* item = player->getHandSlot(); + std::string brushName = item->getTypeName() + std::to_string(item->getAuxValue()); + auto xuid = player->getXuid(); + int i = 0; + if (mod.playerBrushMap.find(xuid) != mod.playerBrushMap.end() && + mod.playerBrushMap[xuid].find(brushName) != mod.playerBrushMap[xuid].end()) { + auto* brush = mod.playerBrushMap[xuid][brushName]; + auto useface = results["bool"].get(); + brush->needFace = useface; + output.success("§aBrush useface set to " + std::to_string(useface)); + ++i; + } + if (mod.playerHandToolMap.find(xuid) != mod.playerHandToolMap.end() && + mod.playerHandToolMap[xuid].find(brushName) != mod.playerHandToolMap[xuid].end()) { + auto* tool = mod.playerHandToolMap[xuid][brushName]; + auto useface = results["bool"].get(); + tool->needFace = useface; + output.success("§aTool useface set to " + std::to_string(useface)); + ++i; + } + if (i == 0) { + output.error("You need to choose a brush or tool first"); + } + }, + CommandPermissionLevel::GameMasters); } } // namespace worldedit \ No newline at end of file diff --git a/core/command/ClipboardCommand.cpp b/core/command/ClipboardCommand.cpp index 5b5f0f8..dae4806 100644 --- a/core/command/ClipboardCommand.cpp +++ b/core/command/ClipboardCommand.cpp @@ -95,16 +95,18 @@ namespace worldedit { auto boundingBox = region->getBoundBox(); auto blockSource = Level::getBlockSource(dimID); - if (mod.maxHistoryLength > 0) { auto history = mod.getPlayerNextHistory(xuid); - *history = Clipboard(boundingBox.max - boundingBox.min); - history->playerRelPos.x = dimID; - history->playerPos = boundingBox.min; + if (mod.maxHistoryLength > 0) { + auto history = mod.getPlayerNextHistory(xuid); + *history = Clipboard(boundingBox.max - boundingBox.min); + history->playerRelPos.x = dimID; + history->playerPos = boundingBox.min; - region->forEachBlockInRegion([&](const BlockPos& pos) { - auto localPos = pos - boundingBox.min; - auto blockInstance = blockSource->getBlockInstance(pos); - history->storeBlock(blockInstance, localPos); - });} + region->forEachBlockInRegion([&](const BlockPos& pos) { + auto localPos = pos - boundingBox.min; + auto blockInstance = blockSource->getBlockInstance(pos); + history->storeBlock(blockInstance, localPos); + }); + } auto pPos = origin.getPlayer()->getPosition() - Vec3(0.0, 1.62, 0.0); @@ -180,16 +182,18 @@ namespace worldedit { auto dimID = origin.getPlayer()->getDimensionId(); if (!arg_n) { auto blockSource = Level::getBlockSource(dimID); - if (mod.maxHistoryLength > 0) { auto history = mod.getPlayerNextHistory(xuid); - *history = Clipboard(box.max - box.min); - history->playerRelPos.x = dimID; - history->playerPos = box.min; + if (mod.maxHistoryLength > 0) { + auto history = mod.getPlayerNextHistory(xuid); + *history = Clipboard(box.max - box.min); + history->playerRelPos.x = dimID; + history->playerPos = box.min; - box.forEachBlockInBox([&](const BlockPos& pos) { - auto localPos = pos - box.min; - auto blockInstance = blockSource->getBlockInstance(pos); - history->storeBlock(blockInstance, localPos); - });} + box.forEachBlockInBox([&](const BlockPos& pos) { + auto localPos = pos - box.min; + auto blockInstance = blockSource->getBlockInstance(pos); + history->storeBlock(blockInstance, localPos); + }); + } if (arg_a) { clipboard->forEachBlockInClipboard([&](const BlockPos& pos) { diff --git a/core/command/HandToolCommand.cpp b/core/command/HandToolCommand.cpp index eab0ce7..d3c67eb 100644 --- a/core/command/HandToolCommand.cpp +++ b/core/command/HandToolCommand.cpp @@ -6,12 +6,13 @@ #include "string/StringTool.h" #include "MC/ItemStack.hpp" #include "WorldEdit.h" +#include "store/BlockPattern.hpp" namespace worldedit { using ParamType = DynamicCommand::ParameterType; using ParamData = DynamicCommand::ParameterData; - // tool + // tool luseface void handToolCommandSetup() { DynamicCommand::setup( @@ -24,6 +25,7 @@ namespace worldedit { {"airwand", {"airwand"}}, {"cycler", {"cycler"}}, {"info", {"info"}}, + {"rep", {"rep"}}, {"flood", {"flood"}}, {"none", {"none"}}, }, @@ -34,11 +36,13 @@ namespace worldedit { ParamData("airwand", ParamType::Enum, "airwand"), ParamData("cycler", ParamType::Enum, "cycler"), ParamData("info", ParamType::Enum, "info"), + ParamData("rep", ParamType::Enum, "rep"), ParamData("flood", ParamType::Enum, "flood"), ParamData("none", ParamType::Enum, "none"), ParamData("block", ParamType::Block, "block"), ParamData("blockPattern", ParamType::String, "blockPattern"), - ParamData("distance", ParamType::Float, "distance"), + ParamData("dis", ParamType::Int, true, "dis"), + ParamData("needEdge", ParamType::Bool, true, "needEdge"), }, { {"tree"}, @@ -47,8 +51,9 @@ namespace worldedit { {"airwand"}, {"cycler"}, {"info"}, - {"flood", "block", "distance"}, - {"flood", "blockPattern", "distance"}, + {"rep"}, + {"flood", "block", "dis", "needEdge"}, + {"flood", "blockPattern", "dis", "needEdge"}, {"none"}, }, // dynamic command callback @@ -83,8 +88,27 @@ namespace worldedit { mod.playerHandToolMap[xuid][toolName] = new InfoTool(); output.success(fmt::format("§aBlock info tool bound to {}", toolrName)); } else if (results["flood"].isSet) { - mod.playerHandToolMap[xuid][toolName] = new FloodFillTool(); + std::string bps = "minecraft:air"; + if (results["blockPattern"].isSet) { + bps = results["blockPattern"].get(); + } else if (results["block"].isSet) { + bps = results["block"].get()->getTypeName(); + } + + int radius = 5; + if (results["dis"].isSet) { + radius = results["dis"].get(); + } + int needEdge = false; + if (results["needEdge"].isSet) { + needEdge = results["needEdge"].get(); + } + mod.playerHandToolMap[xuid][toolName] = + new FloodFillTool(new BlockPattern(bps, xuid, nullptr), radius, needEdge); output.success(fmt::format("§aFlood fill tool bound to {}", toolrName)); + } else if (results["rep"].isSet) { + mod.playerHandToolMap[xuid][toolName] = new RepTool(); + output.success(fmt::format("§aRep fill tool bound to {}", toolrName)); } else if (results["none"].isSet) { delete mod.playerHandToolMap[xuid][toolName]; mod.playerHandToolMap[xuid].erase(toolName); @@ -92,5 +116,30 @@ namespace worldedit { } }, CommandPermissionLevel::GameMasters); + + DynamicCommand::setup( + "luseface", // command name + "set left click useface", // command description + {}, {ParamData("bool", ParamType::Bool, "bool")}, {{"bool"}}, + // dynamic command callback + [](DynamicCommand const& command, CommandOrigin const& origin, CommandOutput& output, + std::unordered_map& results) { + auto& mod = worldedit::getMod(); + auto player = origin.getPlayer(); + auto* item = player->getHandSlot(); + std::string toolName = item->getTypeName() + std::to_string(item->getAuxValue()); + auto xuid = player->getXuid(); + + if (mod.playerHandToolMap.find(xuid) != mod.playerHandToolMap.end() && + mod.playerHandToolMap[xuid].find(toolName) != mod.playerHandToolMap[xuid].end()) { + auto* tool = mod.playerHandToolMap[xuid][toolName]; + auto useface = results["bool"].get(); + tool->lneedFace = useface; + output.success("§aTool size set to " + std::to_string(useface)); + } else { + output.error("You need to choose a tool first"); + } + }, + CommandPermissionLevel::GameMasters); } } // namespace worldedit \ No newline at end of file diff --git a/core/eval/CppEval.h b/core/eval/CppEval.h index 799f984..c9d5925 100644 --- a/core/eval/CppEval.h +++ b/core/eval/CppEval.h @@ -316,24 +316,48 @@ namespace cpp_eval { return 0.577215664901532860606512090082; case do_hash("e"): return 2.718281828459045235360287471352; + + // cellular disFunc case do_hash("sqrted"): return 0; - case do_hash("fbm"): case do_hash("square"): return 1; - case do_hash("ridged"): case do_hash("manhattan"): return 2; - case do_hash("pingpong"): case do_hash("hybird"): return 3; + + // cellular returnType case do_hash("value"): + return 0; + case do_hash("dis"): + case do_hash("dis1"): + return 1; + case do_hash("dis2"): + return 2; + case do_hash("disadd"): + return 3; + case do_hash("dissub"): return 4; - // simplex(x,y,z,seed,fractaltype,octaves,lacunarity,gain,weighted,ppStrength) - // perlin(x,y,z,seed,fractaltype,octaves,lacunarity,gain,weighted,ppStrength) - // cubic(x,y,z,seed,fractaltype,octaves,lacunarity,gain,weighted,ppStrength) - // value(x,y,z,seed,fractaltype,octaves,lacunarity,gain,weighted,ppStrength) - // cellular(x,y,z,seed,disFunc,returnType,jitter,fractaltype,octaves,lacunarity,gain,weighted,ppStrength) + case do_hash("dismul"): + return 5; + case do_hash("disdiv"): + return 6; + + // fractalType + case do_hash("none"): + return 0; + case do_hash("fbm"): + return 1; + case do_hash("ridged"): + return 2; + case do_hash("pingpong"): + return 3; + // simplex(x,y,z,seed,fractalType,octaves,lacunarity,gain,weighted,ppStrength) + // perlin(x,y,z,seed,fractalType,octaves,lacunarity,gain,weighted,ppStrength) + // cubic(x,y,z,seed,fractalType,octaves,lacunarity,gain,weighted,ppStrength) + // value(x,y,z,seed,fractalType,octaves,lacunarity,gain,weighted,ppStrength) + // voronoi(x,y,z,seed,returnType,disFunc,jitter,fractalType,octaves,lacunarity,gain,weighted,ppStrength) default: if (mVariables.find(id) == mVariables.end()) return 0; diff --git a/core/eval/Eval.cpp b/core/eval/Eval.cpp index 0f7282b..ec723e8 100644 --- a/core/eval/Eval.cpp +++ b/core/eval/Eval.cpp @@ -3,7 +3,13 @@ // #include "Eval.h" #include +#include "FastNoiseLite.h" // #include + +#define tryGetParameter(size, params, n, f, t) \ + if (size >= n) { \ + f(static_cast(params[n - 1])); \ + } namespace worldedit { double posfmod(double x, double y) { return x - floor(x / y) * y; @@ -39,6 +45,13 @@ namespace worldedit { size = normalSearchBox.max - normalSearchBox.min + 1; posMap.clear(); solidMap.clear(); + searchBoxInitialized = true; + } + + void EvalFunctions::buildSearchCache() { + if (!searchBoxInitialized || searchCacheBuilded) { + return; + } try { posMap.resize(size.x * size.y * size.z + 1); solidMap = std::vector(size.x * size.y * size.z + 1, 0); @@ -48,7 +61,7 @@ namespace worldedit { } posMap[size.x * size.y * size.z] = {0, 0, 0}; solidMap[size.x * size.y * size.z] = 0; - searchBoxInitialized = true; + normalSearchBox.forEachBlockInBox([&](const BlockPos& pos) { if (&blockSource->getBlock(pos) == BedrockBlocks::mAir) { return; @@ -95,6 +108,7 @@ namespace worldedit { posMap[index].y = posMap[index].y + posMap[indexf].y; posMap[index].z = posMap[index].z + posMap[indexf].z; } + searchCacheBuilded = true; } long long EvalFunctions::getIndex(const BlockPos& pos) { auto localPos = pos - normalSearchBox.min; @@ -315,6 +329,7 @@ namespace worldedit { case do_hash("normalx"): if (searchBoxInitialized) { if (size == 0) { + buildSearchCache(); auto solid = getSolidMap(here - normalSearchDis, here + normalSearchDis); auto posSum = getPosMap(here - normalSearchDis, here + normalSearchDis); double sumx = 0; @@ -332,6 +347,7 @@ namespace worldedit { case do_hash("normaly"): if (searchBoxInitialized) { if (size == 0) { + buildSearchCache(); auto solid = getSolidMap(here - normalSearchDis, here + normalSearchDis); auto posSum = getPosMap(here - normalSearchDis, here + normalSearchDis); double sumx = 0; @@ -349,6 +365,7 @@ namespace worldedit { case do_hash("normalz"): if (searchBoxInitialized) { if (size == 0) { + buildSearchCache(); auto solid = getSolidMap(here - normalSearchDis, here + normalSearchDis); auto posSum = getPosMap(here - normalSearchDis, here + normalSearchDis); double sumx = 0; @@ -366,6 +383,7 @@ namespace worldedit { case do_hash("angle"): if (searchBoxInitialized) { if (size == 0) { + buildSearchCache(); auto solid = getSolidMap(here - normalSearchDis, here + normalSearchDis); auto posSum = getPosMap(here - normalSearchDis, here + normalSearchDis); double sumx = 0; @@ -394,11 +412,95 @@ namespace worldedit { break; case do_hash("issurfacesmooth"): if (searchBoxInitialized) { + buildSearchCache(); return 1.0 - static_cast(getSolidMap(tmp - normalSearchDis, tmp + normalSearchDis)) / static_cast((normalSearchDis * 2 + 1) * normalSearchDis * 2 + 1); } return 0; break; + + case do_hash("simplex"): + if (size >= 3) { + FastNoiseLite noise = FastNoiseLite(); + noise.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_Simplex); + tryGetParameter(size, params, 4, noise.SetSeed, int64_t); + tryGetParameter(size, params, 5, noise.SetFractalType, FastNoiseLite::FractalType); + tryGetParameter(size, params, 6, noise.SetFractalOctaves, int64_t); + tryGetParameter(size, params, 7, noise.SetFractalLacunarity, double); + tryGetParameter(size, params, 8, noise.SetFractalGain, double); + tryGetParameter(size, params, 9, noise.SetFractalWeightedStrength, double); + tryGetParameter(size, params, 10, noise.SetFractalPingPongStrength, double); + return (noise.GetNoise(params[0], params[1], params[2]) + 1.0) * 0.5; + } + return 0; + break; + + case do_hash("perlin"): + if (size >= 3) { + FastNoiseLite noise = FastNoiseLite(); + noise.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_Perlin); + tryGetParameter(size, params, 4, noise.SetSeed, int64_t); + tryGetParameter(size, params, 5, noise.SetFractalType, FastNoiseLite::FractalType); + tryGetParameter(size, params, 6, noise.SetFractalOctaves, int64_t); + tryGetParameter(size, params, 7, noise.SetFractalLacunarity, double); + tryGetParameter(size, params, 8, noise.SetFractalGain, double); + tryGetParameter(size, params, 9, noise.SetFractalWeightedStrength, double); + tryGetParameter(size, params, 10, noise.SetFractalPingPongStrength, double); + return (noise.GetNoise(params[0], params[1], params[2]) + 1.0) * 0.5; + } + return 0; + break; + + case do_hash("cubic"): + if (size >= 3) { + FastNoiseLite noise = FastNoiseLite(); + noise.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_ValueCubic); + tryGetParameter(size, params, 4, noise.SetSeed, int64_t); + tryGetParameter(size, params, 5, noise.SetFractalType, FastNoiseLite::FractalType); + tryGetParameter(size, params, 6, noise.SetFractalOctaves, int64_t); + tryGetParameter(size, params, 7, noise.SetFractalLacunarity, double); + tryGetParameter(size, params, 8, noise.SetFractalGain, double); + tryGetParameter(size, params, 9, noise.SetFractalWeightedStrength, double); + tryGetParameter(size, params, 10, noise.SetFractalPingPongStrength, double); + return (noise.GetNoise(params[0], params[1], params[2]) + 1.0) * 0.5; + } + return 0; + break; + + case do_hash("value"): + if (size >= 3) { + FastNoiseLite noise = FastNoiseLite(); + noise.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_Value); + tryGetParameter(size, params, 4, noise.SetSeed, int64_t); + tryGetParameter(size, params, 5, noise.SetFractalType, FastNoiseLite::FractalType); + tryGetParameter(size, params, 6, noise.SetFractalOctaves, int64_t); + tryGetParameter(size, params, 7, noise.SetFractalLacunarity, double); + tryGetParameter(size, params, 8, noise.SetFractalGain, double); + tryGetParameter(size, params, 9, noise.SetFractalWeightedStrength, double); + tryGetParameter(size, params, 10, noise.SetFractalPingPongStrength, double); + return (noise.GetNoise(params[0], params[1], params[2]) + 1.0) * 0.5; + } + return 0; + break; + + case do_hash("voronoi"): + if (size >= 3) { + FastNoiseLite noise = FastNoiseLite(); + noise.SetNoiseType(FastNoiseLite::NoiseType::NoiseType_Cellular); + tryGetParameter(size, params, 4, noise.SetSeed, int64_t); + tryGetParameter(size, params, 5, noise.SetCellularReturnType, FastNoiseLite::CellularReturnType); + tryGetParameter(size, params, 6, noise.SetCellularDistanceFunction, FastNoiseLite::CellularDistanceFunction); + tryGetParameter(size, params, 7, noise.SetCellularJitter, double); + tryGetParameter(size, params, 8, noise.SetFractalType, FastNoiseLite::FractalType); + tryGetParameter(size, params, 9, noise.SetFractalOctaves, int64_t); + tryGetParameter(size, params, 10, noise.SetFractalLacunarity, double); + tryGetParameter(size, params, 11, noise.SetFractalGain, double); + tryGetParameter(size, params, 12, noise.SetFractalWeightedStrength, double); + tryGetParameter(size, params, 13, noise.SetFractalPingPongStrength, double); + return (noise.GetNoise(params[0], params[1], params[2]) + 1.0) * 0.5; + } + break; + default: if (blockdataInitialized) { std::string sname(name); diff --git a/core/eval/Eval.h b/core/eval/Eval.h index 54ee00e..6b64179 100644 --- a/core/eval/Eval.h +++ b/core/eval/Eval.h @@ -116,6 +116,7 @@ namespace worldedit { std::vector posMap; std::vector solidMap; bool searchBoxInitialized = false; + bool searchCacheBuilded = false; bool blockdataInitialized = false; public: @@ -125,6 +126,7 @@ namespace worldedit { blockdataInitialized = true; } void setbox(BoundingBox box); + void buildSearchCache(); long long getIndex(const BlockPos& pos); long long getSolidMap(const BlockPos& pos1, const BlockPos& pos2); LongLong3 getPosMap(const BlockPos& pos1, const BlockPos& pos2); diff --git a/core/store/BlockPattern.cpp b/core/store/BlockPattern.cpp index bfac8cc..b45c787 100644 --- a/core/store/BlockPattern.cpp +++ b/core/store/BlockPattern.cpp @@ -11,17 +11,14 @@ namespace worldedit { BlockPattern::BlockPattern(std::string str, std::string xuid, Region* region) { auto strSize = str.size(); - if (str.find("#clipboard") != std::string::npos) { + if (str.find("#clipboard") != std::string::npos && region!=nullptr) { auto& mod = worldedit::getMod(); if (mod.playerClipboardMap.find(xuid) == mod.playerClipboardMap.end()) { return; } clipboard = &mod.playerClipboardMap[xuid]; if (str.find("@c") != std::string::npos) { - auto center = region->getCenter(); - bias.x = static_cast(floor(center.x)); - bias.y = static_cast(floor(center.y)); - bias.z = static_cast(floor(center.z)); + bias = region->getCenter().toBlockPos(); } else { bias = region->getBoundBox().min; } diff --git a/core/store/BlockPattern.hpp b/core/store/BlockPattern.hpp index 06080d5..1c76c27 100644 --- a/core/store/BlockPattern.hpp +++ b/core/store/BlockPattern.hpp @@ -38,7 +38,7 @@ namespace worldedit { std::string function = "1"; Percents() = default; template - double getPercents(const std::unordered_map<::std::string, double>& variables, functions& funcs) { + inline double getPercents(const std::unordered_map<::std::string, double>& variables, functions& funcs) { if (isNum) { return value; } @@ -58,7 +58,7 @@ namespace worldedit { std::string blockDatafunc = "0"; RawBlock() = default; template - Block* getBlock(const std::unordered_map<::std::string, double>& variables, functions& funcs) { + inline Block* getBlock(const std::unordered_map<::std::string, double>& variables, functions& funcs) { if (constBlock) { return block; } @@ -87,7 +87,7 @@ namespace worldedit { BlockPos bias = {0, 0, 0}; BlockPattern(std::string str, std::string xuid = "", Region* region = nullptr); template - RawBlock* getRawBlock(const std::unordered_map<::std::string, double>& variables, functions& funcs) { + inline RawBlock* getRawBlock(const std::unordered_map<::std::string, double>& variables, functions& funcs) { std::vector weights; double total = 0; weights.resize(blockNum); @@ -109,12 +109,12 @@ namespace worldedit { return &rawBlocks[blockNum - 1]; } template - Block* getBlock(const std::unordered_map<::std::string, double>& variables, functions& funcs) { + inline Block* getBlock(const std::unordered_map<::std::string, double>& variables, functions& funcs) { return getRawBlock(variables, funcs)->getBlock(variables, funcs); } bool hasBlock(Block* block); template - bool setBlock(const std::unordered_map<::std::string, double>& variables, + inline bool setBlock(const std::unordered_map<::std::string, double>& variables, functions& funcs, BlockSource* blockSource, const BlockPos& pos) { diff --git a/core/subscribe/player.cpp b/core/subscribe/player.cpp index d515f7f..d510a34 100644 --- a/core/subscribe/player.cpp +++ b/core/subscribe/player.cpp @@ -7,7 +7,11 @@ namespace worldedit { - bool playerLeftClick(Player* player, bool isLong, class ItemStack* item, BlockInstance& blockInstance) { + bool playerLeftClick(Player* player, + bool isLong, + class ItemStack* item, + BlockInstance& blockInstance, + FaceID mFace) { static std::unordered_map tickMap; bool needDiscard = false; @@ -40,7 +44,36 @@ namespace worldedit { itemName += std::to_string(item->getAuxValue()); if (toolMap.find(itemName) != toolMap.end()) { if (!needDiscard) { - toolMap[itemName]->leftClick(player, blockInstance); + auto& tool = toolMap[itemName]; + if (tool->lneedFace && blockInstance != BlockInstance::Null) { + BlockPos bPos = blockInstance.getPosition(); + switch (mFace) { + case FaceID::Down: + bPos.y -= 1; + break; + case FaceID::Up: + bPos.y += 1; + break; + case FaceID::North: + bPos.z -= 1; + break; + case FaceID::South: + bPos.z += 1; + break; + case FaceID::West: + bPos.x -= 1; + break; + case FaceID::East: + bPos.x += 1; + break; + default: + break; + } + auto bi = blockInstance.getBlockSource()->getBlockInstance(bPos); + tool->leftClick(player, bi); + } else { + tool->leftClick(player, blockInstance); + } } return false; } @@ -49,7 +82,11 @@ namespace worldedit { return true; } - bool playerRightClick(Player* player, bool isLong, class ItemStack* item, BlockInstance& blockInstance) { + bool playerRightClick(Player* player, + bool isLong, + class ItemStack* item, + BlockInstance& blockInstance, + FaceID mFace) { static std::unordered_map tickMap; bool needDiscard = false; @@ -67,7 +104,7 @@ namespace worldedit { if (!(player->isOP() && player->isCreative())) { return true; - }else if (item->getTypeName() == "minecraft:wooden_axe") { + } else if (item->getTypeName() == "minecraft:wooden_axe") { if (!isLong) { if (!needDiscard) { changeVicePos(player, blockInstance); @@ -81,15 +118,74 @@ namespace worldedit { auto& toolMap = mod.playerHandToolMap[xuid]; if (toolMap.find(itemName) != toolMap.end()) { if (!needDiscard) { - toolMap[itemName]->rightClick(player, blockInstance); + auto& tool = toolMap[itemName]; + if (tool->needFace && blockInstance != BlockInstance::Null) { + BlockPos bPos = blockInstance.getPosition(); + switch (mFace) { + case FaceID::Down: + bPos.y -= 1; + break; + case FaceID::Up: + bPos.y += 1; + break; + case FaceID::North: + bPos.z -= 1; + break; + case FaceID::South: + bPos.z += 1; + break; + case FaceID::West: + bPos.x -= 1; + break; + case FaceID::East: + bPos.x += 1; + break; + default: + break; + } + auto bi = blockInstance.getBlockSource()->getBlockInstance(bPos); + tool->rightClick(player, bi); + } else { + tool->rightClick(player, blockInstance); + } } return false; } - } else if (mod.playerBrushMap.find(xuid) != mod.playerBrushMap.end()) { + } + if (mod.playerBrushMap.find(xuid) != mod.playerBrushMap.end()) { auto& brushMap = mod.playerBrushMap[xuid]; if (brushMap.find(itemName) != brushMap.end()) { if (!needDiscard) { - brushMap[itemName]->set(player, blockInstance); + auto& brush = brushMap[itemName]; + if (brush->needFace && blockInstance != BlockInstance::Null) { + BlockPos bPos = blockInstance.getPosition(); + switch (mFace) { + case FaceID::Down: + bPos.y -= 1; + break; + case FaceID::Up: + bPos.y += 1; + break; + case FaceID::North: + bPos.z -= 1; + break; + case FaceID::South: + bPos.z += 1; + break; + case FaceID::West: + bPos.x -= 1; + break; + case FaceID::East: + bPos.x += 1; + break; + default: + break; + } + auto bi = blockInstance.getBlockSource()->getBlockInstance(bPos); + brush->set(player, bi); + } else { + brush->set(player, blockInstance); + } } return false; } @@ -100,7 +196,8 @@ namespace worldedit { void playerSubscribe() { Event::PlayerUseItemOnEvent::subscribe([](const Event::PlayerUseItemOnEvent& ev) { - return playerRightClick(ev.mPlayer, false, ev.mItemStack, *const_cast(&ev.mBlockInstance)); + return playerRightClick(ev.mPlayer, false, ev.mItemStack, *const_cast(&ev.mBlockInstance), + static_cast(ev.mFace)); }); Event::PlayerUseItemEvent::subscribe([](const Event::PlayerUseItemEvent& ev) { bool requiereWater = true; @@ -108,13 +205,21 @@ namespace worldedit { BedrockBlocks::mAir) { requiereWater = false; } - BlockInstance blockInstance = ev.mPlayer->getBlockFromViewVector(requiereWater, false, 2048.0f); - return playerRightClick(ev.mPlayer, true, ev.mItemStack, blockInstance); + FaceID face; + BlockInstance blockInstance = ev.mPlayer->getBlockFromViewVector(face, requiereWater, false, 2048.0f); + return playerRightClick(ev.mPlayer, true, ev.mItemStack, blockInstance, face); }); Event::PlayerDestroyBlockEvent::subscribe([](const Event::PlayerDestroyBlockEvent& ev) { + bool requiereWater = true; + if (Level::getBlock(ev.mPlayer->getPosition().toBlockPos(), ev.mPlayer->getDimensionId()) != + BedrockBlocks::mAir) { + requiereWater = false; + } + FaceID face; + ev.mPlayer->getBlockFromViewVector(face, requiereWater); return playerLeftClick(ev.mPlayer, false, ev.mPlayer->getHandSlot(), - *const_cast(&ev.mBlockInstance)); + *const_cast(&ev.mBlockInstance), face); }); Event::PlayerOpenContainerEvent::subscribe([](const Event::PlayerOpenContainerEvent& ev) { @@ -123,8 +228,9 @@ namespace worldedit { BedrockBlocks::mAir) { requiereWater = false; } - BlockInstance blockInstance = ev.mPlayer->getBlockFromViewVector(requiereWater); - return playerRightClick(ev.mPlayer, false, ev.mPlayer->getHandSlot(), blockInstance); + FaceID face; + BlockInstance blockInstance = ev.mPlayer->getBlockFromViewVector(face, requiereWater); + return playerRightClick(ev.mPlayer, false, ev.mPlayer->getHandSlot(), blockInstance, face); }); Event::PlayerPlaceBlockEvent::subscribe([](const Event::PlayerPlaceBlockEvent& ev) { @@ -133,8 +239,9 @@ namespace worldedit { BedrockBlocks::mAir) { requiereWater = false; } - BlockInstance blockInstance = ev.mPlayer->getBlockFromViewVector(requiereWater); - return playerRightClick(ev.mPlayer, false, ev.mPlayer->getHandSlot(), blockInstance); + FaceID face; + BlockInstance blockInstance = ev.mPlayer->getBlockFromViewVector(face, requiereWater); + return playerRightClick(ev.mPlayer, false, ev.mPlayer->getHandSlot(), blockInstance, face); }); } } // namespace worldedit @@ -151,8 +258,9 @@ THook(void, if (Level::getBlock(player->getPosition().toBlockPos(), player->getDimensionId()) != BedrockBlocks::mAir) { requiereWater = false; } - BlockInstance blockInstance = player->getBlockFromViewVector(requiereWater, false, 2048.0f); - worldedit::playerLeftClick(player, true, player->getHandSlot(), blockInstance); + FaceID face; + BlockInstance blockInstance = player->getBlockFromViewVector(face, requiereWater, false, 2048.0f); + worldedit::playerLeftClick(player, true, player->getHandSlot(), blockInstance, face); } return original(serverNetworkHandler, networkIdentifier, animatePacket); } \ No newline at end of file diff --git a/core/subscribe/player.hpp b/core/subscribe/player.hpp index cdaf893..5aee4b6 100644 --- a/core/subscribe/player.hpp +++ b/core/subscribe/player.hpp @@ -35,8 +35,16 @@ namespace worldedit { void playerSubscribe(); - bool playerLeftClick(Player* player, bool isLong, class ItemStack* item, BlockInstance& blockInstance); - bool playerRightClick(Player* player, bool isLong, class ItemStack* item, BlockInstance& blockInstance); + bool playerLeftClick(Player* player, + bool isLong, + class ItemStack* item, + BlockInstance& blockInstance, + FaceID mFace); + bool playerRightClick(Player* player, + bool isLong, + class ItemStack* item, + BlockInstance& blockInstance, + FaceID mFace); } // namespace worldedit #endif // WORLDEDIT_PLAYER_H \ No newline at end of file diff --git a/core/tool/tool.cpp b/core/tool/tool.cpp index 4dbf17a..e7201ed 100644 --- a/core/tool/tool.cpp +++ b/core/tool/tool.cpp @@ -6,6 +6,7 @@ #include "string/StringTool.h" #include "WorldEdit.h" #include "MC/Sapling.hpp" +#include "store/BlockPattern.hpp" namespace worldedit { bool Tool::leftClick(Player* player, BlockInstance& blockInstance) { @@ -66,38 +67,155 @@ namespace worldedit { if (blockInstance == BlockInstance::Null) { return false; } - // auto bs = Level::getBlockSource(player); return false; } bool CyclerTool::rightClick(Player* player, BlockInstance& blockInstance) { if (blockInstance == BlockInstance::Null) { return false; } - // auto bs = Level::getBlockSource(player); - return false; + return true; } //////// - bool FloodFillTool::rightClick(Player* player, BlockInstance& blockInstance) { + bool RepTool::leftClick(Player* player, BlockInstance& blockInstance) { if (blockInstance == BlockInstance::Null) { return false; } - // auto bs = Level::getBlockSource(player); + blockSet = BlockNBTSet(blockInstance); + return true; + } + bool RepTool::rightClick(Player* player, BlockInstance& blockInstance) { + if (blockInstance == BlockInstance::Null) { + return false; + } + auto blockSource = blockInstance.getBlockSource(); + auto bpos = blockInstance.getPosition(); + auto& mod = worldedit::getMod(); + auto xuid = player->getXuid(); + + INNERIZE_GMASK + + EvalFunctions f; + f.setbs(blockSource); + std::unordered_map variables; + + if (mod.maxHistoryLength > 0) { + auto history = mod.getPlayerNextHistory(xuid); + *history = Clipboard(BlockPos(0, 0, 0)); + history->playerRelPos.x = blockInstance.getDimensionId(); + history->playerPos = bpos; + history->storeBlock(blockInstance, BlockPos(0, 0, 0)); + } + f.setPos(bpos); + auto playerPos = player->getPosition() - Vec3(0.0, 1.62, 0.0); + auto playerRot = player->getRotation(); + variables["rx"] = bpos.x; + variables["ry"] = bpos.y; + variables["rz"] = bpos.z; + variables["px"] = playerRot.x; + variables["py"] = playerRot.y; + variables["ox"] = bpos.x - playerPos.x; + variables["oy"] = bpos.y - playerPos.y; + variables["oz"] = bpos.z - playerPos.z; + gMaskLambda(f, variables, [&]() mutable { blockSet.setBlock(bpos, blockSource); }); + return false; } //////// - bool TreeTool::rightClick(Player* player, BlockInstance& blockInstance) { + bool FloodFillTool::rightClick(Player* player, BlockInstance& blockInstance) { if (blockInstance == BlockInstance::Null) { return false; } - auto bs = Level::getBlockSource(player); - auto pos = blockInstance.getPosition(); - setBlockSimple(bs, pos, const_cast(StaticVanillaBlocks::mGrass)); - pos.y += 1; - setBlockSimple(bs, pos, const_cast(StaticVanillaBlocks::mSapling)); - auto& legacyBlock = blockInstance.getBlock()->getLegacyBlock(); - return ((Sapling&)legacyBlock)._growTree(*bs, pos, Global->getRandom(), false); + std::queue q; + auto pos0 = blockInstance.getPosition(); + q.push(pos0); + auto& mod = worldedit::getMod(); + auto xuid = player->getXuid(); + auto blockSource = blockInstance.getBlockSource(); + const Block* block = blockInstance.getBlock(); + const Block* exBlock = &blockSource->getExtraBlock(pos0); + + INNERIZE_GMASK + + EvalFunctions f; + f.setbs(blockSource); + std::unordered_map variables; + auto playerPos = player->getPosition() - Vec3(0.0, 1.62, 0.0); + auto playerRot = player->getRotation(); + std::unordered_set s; + s.insert(pos0); + + BoundingBox boundingBox = BoundingBox(pos0, pos0); + + while (!q.empty()) { + auto pos1 = q.front(); + q.pop(); + boundingBox = boundingBox.merge(pos1); + if (needEdge) { + BoundingBox(pos1 - 1, pos1 + 1).forEachBlockInBox([&](const BlockPos& tmpPos) { + if (tmpPos != pos1 && pos0.distanceTo(tmpPos) <=0.5+ radius && + (&blockSource->getBlock(tmpPos) == block && &blockSource->getExtraBlock(tmpPos) == exBlock) && + s.find(tmpPos) == s.end()) { + q.push(tmpPos); + s.insert(tmpPos); + } + }); + } else { + for (auto& tmpPos : pos1.getNeighbors()) { + if (pos0.distanceTo(tmpPos) <= 0.5+radius && + (&blockSource->getBlock(tmpPos) == block && &blockSource->getExtraBlock(tmpPos) == exBlock) && + s.find(tmpPos) == s.end()) { + q.push(tmpPos); + s.insert(tmpPos); + } + } + } + } + + worldedit::Clipboard* history = nullptr; + + if (mod.maxHistoryLength > 0) { + history = mod.getPlayerNextHistory(xuid); + *history = Clipboard(boundingBox.max - boundingBox.min); + history->playerRelPos.x = blockInstance.getDimensionId(); + history->playerPos = boundingBox.min; + } + + for(auto& pos1: s){ + if (history != nullptr) { + auto localPos = pos1 - boundingBox.min; + auto bi = blockSource->getBlockInstance(pos1); + history->storeBlock(bi, localPos); + } + f.setPos(pos1); + variables["rx"] = pos1.x; + variables["ry"] = pos1.y; + variables["rz"] = pos1.z; + variables["px"] = playerRot.x; + variables["py"] = playerRot.y; + variables["ox"] = pos1.x - playerPos.x; + variables["oy"] = pos1.y - playerPos.y; + variables["oz"] = pos1.z - playerPos.z; + gMaskLambda(f, variables, [&]() mutable { pattern->setBlock(variables, f, blockSource, pos1); }); + } + + return false; + } + + //////// + bool TreeTool::rightClick(Player* player, BlockInstance& blockInstance) { + // if (blockInstance == BlockInstance::Null) { + // return false; + // } + // auto bs = Level::getBlockSource(player); + // auto pos = blockInstance.getPosition(); + // setBlockSimple(bs, pos, const_cast(StaticVanillaBlocks::mGrass)); + // pos.y += 1; + // setBlockSimple(bs, pos, const_cast(StaticVanillaBlocks::mSapling)); + // auto& legacyBlock = blockInstance.getBlock()->getLegacyBlock(); + // return ((Sapling&)legacyBlock)._growTree(*bs, pos, Global->getRandom(), false); + return false; } //////// diff --git a/core/tool/tool.h b/core/tool/tool.h index 02288c6..4748a5b 100644 --- a/core/tool/tool.h +++ b/core/tool/tool.h @@ -9,13 +9,17 @@ #include #include #include +#include "store/BlockNBTSet.hpp" namespace worldedit { class Tool { public: + bool needFace = false; + bool lneedFace = false; Tool() = default; virtual bool leftClick(Player* player, BlockInstance& blockInstance); virtual bool rightClick(Player* player, BlockInstance& blockInstance); + virtual ~Tool() = default; }; class FarWand : public Tool { public: @@ -42,8 +46,19 @@ namespace worldedit { }; class FloodFillTool : public Tool { public: - FloodFillTool() = default; + class BlockPattern* pattern; + int radius; + bool needEdge; + FloodFillTool(BlockPattern* bp,int r,bool n):pattern(bp),radius(r),needEdge(n){} bool rightClick(Player* player, BlockInstance& blockInstance) override; + ~FloodFillTool(){delete pattern;} + }; + class RepTool : public Tool { + public: + class BlockNBTSet blockSet; + RepTool() = default; + bool leftClick(Player* player, BlockInstance& blockInstance) override; + bool rightClick(Player* player, BlockInstance& blockInstance) override; }; class TreeTool : public Tool { public: