From 379f9809d9028ff845ec52c9bc58aa2f004e79d9 Mon Sep 17 00:00:00 2001
From: Laurent Belcour <laurent.belcour@gmail.com>
Date: Thu, 21 May 2015 22:39:14 -0400
Subject: [PATCH] {Adding] The Neumann 2D parametrization.

---
 sources/core/params.cpp           | 22 ++++++++++++++++++++++
 sources/core/params.h             |  1 +
 sources/plugins/data_io/slice.cpp |  1 +
 3 files changed, 24 insertions(+)

diff --git a/sources/core/params.cpp b/sources/core/params.cpp
index 8be66b9..2297a19 100644
--- a/sources/core/params.cpp
+++ b/sources/core/params.cpp
@@ -37,6 +37,7 @@ std::map<params::input, const param_info> create_map()
 	_map.insert(std::make_pair<params::input, const param_info>(params::COS_TH_TD, param_info("COS_TH_TD", 2, "Cosines of the elevation angles of the Half angle parametrization")));
 	_map.insert(std::make_pair<params::input, const param_info>(params::ISOTROPIC_TV_PROJ_DPHI, param_info("ISOTROPIC_TV_PROJ_DPHI", 2, "Isoptropic projected phi parametrization without a light direction.")));
 	_map.insert(std::make_pair<params::input, const param_info>(params::STARK_2D, param_info("STARK_2D", 2, "Stark parametrization H, B but without third component.")));
+	_map.insert(std::make_pair<params::input, const param_info>(params::NEUMANN_2D, param_info("NEUMANN_2D", 2, "Neumann parametrization H, B but without third component.")));
 
 	/* 3D Params */
 	_map.insert(std::make_pair<params::input, const param_info>(params::RUSIN_TH_TD_PD, param_info("RUSIN_TH_TD_PD", 3, "Isotropic Half angle parametrization")));
@@ -161,6 +162,16 @@ void params::to_cartesian(const double* invec, params::input intype,
 			outvec[3] = Hx+Bx; 
 			outvec[4] = Hy+By;
 			outvec[5] = Hz+Bz;
+		}
+			break;
+		case NEUMANN_2D:
+		{
+			outvec[0] =   invec[0];
+			outvec[1] =   invec[1];
+			outvec[2] =   sqrt(1.0 - outvec[0]*outvec[0] - outvec[1]*outvec[1]);
+			outvec[3] =   invec[0];
+			outvec[4] = - invec[1];
+			outvec[5] =   sqrt(1.0 - outvec[3]*outvec[3] - outvec[4]*outvec[4]);
 		}
 			break;
 
@@ -380,6 +391,17 @@ void params::from_cartesian(const double* invec, params::input outtype,
 			double By = 0.5*(invec[4]-invec[1]);
 			double Bz = 0.5*(invec[5]-invec[2]);
 			outvec[1] = sqrt(Bx*Bx + By*By + Bz*Bz);
+		}
+			break;
+		case NEUMANN_2D:
+		{
+			double Hx = 0.5*(invec[0]+invec[3]);
+			double Hy = 0.5*(invec[1]+invec[4]);
+			outvec[0] = sqrt(Hx*Hx + Hy*Hy);
+
+			double Bx = 0.5*(invec[3]-invec[0]);
+			double By = 0.5*(invec[4]-invec[1]);
+			outvec[1] = sqrt(Bx*Bx + By*By);
 		}
 			break;
 
diff --git a/sources/core/params.h b/sources/core/params.h
index 0e1b33b..3d26e43 100644
--- a/sources/core/params.h
+++ b/sources/core/params.h
@@ -98,6 +98,7 @@ class params
 
         // Params goes from (-1,-1) to (1,1)
         STARK_2D,
+        NEUMANN_2D,
 
        CARTESIAN,             /*!< View and Light vectors represented in cartesian coordinates.
                                We always pack the view vector first: \f$\vec{c} = [v.x, v.y, 
diff --git a/sources/plugins/data_io/slice.cpp b/sources/plugins/data_io/slice.cpp
index 8143dba..2327c44 100644
--- a/sources/plugins/data_io/slice.cpp
+++ b/sources/plugins/data_io/slice.cpp
@@ -56,6 +56,7 @@ class BrdfSlice : public data {
 			if(args.is_defined("param")) {
 				params::input param = params::parse_input(args["param"]);
 				if(params::dimension(param) == 2) {
+					std::cout << "<<INFO>> Specified param \"" << args["param"] << "\"" << std::endl;
 					this->setParametrization(param);
 				} else {
 					std::cout << "<<ERROR>> Invalid specified param \"" << args["param"] << "\"" << std::endl;
-- 
GitLab