From b53a1d30b2d4b69f10de9257fc1e33449e4c8773 Mon Sep 17 00:00:00 2001 From: Phillip Date: Tue, 19 Jan 2016 04:35:55 -0800 Subject: [PATCH] Fix MSVC name squatting, (near, far) --- DataSpec/DNAMP1/FRME.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DataSpec/DNAMP1/FRME.hpp b/DataSpec/DNAMP1/FRME.hpp index 8d444b121..5c93b8ba4 100644 --- a/DataSpec/DNAMP1/FRME.hpp +++ b/DataSpec/DNAMP1/FRME.hpp @@ -83,8 +83,8 @@ struct FRME : BigDNA PerspectiveProjection() : IProjection(ProjectionType::Perspective) {} Value fov; Value aspect; - Value near; - Value far; + Value znear; + Value zfar; }; struct OrthographicProjection : IProjection @@ -95,8 +95,8 @@ struct FRME : BigDNA Value right; Value top; Value bottom; - Value near; - Value far; + Value znear; + Value zfar; }; std::unique_ptr projection; };