diff --git a/deploy/materials.json b/deploy/materials.json index 46856c7..211243a 100644 --- a/deploy/materials.json +++ b/deploy/materials.json @@ -1,12 +1,12 @@ [ { "name": "Aluminum", - "color": [0.912, 0.914, 0.92], + "color": [0.933, 0.912, 0.853], "metalness": 1, - "specularColor": [0.97, 0.979, 0.988], + "specularColor": [0.981, 0.979, 0.961], "roughness": 0, "ior": 1.5, - "complexIor": [1.3456, 7.4746, 0.96521, 6.3995, 0.61722, 5.3031], + "complexIor": [1.16234, 7.90265, 0.958053, 6.29309, 1.04947, 5.01364], "density": 2700, "category": ["Metal"], "description": "", @@ -105,12 +105,12 @@ }, { "name": "Brass", - "color": [0.887, 0.789, 0.434], + "color": [0.931, 0.776, 0.392], "metalness": 1, - "specularColor": [0.988, 0.976, 0.843], + "specularColor": [0.995, 0.974, 0.747], "roughness": 0, "ior": 1.5, - "complexIor": [0.444, 3.695, 0.527, 2.765, 1.094, 1.829], + "complexIor": [0.341048, 4.14088, 0.53349, 2.67993, 1.42749, 1.87543], "density": 8600, "category": ["Metal"], "description": "Brass is an alloy of copper and zinc, with a bright and gold-like appearance. It is similar to bronze, another alloy containing copper that uses tin instead of zinc. Historically, the distinction between the two alloys has been less consistent and clear, and modern practice in museums and archaeology increasingly avoids both terms for historical objects in favor of the more general \"copper alloy\".", @@ -227,12 +227,12 @@ }, { "name": "Chromium", - "color": [0.638, 0.651, 0.663], + "color": [0.653, 0.65, 0.615], "metalness": 1, - "specularColor": [0.632, 0.718, 0.809], + "specularColor": [0.675, 0.72, 0.711], "roughness": 0, "ior": 1.5, - "complexIor": [3.4256, 4.273, 2.7891, 4.1976, 2.0246, 3.8586], + "complexIor": [3.20617, 4.38724, 2.76851, 4.18069, 2.56326, 3.75018], "density": 7200, "category": ["Metal"], "description": "", @@ -247,12 +247,12 @@ }, { "name": "Cobalt", - "color": [0.692, 0.703, 0.673], + "color": [0.715, 0.702, 0.622], "metalness": 1, - "specularColor": [0.684, 0.771, 0.817], + "specularColor": [0.731, 0.775, 0.715], "roughness": 0, "ior": 1.5, - "complexIor": [3.5681, 5.0469, 2.7408, 4.7897, 2.0192, 3.9523], + "complexIor": [3.33754, 5.27723, 2.6841, 4.73548, 2.57555, 3.81892], "density": 8900, "category": ["Metal"], "description": "", @@ -334,12 +334,12 @@ }, { "name": "Copper", - "color": [0.926, 0.721, 0.504], + "color": [0.988, 0.688, 0.448], "metalness": 1, - "specularColor": [0.996, 0.957, 0.823], + "specularColor": [0.999, 0.946, 0.705], "roughness": 0, "ior": 1.5, - "complexIor": [0.27105, 3.6092, 0.67693, 2.6248, 1.3164, 2.2921], + "complexIor": [0.137212, 5.48257, 0.750114, 2.56138, 1.75582, 2.26828], "density": 8940, "category": ["Metal"], "description": "", @@ -497,12 +497,12 @@ }, { "name": "Gold", - "color": [0.944, 0.776, 0.373], + "color": [1.0, 0.72, 0.315], "metalness": 1, - "specularColor": [0.998, 0.981, 0.751], + "specularColor": [1.0, 0.973, 0.597], "roughness": 0, "ior": 1.5, - "complexIor": [0.18299, 3.4242, 0.42108, 2.3459, 1.3734, 1.7704], + "complexIor": [0, 6.3108, 0.487424, 2.18391, 1.74577, 1.63493], "density": 19320, "category": ["Metal"], "description": "", @@ -582,12 +582,12 @@ }, { "name": "Iron", - "color": [0.531, 0.512, 0.496], + "color": [0.542, 0.512, 0.458], "metalness": 1, - "specularColor": [0.571, 0.54, 0.586], + "specularColor": [0.612, 0.541, 0.422], "roughness": 0, "ior": 1.5, - "complexIor": [2.9114, 3.0893, 2.9497, 2.9318, 2.5845, 2.767], + "complexIor": [2.73466, 3.14869, 2.94186, 2.92718, 3.15654, 2.46012], "density": 7870, "category": ["Metal"], "description": "", @@ -627,12 +627,12 @@ }, { "name": "Lead", - "color": [0.632, 0.626, 0.641], + "color": [0.641, 0.622, 0.59], "metalness": 1, - "specularColor": [0.803, 0.808, 0.862], + "specularColor": [0.819, 0.804, 0.769], "roughness": 0, "ior": 1.5, - "complexIor": [1.91, 3.51, 1.83, 3.4, 1.44, 3.18], + "complexIor": [1.81659, 3.50606, 1.84441, 3.37971, 1.96022, 3.23189], "density": 11340, "category": ["Metal"], "description": "", @@ -685,12 +685,12 @@ }, { "name": "Mercury", - "color": [0.781, 0.779, 0.779], + "color": [0.799, 0.777, 0.721], "metalness": 1, - "specularColor": [0.879, 0.91, 0.941], + "specularColor": [0.901, 0.91, 0.89], "roughness": 0, "ior": 1.5, - "complexIor": [2.0733, 5.3383, 1.5523, 4.651, 1.0606, 3.8628], + "complexIor": [1.86932, 5.36989, 1.53811, 4.60484, 1.4963, 3.92685], "density": 13546, "viscosity": 1.552, "category": ["Metal"], @@ -769,12 +769,12 @@ }, { "name": "Nickel", - "color": [0.649, 0.61, 0.541], + "color": [0.664, 0.606, 0.495], "metalness": 1, - "specularColor": [0.797, 0.801, 0.789], + "specularColor": [0.824, 0.798, 0.68], "roughness": 0, "ior": 1.5, - "complexIor": [2.0592, 3.7574, 1.8179, 3.2741, 1.621, 2.6933], + "complexIor": [1.88896, 3.7543, 1.81884, 3.2447, 2.0708, 2.64853], "density": 8900, "category": ["Metal"], "description": "", @@ -958,12 +958,12 @@ }, { "name": "Platinum", - "color": [0.679, 0.642, 0.588], + "color": [0.695, 0.638, 0.541], "metalness": 1, - "specularColor": [0.785, 0.789, 0.784], + "specularColor": [0.816, 0.786, 0.671], "roughness": 0, "ior": 1.5, - "complexIor": [2.3757, 4.2655, 2.0847, 3.7153, 1.8453, 3.1365], + "complexIor": [2.1755, 4.28265, 2.0879, 3.67782, 2.35677, 3.05144], "density": 21450, "category": ["Metal"], "description": "", @@ -998,6 +998,27 @@ "https://raw.githubusercontent.com/AntonPalmqvist/physically-based-api/main/images/renders/cycles/600/polyurethane.jpeg" ] }, + { + "name": "Quartz", + "color": [1, 1, 1], + "metalness": 0, + "roughness": 0, + "ior": 1.54, + "transmission": 1, + "transmissionDispersion": 67.82, + "density": 2600, + "category": ["Crystal"], + "description": "", + "sources": [ + "https://en.wikipedia.org/w/index.php?title=Quartz&oldid=1274064692", + "https://en.wikipedia.org/w/index.php?title=Density&oldid=1271894167", + "https://refractiveindex.info/?shelf=3d&book=crystals&page=quartz" + ], + "tags": [], + "reference": [ + "https://raw.githubusercontent.com/AntonPalmqvist/physically-based-api/main/images/renders/cycles/600/quartz.jpeg" + ] + }, { "name": "Salt", "color": [1, 1, 1], @@ -1061,11 +1082,12 @@ }, { "name": "Silicon", - "color": [0.344, 0.367, 0.419], + "color": [0.351, 0.367, 0.394], "metalness": 1, + "specularColor": [0.081, 0, 0.004], "roughness": 0, "ior": 1.5, - "complexIor": [3.835, 0.014, 4.073, 0.028, 4.673, 0.095], + "complexIor": [3.63351, 0.966245, 4.06958, 0, 4.36103, 0], "density": 2330, "category": ["Metal"], "description": "", @@ -1081,12 +1103,12 @@ }, { "name": "Silver", - "color": [0.962, 0.949, 0.922], + "color": [0.984, 0.946, 0.851], "metalness": 1, - "specularColor": [0.999, 0.998, 0.998], + "specularColor": [0.999, 0.998, 0.986], "roughness": 0, "ior": 1.5, - "complexIor": [0.15943, 3.9291, 0.14512, 3.19, 0.13547, 2.3808], + "complexIor": [0.0636949, 3.69295, 0.155409, 3.20559, 0.426839, 3.12206], "density": 10500, "category": ["Metal"], "description": "", @@ -1334,12 +1356,12 @@ }, { "name": "Titanium", - "color": [0.616, 0.582, 0.544], + "color": [0.633, 0.578, 0.503], "metalness": 1, - "specularColor": [0.689, 0.683, 0.689], + "specularColor": [0.728, 0.68, 0.55], "roughness": 0, "ior": 1.5, - "complexIor": [2.7407, 3.8143, 2.5418, 3.4345, 2.267, 3.0385], + "complexIor": [2.55584, 3.89385, 2.52916, 3.39243, 2.8235, 2.85229], "density": 4540, "category": ["Metal"], "description": "", @@ -1372,12 +1394,12 @@ }, { "name": "Tungsten", - "color": [0.504, 0.498, 0.478], + "color": [0.518, 0.495, 0.442], "metalness": 1, - "specularColor": [0.403, 0.418, 0.423], + "specularColor": [0.461, 0.413, 0.206], "roughness": 0, "ior": 1.5, - "complexIor": [3.6518, 2.7955, 3.5064, 2.7585, 3.313, 2.6051], + "complexIor": [3.45096, 2.96613, 3.51714, 2.7338, 4.02045, 1.90549], "density": 19300, "category": ["Metal"], "description": "", @@ -1392,12 +1414,12 @@ }, { "name": "Vanadium", - "color": [0.52, 0.532, 0.541], + "color": [0.547, 0.525, 0.506], "metalness": 1, - "specularColor": [0.402, 0.447, 0.395], + "specularColor": [0.474, 0.426, 0.175], "roughness": 0, "ior": 1.5, - "complexIor": [3.8114, 2.931, 3.6721, 3.0917, 4.0878, 3.1196], + "complexIor": [3.6507, 3.25065, 3.72723, 3.00712, 4.94609, 2.17896], "density": 6100, "category": ["Metal"], "description": "", @@ -1460,12 +1482,12 @@ }, { "name": "Zinc", - "color": [0.802, 0.844, 0.863], + "color": [0.826, 0.842, 0.801], "metalness": 1, - "specularColor": [0.817, 0.922, 0.964], + "specularColor": [0.854, 0.922, 0.923], "roughness": 0, "ior": 1.5, - "complexIor": [3.4161, 7.0325, 1.9286, 6.3963, 1.0424, 5.125], + "complexIor": [3.15207, 7.39342, 1.89133, 6.28678, 1.48736, 4.92701], "density": 7000, "category": ["Metal"], "description": "", diff --git a/deploy/v2/materials.json b/deploy/v2/materials.json index 889ee7e..3c2f3ac 100644 --- a/deploy/v2/materials.json +++ b/deploy/v2/materials.json @@ -1,11 +1,11 @@ [ { "name": "Aluminum", - "color": [0.912, 0.914, 0.92], + "color": [0.933, 0.912, 0.853], "metalness": 1, - "specularColor": [0.97, 0.979, 0.988], + "specularColor": [0.981, 0.979, 0.961], "roughness": 0, - "complexIor": [1.3456, 7.4746, 0.96521, 6.3995, 0.61722, 5.3031], + "complexIor": [1.16234, 7.90265, 0.958053, 6.29309, 1.04947, 5.01364], "density": [2700, 2700], "category": ["Metal"], "tags": ["aluminium", "mirror"], @@ -273,11 +273,11 @@ }, { "name": "Brass", - "color": [0.887, 0.789, 0.434], + "color": [0.931, 0.776, 0.392], "metalness": 1, - "specularColor": [0.988, 0.976, 0.843], + "specularColor": [0.995, 0.974, 0.747], "roughness": 0, - "complexIor": [0.444, 3.695, 0.527, 2.765, 1.094, 1.829], + "complexIor": [0.341048, 4.14088, 0.53349, 2.67993, 1.42749, 1.87543], "density": [8600, 8600], "category": ["Metal"], "description": "Brass is an alloy of copper and zinc, with a bright and gold-like appearance. It is similar to bronze, another alloy containing copper that uses tin instead of zinc. Historically, the distinction between the two alloys has been less consistent and clear, and modern practice in museums and archaeology increasingly avoids both terms for historical objects in favor of the more general \"copper alloy\".", @@ -563,11 +563,11 @@ }, { "name": "Chromium", - "color": [0.638, 0.651, 0.663], + "color": [0.653, 0.65, 0.615], "metalness": 1, - "specularColor": [0.632, 0.718, 0.809], + "specularColor": [0.675, 0.72, 0.711], "roughness": 0, - "complexIor": [3.4256, 4.273, 2.7891, 4.1976, 2.0246, 3.8586], + "complexIor": [3.20617, 4.38724, 2.76851, 4.18069, 2.56326, 3.75018], "density": [7200, 7200], "category": ["Metal"], "tags": ["chrome"], @@ -601,11 +601,11 @@ }, { "name": "Cobalt", - "color": [0.692, 0.703, 0.673], + "color": [0.715, 0.702, 0.622], "metalness": 1, - "specularColor": [0.684, 0.771, 0.817], + "specularColor": [0.731, 0.775, 0.715], "roughness": 0, - "complexIor": [3.5681, 5.0469, 2.7408, 4.7897, 2.0192, 3.9523], + "complexIor": [3.33754, 5.27723, 2.6841, 4.73548, 2.57555, 3.81892], "density": [8900, 8900], "category": ["Metal"], "references": [ @@ -818,11 +818,11 @@ }, { "name": "Copper", - "color": [0.926, 0.721, 0.504], + "color": [0.988, 0.688, 0.448], "metalness": 1, - "specularColor": [0.996, 0.957, 0.823], + "specularColor": [0.999, 0.946, 0.705], "roughness": 0, - "complexIor": [0.27105, 3.6092, 0.67693, 2.6248, 1.3164, 2.2921], + "complexIor": [0.137212, 5.48257, 0.750114, 2.56138, 1.75582, 2.26828], "density": [8940, 8940], "category": ["Metal"], "references": [ @@ -1181,11 +1181,11 @@ }, { "name": "Gold", - "color": [0.944, 0.776, 0.373], + "color": [1.0, 0.72, 0.315], "metalness": 1, - "specularColor": [0.998, 0.981, 0.751], + "specularColor": [1.0, 0.973, 0.597], "roughness": 0, - "complexIor": [0.18299, 3.4242, 0.42108, 2.3459, 1.3734, 1.7704], + "complexIor": [0, 6.3108, 0.487424, 2.18391, 1.74577, 1.63493], "density": [19320, 19320], "category": ["Metal"], "references": [ @@ -1381,11 +1381,11 @@ }, { "name": "Iron", - "color": [0.531, 0.512, 0.496], + "color": [0.542, 0.512, 0.458], "metalness": 1, - "specularColor": [0.571, 0.54, 0.586], + "specularColor": [0.612, 0.541, 0.422], "roughness": 0, - "complexIor": [2.9114, 3.0893, 2.9497, 2.9318, 2.5845, 2.767], + "complexIor": [2.73466, 3.14869, 2.94186, 2.92718, 3.15654, 2.46012], "density": [7870, 7870], "category": ["Metal"], "references": [ @@ -1485,11 +1485,11 @@ }, { "name": "Lead", - "color": [0.632, 0.626, 0.641], + "color": [0.641, 0.622, 0.59], "metalness": 1, - "specularColor": [0.803, 0.808, 0.862], + "specularColor": [0.819, 0.804, 0.769], "roughness": 0, - "complexIor": [1.91, 3.51, 1.83, 3.4, 1.44, 3.18], + "complexIor": [1.81659, 3.50606, 1.84441, 3.37971, 1.96022, 3.23189], "density": [11340, 11340], "category": ["Metal"], "references": [ @@ -1615,11 +1615,11 @@ }, { "name": "Mercury", - "color": [0.781, 0.779, 0.779], + "color": [0.799, 0.777, 0.721], "metalness": 1, - "specularColor": [0.879, 0.91, 0.941], + "specularColor": [0.901, 0.91, 0.89], "roughness": 0, - "complexIor": [2.0733, 5.3383, 1.5523, 4.651, 1.0606, 3.8628], + "complexIor": [1.86932, 5.36989, 1.53811, 4.60484, 1.4963, 3.92685], "density": [13546, 13546], "viscosity": [1.552, 1.552], "category": ["Metal"], @@ -1825,11 +1825,11 @@ }, { "name": "Nickel", - "color": [0.649, 0.61, 0.541], + "color": [0.664, 0.606, 0.495], "metalness": 1, - "specularColor": [0.797, 0.801, 0.789], + "specularColor": [0.824, 0.798, 0.68], "roughness": 0, - "complexIor": [2.0592, 3.7574, 1.8179, 3.2741, 1.621, 2.6933], + "complexIor": [1.88896, 3.7543, 1.81884, 3.2447, 2.0708, 2.64853], "density": [8900, 8900], "category": ["Metal"], "references": [ @@ -2257,11 +2257,11 @@ }, { "name": "Platinum", - "color": [0.679, 0.642, 0.588], + "color": [0.695, 0.638, 0.541], "metalness": 1, - "specularColor": [0.785, 0.789, 0.784], + "specularColor": [0.816, 0.786, 0.671], "roughness": 0, - "complexIor": [2.3757, 4.2655, 2.0847, 3.7153, 1.8453, 3.1365], + "complexIor": [2.1755, 4.28265, 2.0879, 3.67782, 2.35677, 3.05144], "density": [21450, 21450], "category": ["Metal"], "references": [ @@ -2535,10 +2535,11 @@ }, { "name": "Silicon", - "color": [0.344, 0.367, 0.419], + "color": [0.351, 0.367, 0.394], "metalness": 1, + "specularColor": [0.081, 0, 0.004], "roughness": 0, - "complexIor": [3.835, 0.014, 4.073, 0.028, 4.673, 0.095], + "complexIor": [3.63351, 0.966245, 4.06958, 0, 4.36103, 0], "density": [2330, 2330], "category": ["Metal"], "references": [ @@ -2578,11 +2579,11 @@ }, { "name": "Silver", - "color": [0.962, 0.949, 0.922], + "color": [0.984, 0.946, 0.851], "metalness": 1, - "specularColor": [0.999, 0.998, 0.998], + "specularColor": [0.999, 0.998, 0.986], "roughness": 0, - "complexIor": [0.15943, 3.9291, 0.14512, 3.19, 0.13547, 2.3808], + "complexIor": [0.0636949, 3.69295, 0.155409, 3.20559, 0.426839, 3.12206], "density": [10500, 10500], "category": ["Metal"], "tags": ["mirror"], @@ -3273,11 +3274,11 @@ }, { "name": "Titanium", - "color": [0.616, 0.582, 0.544], + "color": [0.633, 0.578, 0.503], "metalness": 1, - "specularColor": [0.689, 0.683, 0.689], + "specularColor": [0.728, 0.68, 0.55], "roughness": 0, - "complexIor": [2.7407, 3.8143, 2.5418, 3.4345, 2.267, 3.0385], + "complexIor": [2.55584, 3.89385, 2.52916, 3.39243, 2.8235, 2.85229], "density": [4540, 4540], "category": ["Metal"], "references": [ @@ -3347,11 +3348,11 @@ }, { "name": "Tungsten", - "color": [0.504, 0.498, 0.478], + "color": [0.518, 0.495, 0.442], "metalness": 1, - "specularColor": [0.403, 0.418, 0.423], + "specularColor": [0.461, 0.413, 0.206], "roughness": 0, - "complexIor": [3.6518, 2.7955, 3.5064, 2.7585, 3.313, 2.6051], + "complexIor": [3.45096, 2.96613, 3.51714, 2.7338, 4.02045, 1.90549], "density": [19300, 19300], "category": ["Metal"], "references": [ @@ -3384,11 +3385,11 @@ }, { "name": "Vanadium", - "color": [0.52, 0.532, 0.541], + "color": [0.547, 0.525, 0.506], "metalness": 1, - "specularColor": [0.402, 0.447, 0.395], + "specularColor": [0.474, 0.426, 0.175], "roughness": 0, - "complexIor": [3.8114, 2.931, 3.6721, 3.0917, 4.0878, 3.1196], + "complexIor": [3.6507, 3.25065, 3.72723, 3.00712, 4.94609, 2.17896], "density": [6100, 6100], "category": ["Metal"], "references": [ @@ -3558,11 +3559,11 @@ }, { "name": "Zinc", - "color": [0.802, 0.844, 0.863], + "color": [0.826, 0.842, 0.801], "metalness": 1, - "specularColor": [0.817, 0.922, 0.964], + "specularColor": [0.854, 0.922, 0.923], "roughness": 0, - "complexIor": [3.4161, 7.0325, 1.9286, 6.3963, 1.0424, 5.125], + "complexIor": [3.15207, 7.39342, 1.89133, 6.28678, 1.48736, 4.92701], "density": [7000, 7000], "category": ["Metal"], "references": [ diff --git a/schemas/schema-materials-v2.json b/schemas/schema-materials-v2.json index 3a36f6c..95790c0 100644 --- a/schemas/schema-materials-v2.json +++ b/schemas/schema-materials-v2.json @@ -27,7 +27,7 @@ "default": 0 }, "specularColor": { - "description": "Color of the specular reflection (controls the physical edge-tint for metals), calculated from Complex IOR n and k values.", + "description": "Color of the specular reflection (controls the physical edge-tint for metals), calculated from spectral data using script from https://github.com/natyh/material-params", "type": "array", "items": { "type": "number" @@ -67,7 +67,7 @@ "default": 0 }, "complexIor": { - "description": "Complex IOR values, n (refractive index), and k (extinction coefficient), for each color channel, in the following order: nR, kR, nG, kG, nB, kB. Calculated from spectral IOR data files.", + "description": "Complex IOR values, n (refractive index), and k (extinction coefficient), for each color channel, in the following order: nR, kR, nG, kG, nB, kB. Calculated from spectral data using script from https://github.com/natyh/material-params", "type": "array", "items": { "type": "number" diff --git a/schemas/schema-materials.json b/schemas/schema-materials.json index e285bc2..5585271 100644 --- a/schemas/schema-materials.json +++ b/schemas/schema-materials.json @@ -27,7 +27,7 @@ "default": 0 }, "specularColor": { - "description": "Color of the specular reflection (controls the physical edge-tint for metals), calculated from Complex IOR n and k values.", + "description": "Color of the specular reflection (controls the physical edge-tint for metals), calculated from spectral data using script from https://github.com/natyh/material-params", "type": "array", "items": { "type": "number" @@ -67,7 +67,7 @@ "default": 0 }, "complexIor": { - "description": "Complex IOR values, n (refractive index), and k (extinction coefficient), for each color channel, in the following order: nR, kR, nG, kG, nB, kB. Calculated from spectral IOR data files.", + "description": "Complex IOR values, n (refractive index), and k (extinction coefficient), for each color channel, in the following order: nR, kR, nG, kG, nB, kB. Calculated from spectral data using script from https://github.com/natyh/material-params", "type": "array", "items": { "type": "number"