@archvisioninc/canvas 3.2.1 → 3.2.3

package/dist/helpers/canvasUpdateHelpers.js

@@ -1162,7 +1162,9 @@ export const updateLighting = inboundData => {
     diffuse,
     specular,
     radius,
-    intensity
+    intensity,
+    distance,
+    rotation
   } = payload;
   const light = scene.getLightByName(id);
   if (!_.isEmpty(transforms)) {
@@ -1174,8 +1176,10 @@ export const updateLighting = inboundData => {
       dirY,
       dirZ
     } = transforms;
-    if (tx && ty && tz) light.position = newVector(tx, ty, tz);
-    if (dirX && dirY && dirZ) light.direction = newVector(dirX, dirY, dirZ);
+    const isPosition = tx !== undefined && ty !== undefined && tz !== undefined;
+    const isDirection = dirX !== undefined && dirY !== undefined && dirZ !== undefined;
+    if (isPosition) light.position = newVector(tx, ty, tz);
+    if (isDirection) light.direction = newVector(dirX, dirY, dirZ);
   }
   if (target) {
     light.setDirectionToTarget(target);
@@ -1205,5 +1209,26 @@ export const updateLighting = inboundData => {
   if (intensity !== undefined) {
     light.intensity = intensity;
   }
+  if (distance !== undefined) {
+    const rotation = light?.rotation || 0;
+    const angleRad = rotation * Math.PI / 180;
+    light.position = newVector(distance * Math.cos(angleRad), 5, distance * Math.sin(angleRad));
+    light.setDirectionToTarget(newVector(0, 0, 0));
+    light.distance = distance;
+  }
+  if (rotation !== undefined) {
+    const {
+      position
+    } = light;
+    const {
+      x,
+      y,
+      z
+    } = position;
+    const distance = light?.distance || Math.sqrt(Math.pow(Math.abs(x), 2) + Math.pow(Math.abs(y), 2) + Math.pow(Math.abs(z), 2));
+    light.position = newVector(distance * Math.cos(angleRad), 5, distance * Math.sin(angleRad));
+    light.setDirectionToTarget(newVector(0, 0, 0));
+    light.rotation = rotation;
+  }
   newMetaDataEntry('lights', buildLightsArray());
 };

package/dist/helpers/utilityHelpers.js

@@ -610,7 +610,13 @@ export const buildMaterialsArray = () => {
 };
 export const buildLightsArray = () => {
   const lights = scene.lights;
-  return lights.map(light => light.serialize());
+  return lights.map(light => {
+    return {
+      ...light.serialize(),
+      rotation: light?.rotation ?? 0,
+      distance: light?.distance ?? Math.sqrt(Math.pow(Math.abs(x), 2) + Math.pow(Math.abs(y), 2) + Math.pow(Math.abs(z), 2))
+    };
+  });
 };
 const billboardScreenshot = view => {
   const camera = scene.activeCamera.clone(view);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archvisioninc/canvas",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "private": false,
   "main": "dist/Canvas.js",
   "module": "dist/Canvas.js",

package/src/package/helpers/canvasUpdateHelpers.js

@@ -1169,14 +1169,16 @@ export const updatePublish = inboundData => {
 
 export const updateLighting = inboundData => {
   const { payload } = inboundData;
-  const { id, transforms, target, enable, diffuse, specular, radius, intensity } = payload;
+  const { id, transforms, target, enable, diffuse, specular, radius, intensity, distance, rotation } = payload;
 
   const light = scene.getLightByName(id);
 
   if (!_.isEmpty(transforms)) {
     const { tx, ty, tz, dirX, dirY, dirZ } = transforms;
-    if (tx && ty && tz) light.position = newVector(tx, ty, tz);
-    if (dirX && dirY && dirZ) light.direction = newVector(dirX, dirY, dirZ);
+    const isPosition = tx !== undefined && ty !== undefined && tz !== undefined;
+    const isDirection = dirX !== undefined && dirY !== undefined && dirZ !== undefined;
+    if (isPosition) light.position = newVector(tx, ty, tz);
+    if (isDirection) light.direction = newVector(dirX, dirY, dirZ);
   }
 
   if (target) {
@@ -1205,5 +1207,22 @@ export const updateLighting = inboundData => {
     light.intensity = intensity;
   }
 
+  if (distance !== undefined) {
+    const rotation = light?.rotation || 0;
+    const angleRad = (rotation * Math.PI) / 180
+    light.position = newVector(distance * Math.cos(angleRad), 5, distance * Math.sin(angleRad));
+    light.setDirectionToTarget(newVector(0, 0, 0));
+    light.distance = distance;
+  }
+
+  if (rotation !== undefined) {
+    const { position } = light;
+    const { x, y, z } = position;
+    const distance = light?.distance || Math.sqrt(Math.pow(Math.abs(x), 2) + Math.pow(Math.abs(y), 2) + Math.pow(Math.abs(z), 2));
+    light.position = newVector(distance * Math.cos(angleRad), 5, distance * Math.sin(angleRad));
+    light.setDirectionToTarget(newVector(0, 0, 0));
+    light.rotation = rotation;
+  }
+
   newMetaDataEntry('lights', buildLightsArray())
 };

package/src/package/helpers/utilityHelpers.js

@@ -668,7 +668,13 @@ export const buildMaterialsArray = () => {
 
 export const buildLightsArray = () => {
   const lights = scene.lights;
-  return lights.map(light => light.serialize());
+  return lights.map(light => {
+    return {
+      ...light.serialize(),
+      rotation: light?.rotation ?? 0,
+      distance: light?.distance ?? Math.sqrt(Math.pow(Math.abs(x), 2) + Math.pow(Math.abs(y), 2) + Math.pow(Math.abs(z), 2)),
+    };
+  });
 };
 
 const billboardScreenshot = view => {