Skip to content

Commit 5bdb482

Browse files
AntonPalmqvistAntonPalmqvist
committed
- Updated Materials
- Updated Cameras
1 parent a83922d commit 5bdb482

File tree

9 files changed

+29
-46
lines changed

9 files changed

+29
-46
lines changed

‎deploy/cameras.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
"description": "",
122122
"sources": [
123123
"https://www.arri.com/en/camera-systems/cameras/alexa-35",
124-
"https://www.arri.com/en/camera-systems/cameras/alexa-35/alexa-35-recording-formats",
125124
"https://www.arri.com/resource/blob/296424/88454a5a3dee9fe1d3fd68e75aa3411e/alexa-35-recording-format-poster-data.pdf",
126125
"https://www.arri.com/resource/blob/277386/a8ebd70f6105162b541bc39f4ad098b5/2022-05-arri-formatsandresolutionsoverview-4-4-data.pdf"
127126
],
@@ -1065,7 +1064,7 @@
10651064
"https://en.wikipedia.org/wiki/Canon_EOS-1D_X_Mark_II",
10661065
"https://en.wikipedia.org/wiki/Canon_EOS-1D_X_Mark_III",
10671066
"https://www.canon-europe.com/for_home/product_finder/cameras/digital_slr/eos_1dx/specifications/",
1068-
"https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS_1DX_Mark_II_380_780_5.json"
1067+
"https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS-1D_X_Mark_II_380_780_5.json"
10691068
],
10701069
"tags": ["full frame"]
10711070
},
@@ -1469,7 +1468,6 @@
14691468
"category": ["Mobile"],
14701469
"description": "",
14711470
"sources": [
1472-
"https://www.hasselblad.com/collaborations/dji-mavic-2-pro/",
14731471
"https://forum.dji.com/forum.php?mod=redirect&goto=findpost&ptid=167017&pid=1576410",
14741472
"https://dl.djicdn.com/downloads/Mavic_2/Mavic_2_Pro_Zoom_User_Manual_v2.2_en.pdf",
14751473
"https://github.com/wetadigital/physlight/blob/main/data/Hasselblad_L1D-20c_380_780_5.json"
@@ -2111,7 +2109,7 @@
21112109
"description": "",
21122110
"sources": [
21132111
"https://en.wikipedia.org/wiki/Leica_S-System",
2114-
"https://leica-camera.com/en-SG/photography/cameras/s/s3-black/"
2112+
"https://leicacamerausa.com/leica-s3.html"
21152113
],
21162114
"tags": ["medium format"]
21172115
},

‎deploy/materials.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,17 @@
8181
"color": [0.64448, 0.003, 0.005],
8282
"metalness": 0,
8383
"roughness": 0,
84-
"ior": 1.301,
84+
"ior": 1.35,
8585
"transmission": 1,
86+
"transmissionDispersion": 54,
8687
"density": 1060,
8788
"viscosity": 2.8,
8889
"category": ["Human"],
8990
"description": "The color of blood depends on its oxygen level. When there is plenty of oxygen, the color is a brighter red. The reason is because of a protein called hemoglobin, which carries the oxygen in your blood. When hemoglobin has a full oxygen load, it has a bright red color, and when it's deoxygenated it's a darker red. For example, arterial and capillary blood is bright, and venous blood is dark.",
9091
"sources": [
9192
"https://en.wikipedia.org/wiki/Blood",
9293
"https://en.wikipedia.org/wiki/Blood_red",
93-
"https://refractiveindex.info/?shelf=other&book=blood&page=Rowe",
94+
"https://refractiveindex.info/?shelf=other&book=blood&page=Liu",
9495
"https://hypertextbook.com/facts/2004/MichaelShmukler.shtml",
9596
"https://www.researchgate.net/figure/Color-chart-for-the-measurement-of-methemoglobin-The-color-chart-was-prepared-according_fig2_26884296",
9697
"https://www.engineeringtoolbox.com/absolute-viscosity-liquids-d_1259.html",
@@ -313,14 +314,15 @@
313314
"color": [0.027, 0.019, 0.018],
314315
"metalness": 0,
315316
"roughness": 0,
316-
"ior": 1.33,
317+
"ior": 1.34,
317318
"subsurfaceRadius": [10, 5, 1],
318-
"density": 1000,
319-
"viscosity": 1.002,
319+
"density": 1020,
320+
"viscosity": 1.7,
320321
"category": ["Liquid"],
321322
"description": "",
322323
"sources": [
323-
"https://github.com/AntonPalmqvist/physically-based-api/tree/main/data/materials/coffee/"
324+
"https://github.com/AntonPalmqvist/physically-based-api/tree/main/data/materials/coffee/",
325+
"https://books.google.com/books?id=cptQBAAAQBAJ&lpg=PP1"
324326
],
325327
"tags": ["sss"],
326328
"reference": [
@@ -612,7 +614,7 @@
612614
"densityRange": [1380, 1450],
613615
"viscosity": 10000,
614616
"category": ["Liquid"],
615-
"description": "Variations in its water content alter its refractive index. Typically, the refractive index for honey ranges from 1.504 at 13% water content to 1.474 at 25%.",
617+
"description": "Variations in its water content alter its refractive index. Typically, the refractive index for honey ranges from 1.504 at 13% water content to 1.474 at 25%. Fresh honey is liquid and clear but with time it crystallizes and becomes thicker and less clear. The crystallization depends on temperature and the ratio of glucose and fructose.",
616618
"sources": [
617619
"https://www.color-name.com/honey.color",
618620
"https://en.wikipedia.org/wiki/Honey",

‎deploy/v2/cameras.json

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@
119119
],
120120
"category": ["Movie"],
121121
"references": [
122-
{
123-
"title": "ALEXA 35 | Camera Systems | ARRI",
124-
"publisher": "ARRI GmbH",
125-
"url": "https://www.arri.com/en/camera-systems/cameras/alexa-35/alexa-35-recording-formats",
126-
"accessed": "2025-02-22"
127-
},
128122
{
129123
"title": "ALEXA 35 Recording Formats",
130124
"publisher": "ARRI GmbH",
@@ -1264,7 +1258,7 @@
12641258
{
12651259
"title": "Canon EOS-1D X Mark II Camera Spectral Sensitivity Data",
12661260
"author": "Contributors to the PhysLight Project",
1267-
"url": "https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS_1DX_Mark_II_380_780_5.json",
1261+
"url": "https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS-1D_X_Mark_II_380_780_5.json",
12681262
"publisher": "Wētā FX",
12691263
"accessed": "2025-02-22"
12701264
}
@@ -1794,12 +1788,6 @@
17941788
],
17951789
"category": ["Mobile"],
17961790
"references": [
1797-
{
1798-
"title": "DJI MAVIC 2 PRO",
1799-
"publisher": "Hasselblad",
1800-
"url": "https://www.hasselblad.com/collaborations/dji-mavic-2-pro/",
1801-
"accessed": "2025-02-22"
1802-
},
18031791
{
18041792
"title": "Mavic 2 PRO camera sensor physical dimensions",
18051793
"author": "DJI forum contributors",
@@ -2677,9 +2665,9 @@
26772665
},
26782666
{
26792667
"title": "Leica S3",
2680-
"url": "https://leica-camera.com/en-SG/photography/cameras/s/s3-black/",
2681-
"publisher": "Leica Camera AG",
2682-
"accessed": "2025-02-22"
2668+
"url": "https://leicacamerausa.com/leica-s3.html",
2669+
"publisher": "Leica Camera Inc.",
2670+
"accessed": "2025-07-31"
26832671
}
26842672
],
26852673
"tags": ["medium format"]

‎deploy/v2/materials.json

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,9 @@
275275
],
276276
"metalness": 0,
277277
"roughness": 0,
278-
"ior": 1.301,
278+
"ior": 1.35,
279279
"transmission": 1,
280+
"transmissionDispersion": 54,
280281
"density": [1060],
281282
"viscosity": [2.35, 4, 2.78],
282283
"category": ["Human"],
@@ -307,8 +308,8 @@
307308
{
308309
"title": "Refractive index database",
309310
"author": "Polyanskiy, M. N.",
310-
"url": "https://refractiveindex.info/?shelf=other&book=blood&page=Rowe",
311-
"accessed": "2025-01-25"
311+
"url": "https://refractiveindex.info/?shelf=other&book=blood&page=Liu",
312+
"accessed": "2025-07-22"
312313
},
313314
{
314315
"title": "Density of Blood",
@@ -1050,10 +1051,10 @@
10501051
],
10511052
"metalness": 0,
10521053
"roughness": 0,
1053-
"ior": 1.33,
1054+
"ior": 1.34,
10541055
"subsurfaceRadius": [10, 5, 1],
1055-
"density": [1000],
1056-
"viscosity": [1.002],
1056+
"density": [1020],
1057+
"viscosity": [1.7],
10571058
"category": ["Liquid"],
10581059
"tags": ["sss"],
10591060
"references": [
@@ -1065,18 +1066,12 @@
10651066
"accessed": "2025-01-26"
10661067
},
10671068
{
1068-
"title": "List of Viscosities",
1069-
"author": "Wikipedia contributors",
1070-
"url": "https://en.wikipedia.org/w/index.php?title=List_of_viscosities&oldid=1256671906",
1071-
"publisher": "Wikipedia, The Free Encyclopedia",
1072-
"accessed": "2025-01-26"
1073-
},
1074-
{
1075-
"title": "Density",
1076-
"author": "Wikipedia contributors",
1077-
"url": "https://en.wikipedia.org/w/index.php?title=Density&oldid=1271894167",
1078-
"publisher": "Wikipedia, The Free Encyclopedia",
1079-
"accessed": "2025-01-26"
1069+
"title": "Espresso Coffee: The Science of Quality",
1070+
"author": "Viani, R., & Illy, A.",
1071+
"url": "https://books.google.com/books?id=cptQBAAAQBAJ&lpg=PP1",
1072+
"publisher": "Elsevier",
1073+
"pages": "292",
1074+
"year": "2005"
10801075
}
10811076
],
10821077
"images": [
@@ -1925,7 +1920,7 @@
19251920
"density": [1380, 1450, 1400],
19261921
"viscosity": [2000, 15000, 10000],
19271922
"category": ["Liquid"],
1928-
"description": "Variations in its water content alter its refractive index. Typically, the refractive index for honey ranges from 1.504 at 13% water content to 1.474 at 25%.",
1923+
"description": "Variations in its water content alter its refractive index. Typically, the refractive index for honey ranges from 1.504 at 13% water content to 1.474 at 25%. Fresh honey is liquid and clear but with time it crystallizes and becomes thicker and less clear. The crystallization depends on temperature and the ratio of glucose and fructose.",
19291924
"references": [
19301925
{
19311926
"title": "Honey",

‎images/renders/cycles/300/blood.avif

-1.01 KB
Binary file not shown.

‎images/renders/cycles/300/blood.jpeg

-833 Bytes
Loading

‎images/renders/cycles/600/blood.avif

-2.57 KB
Binary file not shown.

‎images/renders/cycles/600/blood.jpeg

-2.7 KB
Loading

‎images/renders/cycles/original/blood.png

-41.5 KB
Loading

0 commit comments

Comments
 (0)