Skip to content
This repository was archived by the owner on Apr 2, 2021. It is now read-only.

Commit 19e070f

Browse files
committed
Fixed cellular value/distance error
1 parent cb3f40b commit 19e070f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

FastNoiseSIMD/FastNoiseSIMD_internal.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ static SIMDf VECTORCALL FUNC(CellularValue##distanceFunc##Single)(SIMDi seed, SI
16111611
\
16121612
xd = SIMDf_MUL_ADD(xd, invMag, xcf);\
16131613
yd = SIMDf_MUL_ADD(yd, invMag, ycf);\
1614-
zd = SIMDf_MUL_ADD(zd, invMag, SIMDf_SUB(SIMDf_CONVERT_TO_FLOAT(zc), z));\
1614+
zd = SIMDf_MUL_ADD(zd, invMag, zcf);\
16151615
\
16161616
SIMDf newCellValue = SIMDf_MUL(SIMDf_NUM(hash2Float), SIMDf_CONVERT_TO_FLOAT(hash));\
16171617
SIMDf newDistance = distanceFunc##_DISTANCE(xd, yd, zd);\
@@ -1809,7 +1809,7 @@ static SIMDf VECTORCALL FUNC(CellularDistance##distanceFunc##Single)(SIMDi seed,
18091809
\
18101810
xd = SIMDf_MUL_ADD(xd, invMag, xcf);\
18111811
yd = SIMDf_MUL_ADD(yd, invMag, ycf);\
1812-
zd = SIMDf_MUL_ADD(zd, invMag, SIMDf_SUB(SIMDf_CONVERT_TO_FLOAT(zc), z));\
1812+
zd = SIMDf_MUL_ADD(zd, invMag, zcf);\
18131813
\
18141814
SIMDf newDistance = distanceFunc##_DISTANCE(xd, yd, zd);\
18151815
\
@@ -1963,10 +1963,6 @@ CELLULAR_LOOKUP_SINGLE(Euclidean)
19631963
CELLULAR_LOOKUP_SINGLE(Manhattan)
19641964
CELLULAR_LOOKUP_SINGLE(Natural)
19651965

1966-
CELLULAR_DISTANCE2CAVE_SINGLE(Euclidean)
1967-
CELLULAR_DISTANCE2CAVE_SINGLE(Manhattan)
1968-
CELLULAR_DISTANCE2CAVE_SINGLE(Natural)
1969-
19701966
#undef Natural_DISTANCE
19711967
#define Natural_DISTANCE(_x, _y, _z) SIMDf_MUL(Euclidean_DISTANCE(_x,_y,_z), Manhattan_DISTANCE(_x,_y,_z))
19721968

@@ -1985,6 +1981,10 @@ CELLULAR_DISTANCE2_MULTI(Distance2Sub)
19851981
CELLULAR_DISTANCE2_MULTI(Distance2Div)
19861982
CELLULAR_DISTANCE2_MULTI(Distance2Mul)
19871983

1984+
CELLULAR_DISTANCE2CAVE_SINGLE(Euclidean)
1985+
CELLULAR_DISTANCE2CAVE_SINGLE(Manhattan)
1986+
CELLULAR_DISTANCE2CAVE_SINGLE(Natural)
1987+
19881988
#define CELLULAR_MULTI(returnFunc)\
19891989
switch(m_cellularDistanceFunction)\
19901990
{\

0 commit comments

Comments
 (0)