Merge pull request #35 from AntonPalmqvist/dev

Merge from dev

.github/workflows/build-on-api-deploy.yml

@@ -0,0 +1,24 @@
+name: API Deploy
+on:
+  push:
+    branches:
+      - "dev"
+      - "main"
+    paths:
+      - "deploy/*.json"
+
+jobs:
+  build_dev:
+    if: github.ref == 'refs/heads/dev'
+    name: Netlify Webhook - Dev
+    runs-on: ubuntu-latest
+    steps:
+      - name: Curl request
+        run: curl -X POST -d {} ${{ secrets.NETLIFY_WEBHOOK_DEV }}
+  build_production:
+    if: github.ref == 'refs/heads/main'
+    name: Netlify Webhook - Production
+    runs-on: ubuntu-latest
+    steps:
+      - name: Curl request
+        run: curl -X POST -d {} ${{ secrets.NETLIFY_WEBHOOK_PRODUCTION }}

data/materials/office-paper/measurements.json

@@ -3,10 +3,11 @@
     "subject": "Office Paper",
     "author": "https://github.com/AntonPalmqvist",
     "device": "Nix Spectro 2",
-    "illuminant": "D50",
-    "observer": 2,
-    "rgb": [0.738, 0.768, 1],
-    "xyz": [76.2, 77.5, 80.9],
-    "cielab": [90.5, 3.08, -15]
+    "illuminant": "D65",
+    "observer": 10,
+    "measuringMode": "M2",
+    "srgb-linear": [0.794, 0.834, 0.884],
+    "ciexyz-d65": [0.785, 0.829, 0.955],
+    "cielab-d65": [92.97, -0.56, -3.53]
   }
 ]

deploy/materials.json

@@ -604,7 +604,7 @@
   },
   {
     "name": "Office Paper",
-    "color": [0.738, 0.768, 1],
+    "color": [0.794, 0.834, 0.884],
     "metalness": 0,
     "roughness": 0.5,
     "ior": 1.5,