@@ -1611,7 +1611,7 @@ static SIMDf VECTORCALL FUNC(CellularValue##distanceFunc##Single)(SIMDi seed, SI
1611
1611
\
1612
1612
xd = SIMDf_MUL_ADD (xd, invMag, xcf);\
1613
1613
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 );\
1615
1615
\
1616
1616
SIMDf newCellValue = SIMDf_MUL (SIMDf_NUM (hash2Float), SIMDf_CONVERT_TO_FLOAT (hash));\
1617
1617
SIMDf newDistance = distanceFunc##_DISTANCE (xd, yd, zd);\
@@ -1809,7 +1809,7 @@ static SIMDf VECTORCALL FUNC(CellularDistance##distanceFunc##Single)(SIMDi seed,
1809
1809
\
1810
1810
xd = SIMDf_MUL_ADD (xd, invMag, xcf);\
1811
1811
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 );\
1813
1813
\
1814
1814
SIMDf newDistance = distanceFunc##_DISTANCE (xd, yd, zd);\
1815
1815
\
@@ -1963,10 +1963,6 @@ CELLULAR_LOOKUP_SINGLE(Euclidean)
1963
1963
CELLULAR_LOOKUP_SINGLE(Manhattan)
1964
1964
CELLULAR_LOOKUP_SINGLE(Natural)
1965
1965
1966
- CELLULAR_DISTANCE2CAVE_SINGLE(Euclidean)
1967
- CELLULAR_DISTANCE2CAVE_SINGLE(Manhattan)
1968
- CELLULAR_DISTANCE2CAVE_SINGLE(Natural)
1969
-
1970
1966
#undef Natural_DISTANCE
1971
1967
#define Natural_DISTANCE (_x, _y, _z ) SIMDf_MUL(Euclidean_DISTANCE(_x,_y,_z), Manhattan_DISTANCE(_x,_y,_z))
1972
1968
@@ -1985,6 +1981,10 @@ CELLULAR_DISTANCE2_MULTI(Distance2Sub)
1985
1981
CELLULAR_DISTANCE2_MULTI(Distance2Div)
1986
1982
CELLULAR_DISTANCE2_MULTI(Distance2Mul)
1987
1983
1984
+ CELLULAR_DISTANCE2CAVE_SINGLE(Euclidean)
1985
+ CELLULAR_DISTANCE2CAVE_SINGLE(Manhattan)
1986
+ CELLULAR_DISTANCE2CAVE_SINGLE(Natural)
1987
+
1988
1988
#define CELLULAR_MULTI (returnFunc )\
1989
1989
switch (m_cellularDistanceFunction)\
1990
1990
{\
0 commit comments