Merge pull request #46 from AntonPalmqvist/dev

Merge from dev
AntonPalmqvist · Jul 18, 2024 · 208bdb0 · 208bdb0
2 parents 4e2e6ad + 8f5c46f
commit 208bdb0
Show file tree

Hide file tree

Showing 653 changed files with 164 additions and 92 deletions.
diff --git a/deploy/cameras.json b/deploy/cameras.json
@@ -608,6 +608,31 @@
     ],
     "tags": ["super 35"]
   },
+  {
+    "name": "Canon EOS C400",
+    "sensorSize": [
+      {
+        "format": "Full Frame",
+        "size": [36, 19]
+      },
+      {
+        "format": "Super 35",
+        "size": [26.2, 13.8]
+      },
+      {
+        "format": "Super 16",
+        "size": [13.1, 6.9]
+      }
+    ],
+    "category": ["Movie"],
+    "description": "",
+    "sources": [
+      "https://en.wikipedia.org/wiki/Canon_Cinema_EOS",
+      "https://www.usa.canon.com/shop/p/eos-c400#tech-spec-data",
+      "https://s7d1.scene7.com/is/content/canon/EOSC400_full_specificationspdf"
+    ],
+    "tags": ["super 35"]
+  },
   {
     "name": "Canon EOS C500",
     "sensorSize": [
@@ -992,7 +1017,7 @@
     "tags": ["phone"]
   },
   {
-    "name": "Leica S",
+    "name": "Leica S3",
     "sensorSize": [
       {
         "format": "Open Gate",
@@ -1003,7 +1028,7 @@
     "description": "",
     "sources": [
       "https://en.wikipedia.org/wiki/Leica_S-System",
-      "https://leica-camera.com/en-SG/photography/cameras/s/s3-black/details"
+      "https://leica-camera.com/en-SG/photography/cameras/s/s3-black/"
     ],
     "tags": ["medium format"]
   },
@@ -3144,7 +3169,7 @@
       }
     ],
     "category": ["Movie"],
-    "description": "The sensor sizes are the same for all V-Raptor sensors, regardless of 8K, or VV designations.",
+    "description": "The sensor sizes are the same for all V-Raptor sensors, regardless of X, XL, 8K, or VV designations.",
     "sources": [
       "https://en.wikipedia.org/wiki/List_of_Red_Digital_Cinema_cameras",
       "https://docs.red.com/955-0199/955-0199_V1.2_Rev_A_RED_PS_V-RAPTOR_Operation_Guide/Content/4_Menus/b_ProjSet/Format/All_Formats.htm",

diff --git a/deploy/lightsources.json b/deploy/lightsources.json
@@ -32,12 +32,44 @@
       "https://docs.aputure.com/hubfs/Knowledge%20Base/amaran/p60x%20and%20p60c/All%20files/amaran-P60c-Product-Manual-EN_211211-.pdf"
     ]
   },
+  {
+    "name": "Arri M-Series M8",
+    "color": [1.0, 0.899, 0.875],
+    "temperature": 6000,
+    "intensity": 41300,
+    "variants": [
+      {
+        "format": "Flood",
+        "angle": 60,
+        "intensity": 41300
+      },
+      {
+        "format": "Medium",
+        "angle": 40,
+        "intensity": 76100
+      },
+      {
+        "format": "Spot",
+        "angle": 15,
+        "intensity": 405000
+      }
+    ],
+    "sourceSize": [100],
+    "unit": ["lx"],
+    "type": ["spot"],
+    "category": ["Artificial"],
+    "description": "",
+    "sources": [
+      "https://www.arri.com/en/lighting/daylight/m-series/m8",
+      "https://www.arri.com/resource/blob/31482/8764688fa9ce88b33bf3f4f48e2fb52a/arri-m-series-m8-data-sheet-en-sep2018-data.pdf"
+    ]
+  },
   {
     "name": "Arri SkyPanel X",
     "color": [1.0, 0.859, 0.778],
     "temperature": 5600,
     "temperatureRange": [1500, 20000],
-    "intensity": 3000,
+    "intensity": 48000,
     "variants": [
       {
         "format": "Open-Face",
@@ -115,6 +147,7 @@
     "intensity": 200,
     "intensityRange": [100, 2000],
     "unit": ["cd/m2"],
+    "sourceSize": [61, 38],
     "type": ["surface"],
     "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.",
@@ -173,6 +206,19 @@
       "https://en.wikipedia.org/wiki/Color_temperature"
     ]
   },
+  {
+    "name": "Kino Flo MIMIK 120",
+    "color": [1.0, 0.943, 0.992],
+    "temperature": 6500,
+    "temperatureRange": [2700, 6500],
+    "intensity": 10000,
+    "sourceSize": [120, 60],
+    "unit": ["cd/m2"],
+    "type": ["surface"],
+    "category": ["Artificial"],
+    "description": "",
+    "sources": ["https://kinoflo.com/mimik-120/#productspecs"]
+  },
   {
     "name": "Household Light Bulb",
     "color": [1.0, 0.415, 0.099],
@@ -198,7 +244,7 @@
     "intensity": 0.1,
     "intensityRange": [0.05, 0.32],
     "unit": ["lx"],
-    "angle": 0.53,
+    "angle": 0.5286,
     "type": ["directional"],
     "category": ["Natural"],
     "description": "Technically not a light source, since the light from the moon is simply reflected sunlight. Moonlight is warmer than sunlight due to the surface material of the moon shifting it towards a redder color. Just as sunlight, moonlight is also subject to atmospheric scattering known as Rayleigh scattering, where it goes more towards red during moonrise and moonset. Moonlight is often mistaken to be bluish due to the Purkinje effect.",
@@ -296,7 +342,7 @@
     "intensity": 100000,
     "intensityRange": [400, 100000],
     "unit": ["lx"],
-    "angle": 0.53,
+    "angle": 0.5332,
     "type": ["directional"],
     "category": ["Natural"],
     "description": "The changing color of the Sun over the course of the day is mainly a result of the scattering of sunlight and is not due to changes in black-body radiation. The solar illuminance constant is equal to 128 000 lux, but atmospheric extinction brings the number of lux down to around 100 000 lux.",
@@ -306,7 +352,8 @@
       "https://en.wikipedia.org/wiki/Sunlight#Measurement",
       "https://en.wikipedia.org/wiki/Daylight",
       "http://stjarnhimlen.se/comp/radfaq.html#10",
-      "https://nssdc.gsfc.nasa.gov/planetary/factsheet/sunfact.html"
+      "https://nssdc.gsfc.nasa.gov/planetary/factsheet/sunfact.html",
+      "https://www.physics.unlv.edu/~jeffery/astro/moon/sun_moon_angular.html"
     ]
   }
 ]