backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

missed one error with clang

Browse source
This commit is contained in:
Nikita Edel 2026-03-11 19:41:31 +01:00
parent b47ee34a61
commit c0198bb8a7
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Minecraft.World/Util/JavaMath.cpp
View file

@ -36,7 +36,20 @@ double Math::random()
//the value of the argument rounded to the nearest long value. //the value of the argument rounded to the nearest long value.
__int64 Math::round( double d ) __int64 Math::round( double d )
{ {
return (__int64)floor( d + 0.5 ); // 4jcraft fixes the fact that if double is a huge
// number than the cast of d to int64_t overflows
d = floor( d + 0.5 );
// if smaller or bigger than representable int64 than return the max
if(d >= (double)INT64_MAX) {
return INT64_MAX;
} else if (d <= (double)INT64_MIN) {
return INT64_MIN;
}
return (int64_t) d;
} }
int Math::_max(int a, int b) int Math::_max(int a, int b)
@ -73,4 +86,4 @@ double Math::wrapDegrees(double input)
if (input >= 180.0) input -= 360.0; if (input >= 180.0) input -= 360.0;
if (input < -180.0) input += 360.0; if (input < -180.0) input += 360.0;
return input; return input;
} }

6
Minecraft.World/Util/Mth.cpp
View file

@ -25,13 +25,13 @@ void Mth::init()
float Mth::sin(float i) float Mth::sin(float i)
{ {
if(_sin == NULL) init(); // 4J - added if(_sin == NULL) init(); // 4J - added
return _sin[(int) (i * sinScale) & 65535]; return _sin[(int)fmodf(i * sinScale, 65536.0f) & 65535];
} }
float Mth::cos(float i) float Mth::cos(float i)
{ {
if(_sin == NULL) init(); // 4J - added if(_sin == NULL) init(); // 4J - added
return _sin[(int) (i * sinScale + 65536 / 4) & 65535]; return _sin[(int)fmodf(i * sinScale + 16384.0f, 65536.0f) & 65535];
} }
float Mth::sqrt(float x) float Mth::sqrt(float x)
@ -169,4 +169,4 @@ double Mth::wrapDegrees(double input)
bool Mth::almostEquals( double double1, double double2, double precision) bool Mth::almostEquals( double double1, double double2, double precision)
{ {
return (std::abs(double1 - double2) <= precision); return (std::abs(double1 - double2) <= precision);
} }