Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete unused fixed math functions

Browse Source 
gcc warns about strict aliasing violations in fix.cpp:

fix/fix.cpp: In function "int FloatRound(float)":
fix/fix.cpp:157:14: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]
  157 |   return ((*((int *)&nf)) & 0x7FFFFF) - 2048;

But these functions and then some are unused, so delete them altogether.
This commit is contained in:
Jan Engelhardt 2024-09-02 22:24:55 +02:00
parent c003a98835
commit b7b2f1e9aa
3 changed files with 0 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
fix/fix.cpp
View File

@ -125,46 +125,6 @@ float FixCos(angle a) {
return (float)(c0 + ((c1 - c0) * (double)f / 256.0)); return (float)(c0 + ((c1 - c0) * (double)f / 256.0));
} }
// Returns the sine of the given angle, but does no interpolation
float FixSinFast(angle a) {
int i;
i = ((a + 0x80) >> 8) & 0xff;
return sincos_table[i];
}
// Returns the cosine of the given angle, but does no interpolation
float FixCosFast(angle a) {
int i;
i = ((a + 0x80) >> 8) & 0xff;
return sincos_table[i + 64];
}
// use this instead of:
// for: (int)floor(x+0.5f) use FloatRound(x)
// (int)ceil(x-0.5f) use FloatRound(x)
// (int)floor(x-0.5f) use FloatRound(x-1.0f)
// (int)floor(x) use FloatRound(x-0.5f)
// for values in the range -2048 to 2048
// Set a vector to {0,0,0}
int FloatRound(float x) {
float nf;
nf = x + 8390656.0f;
return ((*((int *)&nf)) & 0x7FFFFF) - 2048;
}
// A fast way to convert floats to fix
fix FloatToFixFast(float x) {
float nf;
nf = x * 65536.0f + 8390656.0f;
return ((*((int *)&nf)) & 0x7FFFFF) - 2048;
}
// Get rid of the "no return value" warnings in the next three functions // Get rid of the "no return value" warnings in the next three functions
#pragma warning(disable : 4035) #pragma warning(disable : 4035)
@ -245,26 +205,3 @@ angle FixAtan2(float cos, float sin) {
return t; return t;
} }
} }
// Does a ceiling operation on a fixed number
fix FixCeil(fix num) {
int int_num;
fix new_num;
int_num = FixToInt(num);
if (num & 0xFFFF) {
new_num = IntToFix(int_num + 1);
return new_num;
}
new_num = IntToFix(int_num);
return (new_num);
}
// Floors a fixed number
fix FixFloor(fix num) {
int int_num = FixToInt(num);
return (IntToFix(int_num));
}

23
fix/fix.h
View File

@ -89,16 +89,8 @@ float FixSin(angle a);
// Returns the cosine of the given angle. Linearly interpolates between two entries in a 256-entry table // Returns the cosine of the given angle. Linearly interpolates between two entries in a 256-entry table
float FixCos(angle a); float FixCos(angle a);
// Returns the sine of the given angle, but does no interpolation
float FixSinFast(angle a);
// Returns the cosine of the given angle, but does no interpolation
float FixCosFast(angle a);
#define Round(x) ((int)(x + 0.5)) #define Round(x) ((int)(x + 0.5))
fix FloatToFixFast(float num);
// Conversion macros // Conversion macros
//??#define FloatToFix(num) Round((num) * FLOAT_SCALER) //??#define FloatToFix(num) Round((num) * FLOAT_SCALER)
#define FloatToFix(num) ((fix)((num) * FLOAT_SCALER)) #define FloatToFix(num) ((fix)((num) * FLOAT_SCALER))
@ -106,24 +98,9 @@ fix FloatToFixFast(float num);
#define ShortToFix(num) (((int32_t)(num)) << FIX_SHIFT) #define ShortToFix(num) (((int32_t)(num)) << FIX_SHIFT)
#define FixToFloat(num) (((float)(num)) / FLOAT_SCALER) #define FixToFloat(num) (((float)(num)) / FLOAT_SCALER)
#define FixToInt(num) ((num) >> FIX_SHIFT) #define FixToInt(num) ((num) >> FIX_SHIFT)
#define FixToShort(num) ((int16_t)((num) >> FIX_SHIFT))
// use this instead of:
// for: (int)floor(x+0.5f) use FloatRound(x)
// (int)ceil(x-0.5f) use FloatRound(x)
// (int)floor(x-0.5f) use FloatRound(x-1.0f)
// (int)floor(x) use FloatRound(x-0.5f)
// for values in the range -2048 to 2048
int FloatRound(float x);
angle FixAtan2(float cos, float sin); angle FixAtan2(float cos, float sin);
angle FixAsin(float v); angle FixAsin(float v);
angle FixAcos(float v); angle FixAcos(float v);
// Does a ceiling operation on a fixed number
fix FixCeil(fix num);
// Floors a fixed number
fix FixFloor(fix num);
#endif #endif

86
scripts/lnx/osiris_vector.h
View File

@ -53,16 +53,8 @@ float FixSin(angle a);
// Returns the cosine of the given angle. Linearly interpolates between two entries in a 256-entry table // Returns the cosine of the given angle. Linearly interpolates between two entries in a 256-entry table
float FixCos(angle a); float FixCos(angle a);
// Returns the sine of the given angle, but does no interpolation
float FixSinFast(angle a);
// Returns the cosine of the given angle, but does no interpolation
float FixCosFast(angle a);
#define Round(x) ((int)(x + 0.5)) #define Round(x) ((int)(x + 0.5))
fix FloatToFixFast(float num);
// Conversion macros // Conversion macros
//??#define FloatToFix(num) Round((num) * FLOAT_SCALER) //??#define FloatToFix(num) Round((num) * FLOAT_SCALER)
#define FloatToFix(num) ((fix)((num) * FLOAT_SCALER)) #define FloatToFix(num) ((fix)((num) * FLOAT_SCALER))
@ -70,7 +62,6 @@ fix FloatToFixFast(float num);
#define ShortToFix(num) (((int32_t)(num)) << FIX_SHIFT) #define ShortToFix(num) (((int32_t)(num)) << FIX_SHIFT)
#define FixToFloat(num) (((float)(num)) / FLOAT_SCALER) #define FixToFloat(num) (((float)(num)) / FLOAT_SCALER)
#define FixToInt(num) ((num) >> FIX_SHIFT) #define FixToInt(num) ((num) >> FIX_SHIFT)
#define FixToShort(num) ((int16_t)((num) >> FIX_SHIFT))
// Tables for trig functions // Tables for trig functions
float sincos_table[321]; // 256 entries + 64 sin-only + 1 for interpolation float sincos_table[321]; // 256 entries + 64 sin-only + 1 for interpolation
@ -132,46 +123,6 @@ float FixCos(angle a) {
return (float)(c0 + ((c1 - c0) * (double)f / 256.0)); return (float)(c0 + ((c1 - c0) * (double)f / 256.0));
} }
// Returns the sine of the given angle, but does no interpolation
float FixSinFast(angle a) {
int i;
i = ((a + 0x80) >> 8) & 0xff;
return sincos_table[i];
}
// Returns the cosine of the given angle, but does no interpolation
float FixCosFast(angle a) {
int i;
i = ((a + 0x80) >> 8) & 0xff;
return sincos_table[i + 64];
}
// use this instead of:
// for: (int)floor(x+0.5f) use FloatRound(x)
// (int)ceil(x-0.5f) use FloatRound(x)
// (int)floor(x-0.5f) use FloatRound(x-1.0f)
// (int)floor(x) use FloatRound(x-0.5f)
// for values in the range -2048 to 2048
// Set a vector to {0,0,0}
int FloatRound(float x) {
float nf;
nf = x + 8390656.0f;
return ((*((int *)&nf)) & 0x7FFFFF) - 2048;
}
// A fast way to convert floats to fix
fix FloatToFixFast(float x) {
float nf;
nf = x * 65536.0f + 8390656.0f;
return ((*((int *)&nf)) & 0x7FFFFF) - 2048;
}
// Get rid of the "no return value" warnings in the next three functions // Get rid of the "no return value" warnings in the next three functions
#pragma warning(disable : 4035) #pragma warning(disable : 4035)
@ -253,47 +204,10 @@ angle FixAtan2(float cos, float sin) {
} }
} }
// Does a ceiling operation on a fixed number
fix FixCeil(fix num) {
int int_num;
fix new_num;
int_num = FixToInt(num);
if (num & 0xFFFF) {
new_num = IntToFix(int_num + 1);
return new_num;
}
new_num = IntToFix(int_num);
return (new_num);
}
// Floors a fixed number
fix FixFloor(fix num) {
int int_num = FixToInt(num);
return (IntToFix(int_num));
}
// use this instead of:
// for: (int)floor(x+0.5f) use FloatRound(x)
// (int)ceil(x-0.5f) use FloatRound(x)
// (int)floor(x-0.5f) use FloatRound(x-1.0f)
// (int)floor(x) use FloatRound(x-0.5f)
// for values in the range -2048 to 2048
int FloatRound(float x);
angle FixAtan2(float cos, float sin); angle FixAtan2(float cos, float sin);
angle FixAsin(float v); angle FixAsin(float v);
angle FixAcos(float v); angle FixAcos(float v);
// Does a ceiling operation on a fixed number
fix FixCeil(fix num);
// Floors a fixed number
fix FixFloor(fix num);
// Used for debugging. It is used in printf's so we do not have to write out the structure 3 times // Used for debugging. It is used in printf's so we do not have to write out the structure 3 times
// to print all the coordinates. // to print all the coordinates.
#define XYZ(v) (v)->x, (v)->y, (v)->z #define XYZ(v) (v)->x, (v)->y, (v)->z