- Added "angle" and "sourceSize" to Lightsources schema

- Added v2 endpoint for testing purposes - Updated Cameras - Updated Lightsources - Updated Materials
AntonPalmqvist · Jan 14, 2024 · 5e41d6b · 5e41d6b
1 parent 4a2990e
commit 5e41d6b
Show file tree

Hide file tree

Showing 6 changed files with 225 additions and 5 deletions.
diff --git a/deploy/_redirects b/deploy/_redirects
@@ -1,4 +1,5 @@
 /materials /materials.json 200
+/v2/materials /v2/materials.json 200
 /lightsources /lightsources.json 200
 /cameras /cameras.json 200
 /lenses /lenses.json 200

diff --git a/deploy/cameras.json b/deploy/cameras.json
@@ -196,7 +196,7 @@
     "category": ["Movie"],
     "description": "",
     "sources": [
-      "https://www.arri.com/en/camera-systems/cameras/discontinued-camera-systems/alexa-mini"
+      "https://www.arri.com/en/camera-systems/cameras/legacy-camera-systems/alexa-mini"
     ],
     "tags": ["super 35"]
   },
@@ -303,7 +303,7 @@
     "category": ["Movie"],
     "description": "",
     "sources": [
-      "https://www.arri.com/en/camera-systems/cameras/discontinued-camera-systems/alexa-sxt-w"
+      "https://www.arri.com/en/camera-systems/cameras/legacy-camera-systems/alexa-sxt-w"
     ],
     "tags": ["super 35"]
   },
@@ -645,6 +645,47 @@
     "sources": ["https://en.wikipedia.org/wiki/Image_sensor_format"],
     "tags": ["drone"]
   },
+  {
+    "name": "DJI Ronin 4D",
+    "sensorSize": [
+      {
+        "format": "8K Full Frame 17:9",
+        "size": [36, 19]
+      },
+      {
+        "format": "8K Super 35 17:9",
+        "size": [24.5, 13]
+      },
+      {
+        "format": "8K Full Frame 2.39:1",
+        "size": [36, 15.1]
+      },
+      {
+        "format": "6K Full Frame 17:9",
+        "size": [35.7, 18.8]
+      },
+      {
+        "format": "6K Super 35 17:9",
+        "size": [24.3, 12.8]
+      },
+      {
+        "format": "6K Full Frame 2.39:1",
+        "size": [35.7, 18.8]
+      },
+      {
+        "format": "6K Super 35 2.39:1",
+        "size": [24.3, 12.8]
+      }
+    ],
+    "category": ["Movie"],
+    "description": "",
+    "sources": [
+      "https://en.wikipedia.org/wiki/DJI_Ronin#Ronin_4D_(6K_and_8K)",
+      "https://www.dji.com/se/ronin-4d/specs",
+      "https://dl.djicdn.com/downloads/DJI_Ronin_4D/20220216/DJI_Ronin_4D_User_Manual_v1.2_enII.pdf"
+    ],
+    "tags": ["super 35"]
+  },
   {
     "name": "Fujifilm GFX100",
     "sensorSize": [
@@ -763,6 +804,32 @@
     "sources": ["https://en.wikipedia.org/wiki/70_mm_film#IMAX_.2815.2F70.29"],
     "tags": ["film"]
   },
+  {
+    "name": "Iphone 13 Pro",
+    "sensorSize": [
+      {
+        "format": "26 mm Main",
+        "size": [7.6, 5.7]
+      },
+      {
+        "format": "13 mm Ultra Wide",
+        "size": [4, 3]
+      },
+      {
+        "format": "77 mm Telephoto",
+        "size": [4, 3]
+      }
+    ],
+    "category": ["Mobile"],
+    "description": "Apple uses Sony sensors for their Iphones.",
+    "sources": [
+      "https://en.wikipedia.org/wiki/IPhone_13_Pro",
+      "https://www.dpreview.com/articles/6780391159/all-apple-iphone-13-and-13-pro-camera-upgrades-explained",
+      "https://www.dpreview.com/articles/6110937480",
+      "https://twitter.com/tim_cook/status/1602516736145858561"
+    ],
+    "tags": ["phone"]
+  },
   {
     "name": "Iphone 14 Pro",
     "sensorSize": [
@@ -782,11 +849,62 @@
     "category": ["Mobile"],
     "description": "Apple uses Sony sensors for their Iphones.",
     "sources": [
+      "https://en.wikipedia.org/wiki/IPhone_14_Pro",
       "https://www.dpreview.com/articles/6110937480",
       "https://twitter.com/tim_cook/status/1602516736145858561"
     ],
     "tags": ["phone"]
   },
+  {
+    "name": "Iphone 15 Pro",
+    "sensorSize": [
+      {
+        "format": "24 mm Main",
+        "size": [9.8, 7.3]
+      },
+      {
+        "format": "13 mm Ultra Wide",
+        "size": [5.6, 4.2]
+      },
+      {
+        "format": "77 mm Telephoto",
+        "size": [4, 3]
+      }
+    ],
+    "category": ["Mobile"],
+    "description": "Apple uses Sony sensors for their Iphones.",
+    "sources": [
+      "https://en.wikipedia.org/wiki/IPhone_15_Pro",
+      "https://www.dpreview.com/articles/2668153890/apple-s-iphone-15-and-15-pro-imaging-tech-examined",
+      "https://twitter.com/tim_cook/status/1602516736145858561"
+    ],
+    "tags": ["phone"]
+  },
+  {
+    "name": "Iphone 15 Pro Max",
+    "sensorSize": [
+      {
+        "format": "24 mm Main",
+        "size": [9.8, 7.3]
+      },
+      {
+        "format": "13 mm Ultra Wide",
+        "size": [5.6, 4.2]
+      },
+      {
+        "format": "120 mm Telephoto",
+        "size": [4.5, 3.4]
+      }
+    ],
+    "category": ["Mobile"],
+    "description": "Apple uses Sony sensors for their Iphones.",
+    "sources": [
+      "https://en.wikipedia.org/wiki/IPhone_15_Pro",
+      "https://www.dpreview.com/articles/2668153890/apple-s-iphone-15-and-15-pro-imaging-tech-examined",
+      "https://twitter.com/tim_cook/status/1602516736145858561"
+    ],
+    "tags": ["phone"]
+  },
   {
     "name": "Iphone XS",
     "sensorSize": [
@@ -798,6 +916,7 @@
     "category": ["Mobile"],
     "description": "Apple uses Sony sensors for their Iphones.",
     "sources": [
+      "https://en.wikipedia.org/wiki/IPhone_XS",
       "https://en.wikipedia.org/wiki/Image_sensor_format",
       "https://twitter.com/tim_cook/status/1602516736145858561"
     ],
@@ -3107,6 +3226,22 @@
     ],
     "tags": ["full frame", "a9", "ilce-9"]
   },
+  {
+    "name": "Sony Alpha 9 III",
+    "sensorSize": [
+      {
+        "format": "Open Gate",
+        "size": [35.6, 23.8]
+      }
+    ],
+    "category": ["Still"],
+    "description": "",
+    "sources": [
+      "https://electronics.sony.com/imaging/interchangeable-lens-cameras/all-interchangeable-lens-cameras/p/ilce9m3b",
+      "https://en.wikipedia.org/wiki/Sony_α9_III"
+    ],
+    "tags": ["full frame", "a9", "ilce-9m3"]
+  },
   {
     "name": "Sony BURANO",
     "sensorSize": [

diff --git a/deploy/lightsources.json b/deploy/lightsources.json
@@ -1,4 +1,37 @@
 [
+  {
+    "name": "Aputure amaran 300c",
+    "color": [1.0, 0.859, 0.778],
+    "temperature": 5600,
+    "temperatureRange": [2500, 7500],
+    "intensity": 19389,
+    "unit": ["lm"],
+    "angle": 90,
+    "type": ["spot"],
+    "category": ["Artificial"],
+    "description": "",
+    "sources": [
+      "https://www.aputure.com/products/amaran-300c/#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"
+    ]
+  },
+  {
+    "name": "Aputure amaran P60c",
+    "color": [1.0, 0.859, 0.778],
+    "temperature": 7500,
+    "temperatureRange": [2500, 7500],
+    "intensity": 3000,
+    "unit": ["lm"],
+    "angle": 45,
+    "sourceSize": [27, 21],
+    "type": ["surface"],
+    "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"
+    ]
+  },
   {
     "name": "Arri SkyPanel X",
     "color": [1.0, 0.859, 0.778],
@@ -19,6 +52,7 @@
     "temperature": 1850,
     "intensity": 13,
     "unit": ["lm"],
+    "sourceSize": [1],
     "type": ["point"],
     "category": ["Natural"],
     "description": "",
@@ -65,6 +99,7 @@
     "temperature": 0,
     "intensity": 0.0006,
     "unit": ["lm"],
+    "sourceSize": [0.25],
     "type": ["point"],
     "category": ["Natural"],
     "description": "Fireflies produce a \"cold light\", with no infrared or ultraviolet frequencies. The light may be yellow, green, or pale red, with wavelengths from 510 to 670 nanometers. Some species such as the dimly glowing \"blue ghost\" of the Eastern US may seem to emit blueish-white light from a distance and in low light conditions, but their glow is bright green when observed up close. Their perceived blue tint may be due to the Purkinje effect.",
@@ -82,6 +117,7 @@
     "intensity": 1000,
     "intensityRange": [500, 5000],
     "unit": ["lm"],
+    "sourceSize": [60, 1.5],
     "type": ["cylinder"],
     "category": ["Artificial"],
     "description": "",
@@ -113,6 +149,7 @@
     "intensity": 800,
     "intensityRange": [400, 1000],
     "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.",
@@ -129,6 +166,7 @@
     "intensity": 0.1,
     "intensityRange": [0.05, 0.32],
     "unit": ["lx"],
+    "angle": 0.53,
     "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.",
@@ -138,7 +176,8 @@
       "https://en.wikipedia.org/wiki/Purkinje_effect",
       "https://chrisbrejon.com/cg-cinematography/chapter-4-light-categories/#moon",
       "https://iopscience.iop.org/article/10.1088/0031-9120/48/3/360",
-      "https://web.archive.org/web/20151005215129/http://www.cast-lighting.com/search/1/display-document/71"
+      "https://web.archive.org/web/20151005215129/http://www.cast-lighting.com/search/1/display-document/71",
+      "https://www.physics.unlv.edu/~jeffery/astro/moon/sun_moon_angular.html"
     ]
   },
   {
@@ -225,6 +264,7 @@
     "intensity": 100000,
     "intensityRange": [400, 100000],
     "unit": ["lx"],
+    "angle": 0.53,
     "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.",

diff --git a/deploy/materials.json b/deploy/materials.json
@@ -717,11 +717,12 @@
     "metalness": 0,
     "roughness": 0.5,
     "ior": 1.5,
-    "density": 0,
+    "density": 800,
     "category": ["Manmade"],
     "description": "Office paper contains optical brightening additives that absorb light in the ultraviolet and violet region (usually 340-370 nm), and re-emit light in the blue region (typically 420-470 nm) by fluorescence.",
     "sources": [
       "https://github.com/AntonPalmqvist/physically-based-api/tree/main/data/materials/office-paper",
+      "https://en.wikipedia.org/wiki/Paper#Types,_thickness_and_weight",
       "https://en.wikipedia.org/wiki/Optical_brightener"
     ],
     "tags": [""],
@@ -738,7 +739,7 @@
     "subsurfaceRadius": [0.3, 0.5, 0.3],
     "thinFilmThickness": 420,
     "thinFilmIor": 2,
-    "density": 0,
+    "density": 2700,
     "category": ["Organic"],
     "description": "The akoya pearl is a saltwater cultured pearl from the akoya oyster. Akoya are considered to be the classic pearl used for necklaces and other pearl jewelry. Nacre is the material of which pearls are composed and consists of aragonite crystal layers separated by conchiolin, a protein secreted by mollusk shells. The thickness of these layers determines the color of reflection from the nacre. The transmission interference color is complementary to the reflection interference color.",
     "sources": [

diff --git a/deploy/v2/materials.json b/deploy/v2/materials.json
@@ -0,0 +1,29 @@
+[
+  {
+    "name": "Blood",
+    "color": [0.64448, 0.003, 0.005],
+    "metalness": 0,
+    "roughness": 0,
+    "ior": 1.301,
+    "transmission": 1,
+    "density": 1060,
+    "viscosity": 3,
+    "category": ["Human"],
+    "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.",
+    "sources": [
+      "https://en.wikipedia.org/wiki/Blood",
+      "https://en.wikipedia.org/wiki/Blood_red",
+      "https://refractiveindex.info/?shelf=other&book=blood&page=Rowe",
+      "https://hypertextbook.com/facts/2004/MichaelShmukler.shtml",
+      "https://www.researchgate.net/figure/Color-chart-for-the-measurement-of-methemoglobin-The-color-chart-was-prepared-according_fig2_26884296",
+      "https://www.engineeringtoolbox.com/absolute-viscosity-liquids-d_1259.html",
+      "https://en.wikipedia.org/wiki/Hemorheology",
+      "https://www.frontiersin.org/articles/10.3389/fphys.2019.01329/full",
+      "https://nextlimitsupport.atlassian.net/wiki/spaces/rf2016docs/pages/5497120/Hybrido+Viscosity+Table"
+    ],
+    "tags": ["liquid"],
+    "reference": [
+      "https://raw.githubusercontent.com/AntonPalmqvist/physically-based-api/main/reference/render/blood-cycles.png"
+    ]
+  }
+]
diff --git a/schema-lightsources.json b/schema-lightsources.json
@@ -58,6 +58,20 @@
         "minItems": 1,
         "maxItems": 1
       },
+      "angle": {
+        "description": "The maximum beam angle in degrees. For a directional light, this specifies angular diameter instead.",
+        "type": "number",
+        "default": 90
+      },
+      "sourceSize": {
+        "description": "The size of the light source in centimeters. [Radius] if point or spot. [Width, Height] if surface. [Length, Radius] if cylinder.",
+        "type": "array",
+        "items": {
+          "type": "number"
+        },
+        "minItems": 1,
+        "maxItems": 2
+      },
       "type": {
         "description": "The type of light, for DCC applications.",
         "type": "array",