- Removed variants from Materials schema

- Added variants to Lightsources schema - Updated Lightsources
AntonPalmqvist · Mar 27, 2024 · 4e34fec · 4e34fec
1 parent b35d675
commit 4e34fec
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 91 deletions.
diff --git a/deploy/lightsources.json b/deploy/lightsources.json
@@ -17,7 +17,7 @@
   },
   {
     "name": "Aputure amaran P60c",
-    "color": [1.0, 0.859, 0.778],
+    "color": [0.828, 0.841, 1.0],
     "temperature": 7500,
     "temperatureRange": [2500, 7500],
     "intensity": 3000,
@@ -34,16 +34,45 @@
   },
   {
     "name": "Arri SkyPanel X",
-    "color": [1.0, 0.859, 0.778],
-    "temperature": 5600,
     "temperatureRange": [1500, 20000],
-    "intensity": 51809,
+    "variants": [
+      {
+        "format": "Open-Face",
+        "color": [1.0, 0.859, 0.778],
+        "temperature": 5600,
+        "angle": 121,
+        "intensity": 48000
+      },
+      {
+        "format": "Dome",
+        "color": [1.0, 0.859, 0.778],
+        "temperature": 5600,
+        "angle": 107,
+        "intensity": 42700
+      },
+      {
+        "format": "S60 Adapter",
+        "color": [1.0, 0.859, 0.778],
+        "temperature": 5600,
+        "angle": 101,
+        "intensity": 35400
+      },
+      {
+        "format": "HyPer Optic",
+        "color": [1.0, 0.859, 0.778],
+        "temperature": 5600,
+        "angle": 11,
+        "intensity": 22000
+      }
+    ],
+    "sourceSize": [64.8, 30.3],
     "unit": ["lm"],
     "type": ["surface"],
     "category": ["Artificial"],
     "description": "",
     "sources": [
-      "https://www.arri.com/en/lighting/led/skypanel/x-series/tech-data"
+      "https://www.arri.com/en/lighting/led/skypanel/x-series/tech-data",
+      "https://www.arri.com/resource/blob/341262/e55242c6535912778f7f39d38f490c90/arri-skypanel-x-data-sheet-en-data.pdf"
     ]
   },
   {

diff --git a/schemas/schema-lightsources-v2.json b/schemas/schema-lightsources-v2.json
@@ -41,6 +41,38 @@
         "minItems": 2,
         "maxItems": 2
       },
+      "intensityRange": {
+        "description": "The typical range of intensity for this specific light source.",
+        "type": "array",
+        "items": {
+          "type": "number"
+        },
+        "default": [0, 1],
+        "minItems": 2,
+        "maxItems": 2
+      },
+      "unit": {
+        "type": "array",
+        "items": {
+          "enum": ["lm", "lx", "cd/m2"]
+        },
+        "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
+      },
       "variants": {
         "description": "If the light source comes in different variations, they can be described here.",
         "type": "object",
@@ -78,38 +110,6 @@
           "required": ["format", "intensity", "angle", "temperature"]
         }
       },
-      "intensityRange": {
-        "description": "The typical range of intensity for this specific light source.",
-        "type": "array",
-        "items": {
-          "type": "number"
-        },
-        "default": [0, 1],
-        "minItems": 2,
-        "maxItems": 2
-      },
-      "unit": {
-        "type": "array",
-        "items": {
-          "enum": ["lm", "lx", "cd/m2"]
-        },
-        "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",

diff --git a/schemas/schema-lightsources.json b/schemas/schema-lightsources.json
@@ -88,6 +88,57 @@
         "minItems": 1,
         "maxItems": 1
       },
+      "variants": {
+        "description": "If the light source comes in different variations, they can be described here.",
+        "type": "array",
+        "minItems": 1,
+        "items": {
+          "additionalProperties": false,
+          "type": "object",
+          "properties": {
+            "format": {
+              "description": "Specifies the format.",
+              "type": "string",
+              "default": "Default"
+            },
+            "color": {
+              "description": "Color of the light source.",
+              "type": "array",
+              "items": {
+                "type": "number"
+              },
+              "default": [1, 1, 1],
+              "minItems": 3,
+              "maxItems": 3
+            },
+            "temperature": {
+              "description": "Color temperature in Kelvin, if color lies on the Planckian curve.",
+              "type": "number",
+              "default": 6500
+            },
+            "intensity": {
+              "description": "Intensity of the light emitted from the light source.",
+              "type": "number",
+              "default": 0
+            },
+            "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
+            }
+          }
+        },
+        "required": ["format", "color", "temperature", "intensity"]
+      },
       "category": {
         "type": "array",
         "items": {
@@ -120,14 +171,14 @@
         "uniqueItems": true
       }
     },
-    "required": [
-      "name",
-      "color",
-      "intensity",
-      "unit",
-      "category",
-      "description",
-      "sources"
-    ]
+    "anyOf": [
+      {
+        "required": ["color", "intensity"]
+      },
+      {
+        "required": ["variants"]
+      }
+    ],
+    "required": ["name", "unit", "category", "description", "sources"]
   }
 }
diff --git a/schemas/schema-materials.json b/schemas/schema-materials.json
@@ -113,51 +113,6 @@
         "minItems": 6,
         "maxItems": 6
       },
-      "variants": {
-        "description": "If the material comes in different variations, they can be described here.",
-        "type": "array",
-        "items": {
-          "additionalProperties": false,
-          "type": "object",
-          "properties": {
-            "name": {
-              "description": "Name of the material.",
-              "type": "string",
-              "default": "Name"
-            },
-            "color": {
-              "description": "Albedo, or metal color, RGB triplet (vec3) in linear decimal format in rec709 primaries.",
-              "type": "array",
-              "items": {
-                "type": "number"
-              },
-              "default": [0.5, 0.5, 0.5],
-              "minItems": 3,
-              "maxItems": 3
-            },
-            "subsurfaceRadius": {
-              "description": "The approximate distance up to which light can scatter below the surface, also known as “mean free path” (MFP). Specified in centimeters.",
-              "type": "array",
-              "items": {
-                "type": "number"
-              },
-              "default": [1, 1, 1],
-              "minItems": 3,
-              "maxItems": 3
-            },
-            "reference": {
-              "description": "Links to reference images.",
-              "type": "array",
-              "items": {
-                "type": "string",
-                "minLength": 1
-              },
-              "uniqueItems": true
-            }
-          },
-          "required": ["name"]
-        }
-      },
       "category": {
         "type": "array",
         "items": {