Skip to content

Commit 455bc9d

Browse files
AntonPalmqvistAntonPalmqvist
authored
Merge pull request #61 from AntonPalmqvist/dev
Merge from dev
2 parents c2f3aec + 5bdb482 commit 455bc9d

File tree

207 files changed

+3397
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+3397
-433
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/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<body>
5555
<!-- apiDescriptionUrl must point to a web resource, and not to a static file, so it doesn't give an error when going back and forth on the site -->
5656
<elements-api
57-
apiDescriptionUrl="https://raw.githubusercontent.com/AntonPalmqvist/physically-based-api/refs/heads/main/deploy/openapi-schema.yaml"
57+
apiDescriptionUrl="https://raw.githubusercontent.com/AntonPalmqvist/physically-based-api/refs/heads/main/schemas/openapi-schema.yaml"
5858
hideSchemas="true"
5959
hideExport="true"
6060
layout="responsive"

‎deploy/lightsources.json‎

Lines changed: 52 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@
55
"temperature": 5600,
66
"temperatureRange": [2500, 7500],
77
"intensity": 19389,
8+
"sourceSize": [4],
89
"variants": [
910
{
1011
"format": "Bare Bulb",
1112
"color": [1.0, 0.859, 0.778],
1213
"temperature": 5600,
13-
"angle": 90,
14+
"angle": 89.6,
1415
"intensity": 17244
1516
},
1617
{
1718
"format": "Hyper Reflector",
1819
"color": [1.0, 0.859, 0.778],
1920
"temperature": 5600,
20-
"angle": 65,
21+
"angle": 64.8,
2122
"intensity": 26155
2223
}
2324
],
@@ -27,7 +28,7 @@
2728
"category": ["Artificial"],
2829
"description": "",
2930
"sources": [
30-
"https://www.aputure.com/products/amaran-300c/#specifications",
31+
"https://help.aputure.com/en/amaran-150c-300c/photometrics-technical-specifications",
3132
"https://docs.aputure.com/hubfs/Knowledge%20Base/amaran/150c-300c/All%20Files/amaran%20300c%20Product%20Manual%20.pdf?_gl=1*53mffx*_gcl_au*MTAzNTY3Nzg5Ny4xNzAzNzk4MTc1"
3233
]
3334
},
@@ -55,6 +56,7 @@
5556
"temperature": 5600,
5657
"temperatureRange": [1800, 20000],
5758
"intensity": 600000,
59+
"sourceSize": [4],
5860
"variants": [
5961
{
6062
"format": "No Reflector",
@@ -96,6 +98,7 @@
9698
"color": [1.0, 0.859, 0.778],
9799
"temperature": 5600,
98100
"temperatureRange": [2500, 10000],
101+
"sourceSize": [4],
99102
"intensity": 202500,
100103
"variants": [
101104
{
@@ -252,13 +255,35 @@
252255
"temperature": 3500,
253256
"intensity": 1500,
254257
"intensityRange": [1000, 2000],
258+
"sourceSize": [5],
259+
"angle": 15,
255260
"unit": ["lm"],
256261
"type": ["spot"],
257262
"category": ["Artificial"],
258263
"description": "Tungsten-halogen bulbs, commonly just called halogen, are the most widely used bulbs in car headlights. High beam is approximately double the intensity of a low beam.",
259264
"sources": [
260265
"https://www.bulbfacts.com/halogen-bulbs/chart/",
261-
"https://en.wikipedia.org/wiki/Headlamp#Light_sources"
266+
"https://en.wikipedia.org/wiki/Headlamp#Light_sources",
267+
"https://www.onallcylinders.com/2015/02/27/light-source-quick-guide-automotive-lighting/"
268+
]
269+
},
270+
{
271+
"name": "Car Headlight (LED)",
272+
"color": [1.0, 0.792, 0.628],
273+
"temperature": 3500,
274+
"temperatureRange": [5000, 6000],
275+
"intensity": 3000,
276+
"intensityRange": [2000, 5000],
277+
"sourceSize": [5],
278+
"angle": 15,
279+
"unit": ["lm"],
280+
"type": ["spot"],
281+
"category": ["Artificial"],
282+
"description": "",
283+
"sources": [
284+
"https://www.bulbfacts.com/led-kits/chart/",
285+
"https://en.wikipedia.org/w/index.php?title=Headlamp&oldid=1274156171#Light_sources",
286+
"https://www.onallcylinders.com/2015/02/27/light-source-quick-guide-automotive-lighting/"
262287
]
263288
},
264289
{
@@ -273,9 +298,9 @@
273298
"category": ["Artificial"],
274299
"description": "Displays like computer monitors, TVs, signage, etc. Typically they have a temperature of 6500K but it can vary. The sRGB spec for monitors targets 80 cd/m2. Typically, monitors calibrated for broadcast or studio color grading should have a brightness of 100 cd/m2 in Japan and in the United States, or 120 cd/m2 in the European Union. This is however considered quite dark for normal use, so consumer monitors tend to be brighter.",
275300
"sources": [
276-
"https://www.digitalview.com/blog/lcd-panels-backlights-brightness/",
277301
"https://en.wikipedia.org/wiki/Color_temperature",
278-
"https://en.wikipedia.org/wiki/Candela_per_square_metre"
302+
"https://en.wikipedia.org/wiki/Candela_per_square_metre",
303+
"https://en.wikipedia.org/w/index.php?title=High-dynamic-range_television&oldid=1292082984#VESA_DisplayHDR"
279304
],
280305
"tags": ["computer", "monitor", "lcd", "oled", "screen"]
281306
},
@@ -351,6 +376,7 @@
351376
"temperature": 1850,
352377
"intensity": 50,
353378
"intensityRange": [8, 100],
379+
"sourceSize": [1],
354380
"unit": ["lm"],
355381
"type": ["point"],
356382
"category": ["Natural"],
@@ -377,17 +403,30 @@
377403
"name": "Household Light Bulb",
378404
"color": [1.0, 0.415, 0.099],
379405
"temperature": 2700,
380-
"temperatureRange": [2400, 6000],
406+
"temperatureRange": [2200, 6000],
381407
"intensity": 800,
382-
"intensityRange": [400, 1000],
408+
"intensityRange": [400, 1600],
409+
"variants": [
410+
{
411+
"format": "2700 K",
412+
"color": [1.0, 0.415, 0.099],
413+
"temperature": 2700
414+
},
415+
{
416+
"format": "5000 K",
417+
"color": [1.0, 0.792, 0.628],
418+
"temperature": 5000
419+
}
420+
],
383421
"unit": ["lm"],
384422
"sourceSize": [3],
385423
"type": ["point"],
386424
"category": ["Artificial"],
387425
"description": "Today's household lightbulbs has a LED light source whereas older light bulbs were using a glowing tungsten filament. LED:s are much much more energy efficient and makes the use of wattage, as a measure of intensity, not very useful. This is why lumen is preferred.",
388426
"sources": [
389427
"https://en.wikipedia.org/wiki/Incandescent_light_bulb",
390-
"https://en.wikipedia.org/wiki/LED_lamp"
428+
"https://en.wikipedia.org/wiki/LED_lamp",
429+
"https://www.ikea.com/us/en/cat/led-bulbs-20514/"
391430
],
392431
"tags": ["incandescent", "tungsten"]
393432
},
@@ -416,6 +455,8 @@
416455
"color": [1.0, 0.849, 0.754],
417456
"temperature": 5500,
418457
"intensity": 20000,
458+
"sourceSize": [5],
459+
"angle": 60,
419460
"unit": ["lm"],
420461
"type": ["spot"],
421462
"category": ["Artificial"],
@@ -509,6 +550,8 @@
509550
"temperature": 0,
510551
"intensity": 60000,
511552
"intensityRange": [2000, 140000],
553+
"sourceSize": [5],
554+
"angle": 60,
512555
"unit": ["lm"],
513556
"type": ["spot"],
514557
"category": ["Artificial"],

0 commit comments

Comments
 (0)