Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions deploy/cameras.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
"description": "",
"sources": [
"https://www.arri.com/en/camera-systems/cameras/alexa-35",
"https://www.arri.com/en/camera-systems/cameras/alexa-35/alexa-35-recording-formats",
"https://www.arri.com/resource/blob/296424/88454a5a3dee9fe1d3fd68e75aa3411e/alexa-35-recording-format-poster-data.pdf",
"https://www.arri.com/resource/blob/277386/a8ebd70f6105162b541bc39f4ad098b5/2022-05-arri-formatsandresolutionsoverview-4-4-data.pdf"
],
Expand Down Expand Up @@ -1065,7 +1064,7 @@
"https://en.wikipedia.org/wiki/Canon_EOS-1D_X_Mark_II",
"https://en.wikipedia.org/wiki/Canon_EOS-1D_X_Mark_III",
"https://www.canon-europe.com/for_home/product_finder/cameras/digital_slr/eos_1dx/specifications/",
"https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS_1DX_Mark_II_380_780_5.json"
"https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS-1D_X_Mark_II_380_780_5.json"
],
"tags": ["full frame"]
},
Expand Down Expand Up @@ -1469,7 +1468,6 @@
"category": ["Mobile"],
"description": "",
"sources": [
"https://www.hasselblad.com/collaborations/dji-mavic-2-pro/",
"https://forum.dji.com/forum.php?mod=redirect&goto=findpost&ptid=167017&pid=1576410",
"https://dl.djicdn.com/downloads/Mavic_2/Mavic_2_Pro_Zoom_User_Manual_v2.2_en.pdf",
"https://github.com/wetadigital/physlight/blob/main/data/Hasselblad_L1D-20c_380_780_5.json"
Expand Down Expand Up @@ -2111,7 +2109,7 @@
"description": "",
"sources": [
"https://en.wikipedia.org/wiki/Leica_S-System",
"https://leica-camera.com/en-SG/photography/cameras/s/s3-black/"
"https://leicacamerausa.com/leica-s3.html"
],
"tags": ["medium format"]
},
Expand Down
2 changes: 1 addition & 1 deletion deploy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<body>
<!-- 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 -->
<elements-api
apiDescriptionUrl="https://raw.githubusercontent.com/AntonPalmqvist/physically-based-api/refs/heads/main/deploy/openapi-schema.yaml"
apiDescriptionUrl="https://raw.githubusercontent.com/AntonPalmqvist/physically-based-api/refs/heads/main/schemas/openapi-schema.yaml"
hideSchemas="true"
hideExport="true"
layout="responsive"
Expand Down
61 changes: 52 additions & 9 deletions deploy/lightsources.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
"temperature": 5600,
"temperatureRange": [2500, 7500],
"intensity": 19389,
"sourceSize": [4],
"variants": [
{
"format": "Bare Bulb",
"color": [1.0, 0.859, 0.778],
"temperature": 5600,
"angle": 90,
"angle": 89.6,
"intensity": 17244
},
{
"format": "Hyper Reflector",
"color": [1.0, 0.859, 0.778],
"temperature": 5600,
"angle": 65,
"angle": 64.8,
"intensity": 26155
}
],
Expand All @@ -27,7 +28,7 @@
"category": ["Artificial"],
"description": "",
"sources": [
"https://www.aputure.com/products/amaran-300c/#specifications",
"https://help.aputure.com/en/amaran-150c-300c/photometrics-technical-specifications",
"https://docs.aputure.com/hubfs/Knowledge%20Base/amaran/150c-300c/All%20Files/amaran%20300c%20Product%20Manual%20.pdf?_gl=1*53mffx*_gcl_au*MTAzNTY3Nzg5Ny4xNzAzNzk4MTc1"
]
},
Expand Down Expand Up @@ -55,6 +56,7 @@
"temperature": 5600,
"temperatureRange": [1800, 20000],
"intensity": 600000,
"sourceSize": [4],
"variants": [
{
"format": "No Reflector",
Expand Down Expand Up @@ -96,6 +98,7 @@
"color": [1.0, 0.859, 0.778],
"temperature": 5600,
"temperatureRange": [2500, 10000],
"sourceSize": [4],
"intensity": 202500,
"variants": [
{
Expand Down Expand Up @@ -252,13 +255,35 @@
"temperature": 3500,
"intensity": 1500,
"intensityRange": [1000, 2000],
"sourceSize": [5],
"angle": 15,
"unit": ["lm"],
"type": ["spot"],
"category": ["Artificial"],
"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.",
"sources": [
"https://www.bulbfacts.com/halogen-bulbs/chart/",
"https://en.wikipedia.org/wiki/Headlamp#Light_sources"
"https://en.wikipedia.org/wiki/Headlamp#Light_sources",
"https://www.onallcylinders.com/2015/02/27/light-source-quick-guide-automotive-lighting/"
]
},
{
"name": "Car Headlight (LED)",
"color": [1.0, 0.792, 0.628],
"temperature": 3500,
"temperatureRange": [5000, 6000],
"intensity": 3000,
"intensityRange": [2000, 5000],
"sourceSize": [5],
"angle": 15,
"unit": ["lm"],
"type": ["spot"],
"category": ["Artificial"],
"description": "",
"sources": [
"https://www.bulbfacts.com/led-kits/chart/",
"https://en.wikipedia.org/w/index.php?title=Headlamp&oldid=1274156171#Light_sources",
"https://www.onallcylinders.com/2015/02/27/light-source-quick-guide-automotive-lighting/"
]
},
{
Expand All @@ -273,9 +298,9 @@
"category": ["Artificial"],
"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.",
"sources": [
"https://www.digitalview.com/blog/lcd-panels-backlights-brightness/",
"https://en.wikipedia.org/wiki/Color_temperature",
"https://en.wikipedia.org/wiki/Candela_per_square_metre"
"https://en.wikipedia.org/wiki/Candela_per_square_metre",
"https://en.wikipedia.org/w/index.php?title=High-dynamic-range_television&oldid=1292082984#VESA_DisplayHDR"
],
"tags": ["computer", "monitor", "lcd", "oled", "screen"]
},
Expand Down Expand Up @@ -351,6 +376,7 @@
"temperature": 1850,
"intensity": 50,
"intensityRange": [8, 100],
"sourceSize": [1],
"unit": ["lm"],
"type": ["point"],
"category": ["Natural"],
Expand All @@ -377,17 +403,30 @@
"name": "Household Light Bulb",
"color": [1.0, 0.415, 0.099],
"temperature": 2700,
"temperatureRange": [2400, 6000],
"temperatureRange": [2200, 6000],
"intensity": 800,
"intensityRange": [400, 1000],
"intensityRange": [400, 1600],
"variants": [
{
"format": "2700 K",
"color": [1.0, 0.415, 0.099],
"temperature": 2700
},
{
"format": "5000 K",
"color": [1.0, 0.792, 0.628],
"temperature": 5000
}
],
"unit": ["lm"],
"sourceSize": [3],
"type": ["point"],
"category": ["Artificial"],
"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.",
"sources": [
"https://en.wikipedia.org/wiki/Incandescent_light_bulb",
"https://en.wikipedia.org/wiki/LED_lamp"
"https://en.wikipedia.org/wiki/LED_lamp",
"https://www.ikea.com/us/en/cat/led-bulbs-20514/"
],
"tags": ["incandescent", "tungsten"]
},
Expand Down Expand Up @@ -416,6 +455,8 @@
"color": [1.0, 0.849, 0.754],
"temperature": 5500,
"intensity": 20000,
"sourceSize": [5],
"angle": 60,
"unit": ["lm"],
"type": ["spot"],
"category": ["Artificial"],
Expand Down Expand Up @@ -509,6 +550,8 @@
"temperature": 0,
"intensity": 60000,
"intensityRange": [2000, 140000],
"sourceSize": [5],
"angle": 60,
"unit": ["lm"],
"type": ["spot"],
"category": ["Artificial"],
Expand Down
Loading