add prophoto to matrixmaker code

svgeesus · svgeesus · commit 928af8f000a1 · 2019-02-24T03:29:53.000+02:00
diff --git a/css-color-4/matrixmaker.html b/css-color-4/matrixmaker.html
@@ -1,10 +1,10 @@
 ﻿<html>
 	<script src="math.js"></script>
 	<script>
-	
+
 // Make matrices for converting to and from an arbitrary RGB colorspace,
 // given the x,y chromaticities of red, green, blue and white.
-// To use these matrices, the RGB components are assumed be be 
+// To use these matrices, the RGB components are assumed be be
 // linearized and in the range 0 to 1.
 // http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
 
@@ -13,61 +13,75 @@
 
 
 		// these are for ITU Rec BT.2020
-		/*		
+		/*
 		const xred=0.708 ;
 		const yred=0.292 ;
-		
+
 		const xgreen=0.170 ;
 		const ygreen=0.797 ;
-		
+
 		const xblue=0.131 ;
 		const yblue=0.046 ;
 		*/
-		
+
 		// these are for DCI P3
-		const xred=0.680 ;
-		const yred=0.320 ;
-		
-		const xgreen=0.265 ;
-		const ygreen=0.690 ;
-		
-		const xblue=0.150 ;
-		const yblue=0.060 ;
-		
+		// const xred=0.680 ;
+		// const yred=0.320 ;
+
+		// const xgreen=0.265 ;
+		// const ygreen=0.690 ;
+
+		// const xblue=0.150 ;
+		// const yblue=0.060 ;
+
+		// ProPhoto
+		const xred=0.7347 ;
+		const yred=0.2653 ;
+
+		const xgreen=0.1596 ;
+		const ygreen=0.8404  ;
+
+		const xblue=0.0366 ;
+		const yblue=0.0001  ;
+
 		// AdobeRGB, for testing
 		/*
 		const xred=0.640 ;
 		const yred=0.330 ;
-		
+
 		const xgreen=0.210 ;
 		const ygreen=0.710 ;
-		
+
 		const xblue=0.150 ;
 		const yblue=0.060 ;
 		*/
-		
+
 		// D65
-		const xwhite=0.3127 ;
-		const ywhite=0.3290 ;
-		
-		
+		// const xwhite=0.3127 ;
+		// const ywhite=0.3290 ;
+
+		// D50
+		const xwhite=0.3457  ;
+		const ywhite=0.3585 ;
+
+
 		// Relative XYZ values. Copy-paste-o-rama
 		var XWhite=xwhite/ywhite;
 		var YWhite=1;
 		var ZWhite=(1 - xwhite - ywhite)/ywhite;
-		
+
 		var XRed=xred/yred;
 		var YRed=1;
 		var ZRed=(1 - xred - yred)/yred;
-		
+
 		var XGreen=xgreen/ygreen;
 		var YGreen=1;
 		var ZGreen=(1 - xgreen - ygreen)/ygreen;
-		
+
 		var XBlue=xblue/yblue;
 		var YBlue=1;
 		var ZBlue=(1 - xblue - yblue)/yblue;
-		
+
 		var white = math.matrix([XWhite, YWhite, ZWhite]);
 		console.log(white.valueOf());
 		var primaries = math.matrix([
@@ -76,27 +90,27 @@
 			[ZRed, ZGreen, ZBlue]
 		]);
 		console.log(primaries.valueOf());
-		
+
 		var iprimaries = math.inv(primaries);
 		console.log(iprimaries.valueOf());
-		
+
 		// S is easier if it ends up as an array than a matrix
 		// but we use matrix math to calculate it
 		var S = math.multiply(math.inv(primaries),white).valueOf();
-		
+
 		var M = [
 			[S[0] * XRed, S[1] * XGreen, S[2] * XBlue],
 			[S[0] * YRed, S[1] * YGreen, S[2] * YBlue],
 			[S[0] * ZRed, S[1] * ZGreen, S[2] * ZBlue]
 		];
-		
+
 		console.log("RGB to XYZ");
 		console.log(M);
 		console.log("XYZ to RGB");
 		console.log(math.inv(math.matrix(M)).valueOf());
-		
+
 		// for code verification: with AdobeRGB primaries, correct result is
-		// M = 
+		// M =
 		//	[[0.5767309  0.1855540  0.1881852],
  		//	 [0.2973769  0.6273491  0.0752741],
  		//	 [0.0270343  0.0706872  0.9911085]];
