fix: make threepp compatiable with windows.h (#293)

Author: cubesky

include/threepp/cameras/Camera.hpp

@@ -25,8 +25,8 @@ namespace threepp {
     public:
         float zoom = 1;
 
-        float near{};
-        float far{};
+        float nearPlane {};
+        float farPlane {};
 
         std::optional<CameraView> view;
 
@@ -39,7 +39,7 @@ namespace threepp {
         Matrix4 projectionMatrixInverse;
 
         Camera() = default;
-        Camera(float near, float far);
+        Camera(float _near, float _far);
 
         // Copies the world space direction in which the camera is looking into target.
         // (Note: A camera looks down its local, negative z-axis).

include/threepp/cameras/OrthographicCamera.hpp

@@ -25,7 +25,7 @@ namespace threepp {
 
         explicit OrthographicCamera(float left = -1, float right = 1,
                                     float top = 1, float bottom = -1,
-                                    float near = 0.1f, float far = 2000);
+                                    float nearPlane = 0.1f, float farPlane = 2000);
 
         // Sets an offset in a larger viewing frustum.
         // This is useful for multi-window or multi-monitor/multi-machine setups.

include/threepp/cameras/PerspectiveCamera.hpp

@@ -28,7 +28,7 @@ namespace threepp {
         float filmOffset = 0;// horizontal film offset (same unit as gauge)
 
         explicit PerspectiveCamera(float fov = 60, float aspect = 1,
-                                   float near = 0.1, float far = 2000);
+                                   float nearPlane = 0.1, float farPlane = 2000);
 
         /**
          * Sets the FOV by focal length in respect to the current .filmGauge.

include/threepp/core/Raycaster.hpp

@@ -34,8 +34,8 @@ namespace threepp {
     class Raycaster {
 
     public:
-        float near;
-        float far;
+        float nearPlane;
+        float farPlane;
 
         Ray ray;
         Camera* camera;
@@ -47,8 +47,7 @@ namespace threepp {
         };
         Params params;
 
-        explicit Raycaster(const Vector3& origin = Vector3(), const Vector3& direction = Vector3(), float near = 0, float far = std::numeric_limits<float>::infinity())
-            : near(near), far(far), ray(origin, direction), camera(nullptr) {}
+        explicit Raycaster(const Vector3& origin = Vector3(), const Vector3& direction = Vector3(), float _near = 0, float _far = std::numeric_limits<float>::infinity());
 
         void set(const Vector3& origin, const Vector3& direction);
 

include/threepp/input/KeyListener.hpp

@@ -119,7 +119,7 @@ namespace threepp {
         TAB,
         BACKSPACE,
         INSERT,
-        DELETE,
+        DEL,
         RIGHT,
         LEFT,
         DOWN,

include/threepp/scenes/Fog.hpp

@@ -11,10 +11,10 @@ namespace threepp {
 
     public:
         Color color;
-        float near;
-        float far;
+        float nearPlane;
+        float farPlane;
 
-        explicit Fog(const Color& color, float near = 1, float far = 1000);
+        explicit Fog(const Color& color, float _near = 1, float _far = 1000);
 
         bool operator==(const Fog& f) const;
     };

src/threepp/cameras/Camera.cpp

@@ -3,9 +3,8 @@
 
 using namespace threepp;
 
-
-Camera::Camera(float near, float far)
-    : near(near), far(far) {}
+Camera::Camera(float _near, float _far)
+    : nearPlane(_near), farPlane(_far) {}
 
 void Camera::getWorldDirection(Vector3& target) {
 

src/threepp/cameras/OrthographicCamera.cpp

@@ -67,7 +67,7 @@ void OrthographicCamera::updateProjectionMatrix() {
         bottom = top - scaleH * static_cast<float>(this->view->height);
     }
 
-    this->projectionMatrix.makeOrthographic(left, right, top, bottom, this->near, this->far);
+    this->projectionMatrix.makeOrthographic(left, right, top, bottom, this->nearPlane, this->farPlane);
 
     this->projectionMatrixInverse.copy(this->projectionMatrix).invert();
 }

src/threepp/cameras/PerspectiveCamera.cpp

@@ -86,7 +86,7 @@ void PerspectiveCamera::clearViewOffset() {
 
 void PerspectiveCamera::updateProjectionMatrix() {
 
-    float top = near * std::tan(math::DEG2RAD * 0.5f * this->fov) / this->zoom;
+    float top = nearPlane * std::tan(math::DEG2RAD * 0.5f * this->fov) / this->zoom;
     float height = 2.f * top;
     float width = this->aspect * height;
     float left = -0.5f * width;
@@ -104,10 +104,10 @@ void PerspectiveCamera::updateProjectionMatrix() {
 
     const auto skew = this->filmOffset;
     if (skew != 0) {
-        left += (near * skew / this->getFilmWidth());
+        left += (nearPlane * skew / this->getFilmWidth());
     }
 
-    this->projectionMatrix.makePerspective(left, (left + width), top, (top - height), near, far);
+    this->projectionMatrix.makePerspective(left, (left + width), top, (top - height), nearPlane, farPlane);
 
     this->projectionMatrixInverse.copy(this->projectionMatrix).invert();
 }

src/threepp/canvas/Canvas.cpp

@@ -128,7 +128,7 @@ namespace {
             case GLFW_KEY_TAB: return Key::TAB;
             case GLFW_KEY_BACKSPACE: return Key::BACKSPACE;
             case GLFW_KEY_INSERT: return Key::INSERT;
-            case GLFW_KEY_DELETE: return Key::DELETE;
+            case GLFW_KEY_DELETE: return Key::DEL;
 
             default: return Key::UNKNOWN;