lighting tweaks

src/extensions/geo-export/usdz-exporter.ts

@@ -41,11 +41,6 @@ export class UsdzExporter extends MeshExporter<UsdzData> {
         const materialKey = this.materialMap.size;
         this.materialMap.set(hash, materialKey);
 
-        // const [r, g, b] = Color.toRgbNormalized(color);
-        // private addMaterial(color: Color, alpha: number) {
-        //     const materialKey = UsdzExporter.getMaterialKey(color, alpha);
-        //     if (this.materialSet.has(materialKey)) return;
-        //     this.materialSet.add(materialKey);
         const [r, g, b] = Color.toRgbNormalized(color).map(v => Math.round(v * 1000) / 1000);
         this.materials.push(`
 def Material "material${materialKey}"

src/mol-gl/shader/chunks/apply-light-color.glsl.ts

@@ -42,7 +42,7 @@ geometry.viewDir = normalize(vViewPosition);
 IncidentLight directLight;
 #pragma unroll_loop_start
 for (int i = 0; i < dLightCount; ++i) {
-    directLight.direction = normalize(uLightDirection[i]);
+    directLight.direction = uLightDirection[i];
     directLight.color = uLightColor[i] * PI; // * PI for punctual light
     RE_Direct_Physical(directLight, geometry, physicalMaterial, reflectedLight);
 }

src/mol-plugin-ui/viewport/simple-settings.tsx

@@ -55,9 +55,11 @@ const SimpleSettingsParams = {
         color: PD.Color(Color(0xFCFBF9), { label: 'Background', description: 'Custom background color' }),
         transparent: PD.Boolean(false)
     }, { pivot: 'color' }),
-    occlusion: Canvas3DParams.postprocessing.params.occlusion,
-    outline: Canvas3DParams.postprocessing.params.outline,
-    fog: Canvas3DParams.cameraFog,
+    lighting: PD.Group({
+        occlusion: Canvas3DParams.postprocessing.params.occlusion,
+        outline: Canvas3DParams.postprocessing.params.outline,
+        fog: Canvas3DParams.cameraFog,
+    }, { isFlat: true }),
     clipping: PD.Group<any>({
         ...Canvas3DParams.cameraClipping.params,
         ...(Canvas3DParams.renderer.params.clip as any).params as any
@@ -101,9 +103,11 @@ const SimpleSettingsMapping = ParamMapping({
                 color: renderer.backgroundColor,
                 transparent: canvas.transparentBackground
             },
-            occlusion: canvas.postprocessing.occlusion,
-            outline: canvas.postprocessing.outline,
-            fog: canvas.cameraFog,
+            lighting: {
+                occlusion: canvas.postprocessing.occlusion,
+                outline: canvas.postprocessing.outline,
+                fog: canvas.cameraFog,
+            },
             clipping: {
                 ...canvas.cameraClipping,
                 ...canvas.renderer.clip
@@ -117,9 +121,9 @@ const SimpleSettingsMapping = ParamMapping({
         canvas.camera = s.camera;
         canvas.transparentBackground = s.background.transparent;
         canvas.renderer.backgroundColor = s.background.color;
-        canvas.postprocessing.occlusion = s.occlusion;
-        canvas.postprocessing.outline = s.outline;
-        canvas.cameraFog = s.fog;
+        canvas.postprocessing.occlusion = s.lighting.occlusion;
+        canvas.postprocessing.outline = s.lighting.outline;
+        canvas.cameraFog = s.lighting.fog;
         canvas.cameraClipping = {
             radius: s.clipping.radius,
             far: s.clipping.far,