zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make binaryangle.h compile.

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-23 16:40:59 +02:00
parent be9094cb97
commit ab8006cc40
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
source/core/binaryangle.h
View file

@ -9,13 +9,13 @@ class binangle
{ {
unsigned int value; unsigned int value;
inline constexpr double pi() { return 3.14159265358979323846; } inline static constexpr double pi() { return 3.14159265358979323846; }
constexpr binangle(unsigned int v) : value(v) {} constexpr binangle(unsigned int v) : value(v) {}
friend binangle bamang(unsigned int v); friend constexpr binangle bamang(unsigned int v);
friend binangle q16ang(unsigned int v); friend constexpr binangle q16ang(unsigned int v);
friend binangle buildang(unsigned int v); friend constexpr binangle buildang(unsigned int v);
friend binangle radang(double v); friend binangle radang(double v);
friend binangle degang(double v); friend binangle degang(double v);
@ -30,8 +30,8 @@ public:
double fsin() const { return sin(asrad()); } double fsin() const { return sin(asrad()); }
double fcos() const { return cos(asrad()); } double fcos() const { return cos(asrad()); }
double ftan() const { return tan(asrad()); } double ftan() const { return tan(asrad()); }
int bsin() const { return sintable(asbuild()); } int bsin() const { return sintable[asbuild()]; }
int bcos() const { return sintable((asbuild() + 512) & 2047); } int bcos() const { return sintable[(asbuild() + 512) & 2047]; }
#if 0 // This makes no sense #if 0 // This makes no sense
bool operator< (binangle other) const bool operator< (binangle other) const
@ -64,15 +64,15 @@ public:
return value != other.value; return value != other.value;
} }
constexpr binangle &operator+= (binangle other) const constexpr binangle &operator+= (binangle other)
{ {
value += other.value; value += other.value;
return *this; return *this;
} }
constexpr binangle &operator-= (binangle other) const constexpr binangle &operator-= (binangle other)
{ {
value -+= other.value; value -= other.value;
return *this; return *this;
} }
@ -98,6 +98,6 @@ public:
inline constexpr binangle bamang(unsigned int v) { return binangle(v); } inline constexpr binangle bamang(unsigned int v) { return binangle(v); }
inline constexpr binangle q16ang(unsigned int v) { return binangle(v << 5); } inline constexpr binangle q16ang(unsigned int v) { return binangle(v << 5); }
inline constexpr binangle buildang(unsigned int v) { return binangle(v << 21); } inline constexpr binangle buildang(unsigned int v) { return binangle(v << 21); }
inline binangle radang(double v) { return binangle(xs_CRoundToUInt(v * (0x80000000u / pi())); } inline binangle radang(double v) { return binangle(xs_CRoundToUInt(v * (0x80000000u / binangle::pi()))); }
inline binangle degang(double v) { return binangle(xs_CRoundToUInt(v * (0x40000000 / 90.)); } inline binangle degang(double v) { return binangle(xs_CRoundToUInt(v * (0x40000000 / 90.))); }

1
source/games/duke/src/duke3d.h
View file

@ -22,6 +22,7 @@
#include "sounds.h" #include "sounds.h"
#include "soundefs.h" #include "soundefs.h"
#include "stats.h" #include "stats.h"
#include "binaryangle.h"
extern glcycle_t drawtime, actortime, thinktime, gameupdatetime; extern glcycle_t drawtime, actortime, thinktime, gameupdatetime;