diff options
| author | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2021-06-17 13:59:37 +0700 |
|---|---|---|
| committer | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2021-06-17 13:59:37 +0700 |
| commit | d81b0a3b6071b16afa2b60979a69f507d41355a6 (patch) | |
| tree | 44c0bc6658c3cfaa5f6c12f949f5abfaddc79f29 /Source/Quaternions.cpp | |
| parent | d048a7ddf445885c9e1e7c3308d9778eb25e5bcd (diff) | |
| download | blackshades-d81b0a3b6071b16afa2b60979a69f507d41355a6.tar.gz | |
Localize max to avoid clashing with std::max
Diffstat (limited to 'Source/Quaternions.cpp')
| -rw-r--r-- | Source/Quaternions.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Quaternions.cpp b/Source/Quaternions.cpp index 8b3f7df..464c0f2 100644 --- a/Source/Quaternions.cpp +++ b/Source/Quaternions.cpp @@ -316,7 +316,6 @@ float normaldotproduct(XYZ point1, XYZ point2){ extern float u0, u1, u2; extern float v0, v1, v2; extern float a, b; -extern float max; extern int i, j; extern bool bInter; extern float pointv[3]; @@ -352,7 +351,7 @@ bool PointInTriangle(Vector *p, Vector normal, float p11, float p12, float p13, #define ABS(X) (((X)<0.f)?-(X):(X) ) #define MAX(A, B) (((A)<(B))?(B):(A)) - max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2])); + float max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2])); #undef MAX if (max == ABS(normalv[0])) {i = 1; j = 2;} // y, z if (max == ABS(normalv[1])) {i = 0; j = 2;} // x, z @@ -447,7 +446,7 @@ bool PointInTriangle(XYZ *p, XYZ normal, XYZ *p1, XYZ *p2, XYZ *p3) #define ABS(X) (((X)<0.f)?-(X):(X) ) #define MAX(A, B) (((A)<(B))?(B):(A)) - max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2])); + float max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2])); #undef MAX if (max == ABS(normalv[0])) {i = 1; j = 2;} // y, z if (max == ABS(normalv[1])) {i = 0; j = 2;} // x, z |