From 089e5b8958c651c6b471208cd340ecf19d389380 Mon Sep 17 00:00:00 2001 From: Anton <13031779+AntonPalmqvist@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:06:04 -0800 Subject: [PATCH] - Updated image URLs in README - Updated Cameras - Updated Lightsources - Updated Materials --- README.md | 4 +- deploy/cameras.json | 31 ++++++++++--- deploy/lightsources.json | 99 +++++++++++++++++++++++++++++++++++++++- deploy/materials.json | 3 +- 4 files changed, 125 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 20456ae..bf6ff5d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

- - Screenshot of the web implementation + + Screenshot of the web implementation A database of physically based values for CG artists

diff --git a/deploy/cameras.json b/deploy/cameras.json index 0c022e9..90c5262 100644 --- a/deploy/cameras.json +++ b/deploy/cameras.json @@ -980,7 +980,8 @@ "https://en.wikipedia.org/wiki/Canon_EOS-1D_X", "https://en.wikipedia.org/wiki/Canon_EOS-1D_X_Mark_II", "https://en.wikipedia.org/wiki/Canon_EOS-1D_X_Mark_III", - "https://www.usa.canon.com/internet/portal/us/home/products/details/cameras/eos-dslr-and-mirrorless-cameras/dslr/eos-1d-x-mark-iii" + "https://www.usa.canon.com/internet/portal/us/home/products/details/cameras/eos-dslr-and-mirrorless-cameras/dslr/eos-1d-x-mark-iii", + "https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS_1DX_Mark_II_380_780_5.json" ], "tags": ["full frame"] }, @@ -1010,7 +1011,7 @@ "description": "", "sources": [ "https://en.wikipedia.org/wiki/Canon_EOS_5D_Mark_IV", - "https://github.com/wetadigital/physlight/blob/main/data/canon_eos-5d-mkiv_380_720_10.json", + "https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS_5D_Mark_IV_380_780_5.json", "https://gdlp01.c-wss.com/gds/0/0300024970/07/eos5d-mk4-im8-en.pdf" ], "tags": ["full frame"] @@ -1056,7 +1057,6 @@ "description": "", "sources": [ "https://en.wikipedia.org/wiki/Canon_EOS_C300", - "https://www.usa.canon.com/internet/portal/us/home/products/details/cameras/cinema-eos/eos-c300", "https://www.usa.canon.com/internet/portal/us/home/products/details/cameras/cinema-eos/eos-c300-mark-iii-digital-cinema-camera", "https://gdlp01.c-wss.com/gds/5/0300042345/08/eosc300mk3-500mk2-im13-en.pdf", "https://www.canon-europe.com/video-cameras/eos-c300-mark-iii/specifications/" @@ -1240,7 +1240,8 @@ "description": "", "sources": [ "https://en.wikipedia.org/wiki/Canon_EOS_R5", - "https://www.usa.canon.com/shop/p/eos-r5" + "https://www.usa.canon.com/shop/p/eos-r5", + "https://github.com/wetadigital/physlight/blob/main/data/Canon_EOS_R5_380_780_5.json" ], "tags": ["full frame"] }, @@ -1270,7 +1271,7 @@ "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://github.com/wetadigital/physlight/blob/main/data/hasselblad_l1d-20c_380_720_10.json" + "https://github.com/wetadigital/physlight/blob/main/data/Hasselblad_L1D-20c_380_780_5.json" ], "tags": ["drone", "Hasselblad L1D-20c"] }, @@ -1703,7 +1704,7 @@ "sources": [ "https://en.wikipedia.org/wiki/Nikon_D850", "https://www.nikonusa.com/en/nikon-products/product/dslr-cameras/d850.html#tab-ProductDetail-ProductTabs-TechSpecs", - "https://github.com/wetadigital/physlight/blob/main/data/nikon_d850_380_720_10.json" + "https://github.com/wetadigital/physlight/blob/main/data/Nikon_D850_380_780_5.json" ], "tags": ["full frame"] }, @@ -1723,6 +1724,22 @@ ], "tags": ["full frame"] }, + { + "name": "Panasonic AW-UB50", + "sensorSize": [ + { + "format": "Open Gate", + "size": [35.6, 23.8] + } + ], + "category": ["Movie"], + "description": "", + "sources": [ + "https://connect.na.panasonic.com/av/video/multi-purpose-camera/aw-ub50-ub10", + "https://43645300.fs1.hubspotusercontent-na1.net/hubfs/43645300/PCONA%20-%20United%20States/PIVS/Professional%20Video%20-%20Product%20Images/Multi-purpose%20Box%20Camera/AW-UB10_UB50_Flyer_E_240822.pdf" + ], + "tags": ["full frame"] + }, { "name": "Panasonic EVA1", "sensorSize": [ @@ -3974,7 +3991,7 @@ "sources": [ "https://electronics.sony.com/imaging/interchangeable-lens-cameras/full-frame/p/ilce9-b", "https://en.wikipedia.org/wiki/Sony_α9", - "https://github.com/wetadigital/physlight/blob/main/data/sony_ilce-9_380_720_10.json" + "https://github.com/wetadigital/physlight/blob/main/data/Sony_ILCE-9_380_780_5.json" ], "tags": ["full frame", "a9", "ilce-9"] }, diff --git a/deploy/lightsources.json b/deploy/lightsources.json index 4cc9f6b..78cc81e 100644 --- a/deploy/lightsources.json +++ b/deploy/lightsources.json @@ -28,8 +28,54 @@ "category": ["Artificial"], "description": "", "sources": [ - "https://www.aputure.com/products/amaran-p60c/#specifications", - "https://docs.aputure.com/hubfs/Knowledge%20Base/amaran/p60x%20and%20p60c/All%20files/amaran-P60c-Product-Manual-EN_211211-.pdf" + "https://help.aputure.com/en/amaran-p60c-p60x/overview-of-p60c-p60x", + "https://docs.aputure.com/hubfs/Knowledge%20Base/amaran/p60x%20and%20p60c/All%20files/amaran-P60c-Product-Manual-EN_211211-.pdf", + "https://help.aputure.com/en/amaran-p60c-p60x/photometrics-and-technical-specifications" + ] + }, + { + "name": "Aputure STORM 1200x", + "color": [1.0, 0.859, 0.778], + "temperature": 5600, + "temperatureRange": [2500, 10000], + "intensity": 202500, + "variants": [ + { + "format": "No Reflector", + "color": [1.0, 0.859, 0.778], + "temperature": 5600, + "angle": 70, + "intensity": 76400 + }, + { + "format": "15º Reflector", + "color": [1.0, 0.859, 0.778], + "temperature": 5600, + "angle": 15, + "intensity": 864900 + }, + { + "format": "30º Reflector", + "color": [1.0, 0.859, 0.778], + "temperature": 5600, + "angle": 30, + "intensity": 376200 + }, + { + "format": "45º Reflector", + "color": [1.0, 0.859, 0.778], + "temperature": 5600, + "angle": 45, + "intensity": 202500 + } + ], + "unit": ["lx"], + "type": ["spot"], + "category": ["Artificial"], + "description": "", + "sources": [ + "https://aputure.com/EN-US/products/storm-1200x", + "https://24055135.fs1.hubspotusercontent-na1.net/hubfs/24055135/Aputure_Storm_1200x_One_Sheet_2024-09-09a.pdf" ] }, { @@ -64,6 +110,23 @@ "https://www.arri.com/resource/blob/31482/8764688fa9ce88b33bf3f4f48e2fb52a/arri-m-series-m8-data-sheet-en-sep2018-data.pdf" ] }, + { + "name": "Arri SkyPanel S60 Pro", + "color": [1.0, 0.859, 0.778], + "temperature": 5600, + "temperatureRange": [2800, 10000], + "intensity": 41100, + "sourceSize": [64.5, 30.0], + "angle": 103, + "unit": ["lm"], + "type": ["surface"], + "category": ["Artificial"], + "description": "", + "sources": [ + "https://www.arri.com/en/lighting/led-panel-lights/skypanel-pro/tech-data", + "https://www.arri.com/resource/blob/384436/68055e513496ca273128f1741cc04f92/arri-s60-pro-data-sheet-en-data.pdf" + ] + }, { "name": "Arri SkyPanel X", "color": [1.0, 0.859, 0.778], @@ -286,6 +349,38 @@ "http://web.archive.org/web/20120807211236/http://www.npl.co.uk/upload/pdf/npl_summary_report_best_blue_sky_2006.pdf" ] }, + { + "name": "ROE Carbon Carbon CB5 MKII RGBCA", + "color": [1.0, 0.943, 0.992], + "temperature": 6500, + "intensity": 4400, + "sourceSize": [60, 120], + "unit": ["cd/m2"], + "type": ["surface"], + "category": ["Artificial"], + "description": "", + "sources": [ + "https://www.roevisual.com/en/products/carbon-full-spectrum-led-panels", + "https://www.roevisual.com/assets/components/roevisual/connector.php?action=api/web/download/136" + ], + "tags": ["CB5MKII"] + }, + { + "name": "ROE Carbon Carbon CB5 MKII RGBW", + "color": [1.0, 0.943, 0.992], + "temperature": 6500, + "intensity": 3200, + "sourceSize": [60, 120], + "unit": ["cd/m2"], + "type": ["surface"], + "category": ["Artificial"], + "description": "", + "sources": [ + "https://www.roevisual.com/en/products/carbon-full-spectrum-led-panels", + "https://www.roevisual.com/assets/components/roevisual/connector.php?action=api/web/download/136" + ], + "tags": ["CB5MKII"] + }, { "name": "Sky (Moonless Clear Night)", "color": [1, 1, 1], diff --git a/deploy/materials.json b/deploy/materials.json index c48f74f..e9782eb 100644 --- a/deploy/materials.json +++ b/deploy/materials.json @@ -1358,7 +1358,8 @@ "https://www.cdc.gov/niosh/docs/80-116/", "https://www.engineeringtoolbox.com/water-dynamic-kinematic-viscosity-d_596.html", "https://en.wikipedia.org/wiki/List_of_viscosities", - "https://nextlimitsupport.atlassian.net/wiki/spaces/rf2016docs/pages/5497120/Hybrido+Viscosity+Table" + "https://nextlimitsupport.atlassian.net/wiki/spaces/rf2016docs/pages/5497120/Hybrido+Viscosity+Table", + "https://www.researchgate.net/journal/Optics-Express-1094-4087/publication/235415649_Zoom_lens_design_using_liquid_lens_for_laparoscope/links/6609e54d10ca86798731ef50/Zoom-lens-design-using-liquid-lens-for-laparoscope.pdf" ], "tags": [""], "reference": [