diff options
| -rw-r--r-- | Source/Globals.cpp | 1 | ||||
| -rw-r--r-- | Source/Quaternions.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/Globals.cpp b/Source/Globals.cpp index c9559a5..fa18cfe 100644 --- a/Source/Globals.cpp +++ b/Source/Globals.cpp @@ -62,7 +62,6 @@ XYZ n,pa1,pa2,pa3; float u0, u1, u2; float v0, v1, v2; float a, b; -float max; int i, j; bool bInter; float pointv[3]; 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 |