summaryrefslogtreecommitdiff
path: root/core/fxcrt/fx_basic.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt/fx_basic.h')
-rw-r--r--core/fxcrt/fx_basic.h45
1 files changed, 22 insertions, 23 deletions
diff --git a/core/fxcrt/fx_basic.h b/core/fxcrt/fx_basic.h
index 007c362ad6..a4069fddbd 100644
--- a/core/fxcrt/fx_basic.h
+++ b/core/fxcrt/fx_basic.h
@@ -506,12 +506,11 @@ class CFX_Vector_3by1 {
public:
CFX_Vector_3by1() : a(0.0f), b(0.0f), c(0.0f) {}
- CFX_Vector_3by1(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1)
- : a(a1), b(b1), c(c1) {}
+ CFX_Vector_3by1(float a1, float b1, float c1) : a(a1), b(b1), c(c1) {}
- FX_FLOAT a;
- FX_FLOAT b;
- FX_FLOAT c;
+ float a;
+ float b;
+ float c;
};
class CFX_Matrix_3by3 {
public:
@@ -526,15 +525,15 @@ class CFX_Matrix_3by3 {
h(0.0f),
i(0.0f) {}
- CFX_Matrix_3by3(FX_FLOAT a1,
- FX_FLOAT b1,
- FX_FLOAT c1,
- FX_FLOAT d1,
- FX_FLOAT e1,
- FX_FLOAT f1,
- FX_FLOAT g1,
- FX_FLOAT h1,
- FX_FLOAT i1)
+ CFX_Matrix_3by3(float a1,
+ float b1,
+ float c1,
+ float d1,
+ float e1,
+ float f1,
+ float g1,
+ float h1,
+ float i1)
: a(a1), b(b1), c(c1), d(d1), e(e1), f(f1), g(g1), h(h1), i(i1) {}
CFX_Matrix_3by3 Inverse();
@@ -543,15 +542,15 @@ class CFX_Matrix_3by3 {
CFX_Vector_3by1 TransformVector(const CFX_Vector_3by1& v);
- FX_FLOAT a;
- FX_FLOAT b;
- FX_FLOAT c;
- FX_FLOAT d;
- FX_FLOAT e;
- FX_FLOAT f;
- FX_FLOAT g;
- FX_FLOAT h;
- FX_FLOAT i;
+ float a;
+ float b;
+ float c;
+ float d;
+ float e;
+ float f;
+ float g;
+ float h;
+ float i;
};
uint32_t GetBits32(const uint8_t* pData, int bitpos, int nbits);