@shapediver/viewer.rendering-engine.rendering-engine-threejs 3.6.0 → 3.7.1

package/dist/managers/postprocessing/ao/ssao/SSAOEffect.js

@@ -5,10 +5,12 @@ const three_1 = require("three");
 const AOEffect_1 = require("../ao/AOEffect");
 const AOPass_1 = require("../ao/AOPass");
 const ssao_1 = require("./shader/ssao");
+const ao_utils_1 = require("../ao/shader/ao_utils");
+const finalFragmentShader = ssao_1.ssao.replace('#include <ao_utils>', ao_utils_1.ao_utils);
 class SSAOPass extends AOPass_1.AOPass {
     // #region Constructors (1)
     constructor(camera, scene) {
-        super(camera, scene, ssao_1.ssao);
+        super(camera, scene, finalFragmentShader);
     }
 }
 class SSAOEffect extends AOEffect_1.AOEffect {

package/dist/managers/postprocessing/ao/ssao/SSAOEffect.js.map

@@ -1 +1 @@
-{"version":3,"file":"SSAOEffect.js","sourceRoot":"","sources":["../../../../../src/managers/postprocessing/ao/ssao/SSAOEffect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SSAOEffect.js","sourceRoot":"","sources":["../../../../../src/managers/postprocessing/ao/ssao/SSAOEffect.ts"],"names":[],"mappings":"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"}

package/dist/managers/postprocessing/ao/ssao/shader/ssao.d.ts

@@ -1,2 +1,2 @@
-export declare const ssao = "\nvarying vec2 vUv;\n\nuniform highp sampler2D depthTexture;\nuniform sampler2D normalTexture;\nuniform mat4 projectionViewMatrix;\nuniform mat4 cameraMatrixWorld;\n\nuniform sampler2D blueNoiseTexture;\nuniform vec2 blueNoiseRepeat;\nuniform vec2 texSize;\nuniform mat4 projectionMatrixInverse;\n\nuniform float aoDistance;\nuniform float distancePower;\nuniform float cameraNear;\nuniform float cameraFar;\nuniform int frame;\n\nuniform vec3[spp] samples;\nuniform float[spp] samplesR;\n\n#include <common>\n#include <packing>\n#include <sampleBlueNoise>\n\n// source: https://github.com/N8python/ssao/blob/master/EffectShader.js#L52\nvec3 getWorldPos(const float depth, const vec2 coord) {\n    float z = depth * 2.0 - 1.0;\n    vec4 clipSpacePosition = vec4(coord * 2.0 - 1.0, z, 1.0);\n    vec4 viewSpacePosition = projectionMatrixInverse * clipSpacePosition;\n\n    // Perspective division\n    vec4 worldSpacePosition = cameraMatrixWorld * viewSpacePosition;\n    worldSpacePosition.xyz /= worldSpacePosition.w;\n\n    return worldSpacePosition.xyz;\n}\n\nvec3 computeNormal(vec3 worldPos, vec2 vUv) {\n    vec2 size = vec2(textureSize(depthTexture, 0));\n    ivec2 p = ivec2(vUv * size);\n    float c0 = texelFetch(depthTexture, p, 0).x;\n    float l2 = texelFetch(depthTexture, p - ivec2(2, 0), 0).x;\n    float l1 = texelFetch(depthTexture, p - ivec2(1, 0), 0).x;\n    float r1 = texelFetch(depthTexture, p + ivec2(1, 0), 0).x;\n    float r2 = texelFetch(depthTexture, p + ivec2(2, 0), 0).x;\n    float b2 = texelFetch(depthTexture, p - ivec2(0, 2), 0).x;\n    float b1 = texelFetch(depthTexture, p - ivec2(0, 1), 0).x;\n    float t1 = texelFetch(depthTexture, p + ivec2(0, 1), 0).x;\n    float t2 = texelFetch(depthTexture, p + ivec2(0, 2), 0).x;\n    float dl = abs((2.0 * l1 - l2) - c0);\n    float dr = abs((2.0 * r1 - r2) - c0);\n    float db = abs((2.0 * b1 - b2) - c0);\n    float dt = abs((2.0 * t1 - t2) - c0);\n    vec3 ce = getWorldPos(c0, vUv).xyz;\n    vec3 dpdx = (dl < dr) ? ce - getWorldPos(l1, (vUv - vec2(1.0 / size.x, 0.0))).xyz\n                          : -ce + getWorldPos(r1, (vUv + vec2(1.0 / size.x, 0.0))).xyz;\n    vec3 dpdy = (db < dt) ? ce - getWorldPos(b1, (vUv - vec2(0.0, 1.0 / size.y))).xyz\n                          : -ce + getWorldPos(t1, (vUv + vec2(0.0, 1.0 / size.y))).xyz;\n    return normalize(cross(dpdx, dpdy));\n}\n\nhighp float linearize_depth(highp float d, highp float zNear, highp float zFar) {\n    highp float z_n = 2.0 * d - 1.0;\n    return 2.0 * zNear * zFar / (zFar + zNear - z_n * (zFar - zNear));\n}\n\nvoid main() {\n    float depth = textureLod(depthTexture, vUv, 0.).x;\n\n    // filter out background\n    if (depth == 1.0) {\n        discard;\n        return;\n    }\n\n    vec3 worldPos = getWorldPos(depth, vUv);\n    vec3 normal = computeNormal(worldPos, vUv);\n\n#ifdef animatedNoise\n    int seed = frame;\n#else\n    int seed = 0;\n#endif\n\n    vec4 noise = sampleBlueNoise(blueNoiseTexture, seed, blueNoiseRepeat, texSize);\n\n    vec3 randomVec = normalize(noise.rgb * 2.0 - 1.0);\n    vec3 tangent = normalize(randomVec - normal * dot(randomVec, normal));\n    vec3 bitangent = cross(normal, tangent);\n    mat3 tbn = mat3(tangent, bitangent, normal);\n\n    float occluded = 0.0;\n    float totalWeight = 0.0;\n\n    vec3 samplePos;\n\n    float sppF = float(spp);\n\n    for (float i = 0.0; i < sppF; i++) {\n        vec3 sampleDirection = tbn * samples[int(i)];\n\n        // make sure sample direction is in the same hemisphere as the normal\n        if (dot(sampleDirection, normal) < 0.0) sampleDirection *= -1.0;\n\n        float moveAmt = samplesR[int(mod(i + noise.a * sppF, sppF))];\n        samplePos = worldPos + aoDistance * moveAmt * sampleDirection;\n\n        vec4 offset = projectionViewMatrix * vec4(samplePos, 1.0);\n        offset.xyz /= offset.w;\n        offset.xyz = offset.xyz * 0.5 + 0.5;\n\n        float sampleDepth = textureLod(depthTexture, offset.xy, 0.0).x;\n\n        float distSample = linearize_depth(sampleDepth, cameraNear, cameraFar);\n        float distWorld = linearize_depth(offset.z, cameraNear, cameraFar);\n\n        float rangeCheck = smoothstep(0.0, 1.0, aoDistance / abs(distSample - distWorld));\n        rangeCheck = pow(rangeCheck, distancePower);\n        float weight = dot(sampleDirection, normal);\n\n        occluded += rangeCheck * weight * (distSample < distWorld ? 1.0 : 0.0);\n        totalWeight += weight;\n    }\n\n    float occ = clamp(1.0 - occluded / totalWeight, 0.0, 1.0);\n    gl_FragColor = vec4(normal, occ);\n}\n";
+export declare const ssao = "\nvarying vec2 vUv;\n\nuniform highp sampler2D depthTexture;\nuniform mat4 projectionViewMatrix;\nuniform mat4 cameraMatrixWorld;\n\nuniform sampler2D blueNoiseTexture;\nuniform vec2 blueNoiseRepeat;\nuniform vec2 texSize;\nuniform float aoDistance;\nuniform float distancePower;\nuniform float cameraNear;\nuniform float cameraFar;\nuniform int frame;\n\nuniform vec3[spp] samples;\nuniform float[spp] samplesR;\n\n#include <common>\n#include <packing>\n#include <sampleBlueNoise>\n#include <ao_utils>\n\nhighp float linearize_depth(highp float d, highp float zNear, highp float zFar) {\n    highp float z_n = 2.0 * d - 1.0;\n    return 2.0 * zNear * zFar / (zFar + zNear - z_n * (zFar - zNear));\n}\n\nvoid main() {\n    float depth = textureLod(depthTexture, vUv, 0.).x;\n    vec3 normal = computeNormal(vUv);\n\n    // filter out background\n    if (depth == 1.0) {\n        gl_FragColor = vec4(normal, 1.0);\n        return;\n    }\n\n    vec3 worldPos = computeWorldPosition(depth, vUv);\n    vec3 screenSpaceNormal = getUnpackedNormal(vUv);\n\n    #ifdef animatedNoise\n        int seed = frame;\n    #else\n        int seed = 0;\n    #endif\n\n    vec4 noise = sampleBlueNoise(blueNoiseTexture, seed, blueNoiseRepeat, texSize);\n\n    vec3 randomVec = normalize(noise.rgb * 2.0 - 1.0);\n    vec3 tangent = normalize(randomVec - normal * dot(randomVec, normal));\n    vec3 bitangent = cross(normal, tangent);\n    mat3 tbn = mat3(tangent, bitangent, normal);\n\n    float occluded = 0.0;\n    float totalWeight = 0.0;\n\n    vec3 samplePos;\n\n    float sppF = float(spp);\n\n    for (float i = 0.0; i < sppF; i++) {\n        vec3 sampleDirection = tbn * samples[int(i)];\n\n        // make sure sample direction is in the same hemisphere as the normal\n        if (dot(sampleDirection, normal) < 0.0) sampleDirection *= -1.0;\n\n        float moveAmt = samplesR[int(mod(i + noise.a * sppF, sppF))];\n        samplePos = worldPos + aoDistance * moveAmt * sampleDirection;\n\n        vec4 offset = projectionViewMatrix * vec4(samplePos, 1.0);\n        offset.xyz /= offset.w;\n        offset.xyz = offset.xyz * 0.5 + 0.5;\n\n        float sampleDepth = textureLod(depthTexture, offset.xy, 0.0).x;\n\n        if(sampleDepth == 1.0) {\n            occluded += 0.0;\n            totalWeight += 1.0;\n            continue;\n        }\n\n        vec3 sampleNormal = getUnpackedNormal(offset.xy);\n\n        float distSample = linearize_depth(sampleDepth, cameraNear, cameraFar);\n        float distWorld = linearize_depth(offset.z, cameraNear, cameraFar);\n\n        float depthBias = 0.001;\n        float rangeCheck = smoothstep(0.0, 1.0, aoDistance / (abs(distSample - distWorld) + depthBias));\n        rangeCheck = pow(rangeCheck, distancePower);\n        rangeCheck = clamp(rangeCheck, 0.0, 1.0);\n        float weight = dot(sampleDirection, normal);\n        weight = clamp(weight, 0.0, 1.0);\n\n        \n        // check if the normals are in the same direction\n        float dotProduct = dot(screenSpaceNormal, normalize(sampleNormal));\n        if (dotProduct < 0.9999) {\n            occluded += rangeCheck * weight * (distSample < distWorld ? 1.0 : 0.0);\n            totalWeight += weight;\n        } else {\n            if(areDepthsOnSamePlane(depth, sampleDepth, vUv, offset.xy, normal, 0.1)) {\n                occluded += 0.0;\n                totalWeight += 1.0;\n            } else {\n                occluded += rangeCheck * weight * (distSample < distWorld ? 1.0 : 0.0);\n                totalWeight += weight;\n            }\n        }\n    }\n\n    float occ = clamp(1.0 - occluded / totalWeight, 0.0, 1.0);\n    gl_FragColor = vec4(normal, occ);\n}\n";
 //# sourceMappingURL=ssao.d.ts.map

package/dist/managers/postprocessing/ao/ssao/shader/ssao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssao.d.ts","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/ssao/shader/ssao.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,w9IAiIhB,CAAA"}
+{"version":3,"file":"ssao.d.ts","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/ssao/shader/ssao.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,kmHAmHhB,CAAC"}

package/dist/managers/postprocessing/ao/ssao/shader/ssao.js

@@ -5,15 +5,12 @@ exports.ssao = `
 varying vec2 vUv;
 
 uniform highp sampler2D depthTexture;
-uniform sampler2D normalTexture;
 uniform mat4 projectionViewMatrix;
 uniform mat4 cameraMatrixWorld;
 
 uniform sampler2D blueNoiseTexture;
 uniform vec2 blueNoiseRepeat;
 uniform vec2 texSize;
-uniform mat4 projectionMatrixInverse;
-
 uniform float aoDistance;
 uniform float distancePower;
 uniform float cameraNear;
@@ -26,43 +23,7 @@ uniform float[spp] samplesR;
 #include <common>
 #include <packing>
 #include <sampleBlueNoise>
-
-// source: https://github.com/N8python/ssao/blob/master/EffectShader.js#L52
-vec3 getWorldPos(const float depth, const vec2 coord) {
-    float z = depth * 2.0 - 1.0;
-    vec4 clipSpacePosition = vec4(coord * 2.0 - 1.0, z, 1.0);
-    vec4 viewSpacePosition = projectionMatrixInverse * clipSpacePosition;
-
-    // Perspective division
-    vec4 worldSpacePosition = cameraMatrixWorld * viewSpacePosition;
-    worldSpacePosition.xyz /= worldSpacePosition.w;
-
-    return worldSpacePosition.xyz;
-}
-
-vec3 computeNormal(vec3 worldPos, vec2 vUv) {
-    vec2 size = vec2(textureSize(depthTexture, 0));
-    ivec2 p = ivec2(vUv * size);
-    float c0 = texelFetch(depthTexture, p, 0).x;
-    float l2 = texelFetch(depthTexture, p - ivec2(2, 0), 0).x;
-    float l1 = texelFetch(depthTexture, p - ivec2(1, 0), 0).x;
-    float r1 = texelFetch(depthTexture, p + ivec2(1, 0), 0).x;
-    float r2 = texelFetch(depthTexture, p + ivec2(2, 0), 0).x;
-    float b2 = texelFetch(depthTexture, p - ivec2(0, 2), 0).x;
-    float b1 = texelFetch(depthTexture, p - ivec2(0, 1), 0).x;
-    float t1 = texelFetch(depthTexture, p + ivec2(0, 1), 0).x;
-    float t2 = texelFetch(depthTexture, p + ivec2(0, 2), 0).x;
-    float dl = abs((2.0 * l1 - l2) - c0);
-    float dr = abs((2.0 * r1 - r2) - c0);
-    float db = abs((2.0 * b1 - b2) - c0);
-    float dt = abs((2.0 * t1 - t2) - c0);
-    vec3 ce = getWorldPos(c0, vUv).xyz;
-    vec3 dpdx = (dl < dr) ? ce - getWorldPos(l1, (vUv - vec2(1.0 / size.x, 0.0))).xyz
-                          : -ce + getWorldPos(r1, (vUv + vec2(1.0 / size.x, 0.0))).xyz;
-    vec3 dpdy = (db < dt) ? ce - getWorldPos(b1, (vUv - vec2(0.0, 1.0 / size.y))).xyz
-                          : -ce + getWorldPos(t1, (vUv + vec2(0.0, 1.0 / size.y))).xyz;
-    return normalize(cross(dpdx, dpdy));
-}
+#include <ao_utils>
 
 highp float linearize_depth(highp float d, highp float zNear, highp float zFar) {
     highp float z_n = 2.0 * d - 1.0;
@@ -71,21 +32,22 @@ highp float linearize_depth(highp float d, highp float zNear, highp float zFar)
 
 void main() {
     float depth = textureLod(depthTexture, vUv, 0.).x;
+    vec3 normal = computeNormal(vUv);
 
     // filter out background
     if (depth == 1.0) {
-        discard;
+        gl_FragColor = vec4(normal, 1.0);
         return;
     }
 
-    vec3 worldPos = getWorldPos(depth, vUv);
-    vec3 normal = computeNormal(worldPos, vUv);
+    vec3 worldPos = computeWorldPosition(depth, vUv);
+    vec3 screenSpaceNormal = getUnpackedNormal(vUv);
 
-#ifdef animatedNoise
-    int seed = frame;
-#else
-    int seed = 0;
-#endif
+    #ifdef animatedNoise
+        int seed = frame;
+    #else
+        int seed = 0;
+    #endif
 
     vec4 noise = sampleBlueNoise(blueNoiseTexture, seed, blueNoiseRepeat, texSize);
 
@@ -116,15 +78,39 @@ void main() {
 
         float sampleDepth = textureLod(depthTexture, offset.xy, 0.0).x;
 
+        if(sampleDepth == 1.0) {
+            occluded += 0.0;
+            totalWeight += 1.0;
+            continue;
+        }
+
+        vec3 sampleNormal = getUnpackedNormal(offset.xy);
+
         float distSample = linearize_depth(sampleDepth, cameraNear, cameraFar);
         float distWorld = linearize_depth(offset.z, cameraNear, cameraFar);
 
-        float rangeCheck = smoothstep(0.0, 1.0, aoDistance / abs(distSample - distWorld));
+        float depthBias = 0.001;
+        float rangeCheck = smoothstep(0.0, 1.0, aoDistance / (abs(distSample - distWorld) + depthBias));
         rangeCheck = pow(rangeCheck, distancePower);
+        rangeCheck = clamp(rangeCheck, 0.0, 1.0);
         float weight = dot(sampleDirection, normal);
-
-        occluded += rangeCheck * weight * (distSample < distWorld ? 1.0 : 0.0);
-        totalWeight += weight;
+        weight = clamp(weight, 0.0, 1.0);
+
+        
+        // check if the normals are in the same direction
+        float dotProduct = dot(screenSpaceNormal, normalize(sampleNormal));
+        if (dotProduct < 0.9999) {
+            occluded += rangeCheck * weight * (distSample < distWorld ? 1.0 : 0.0);
+            totalWeight += weight;
+        } else {
+            if(areDepthsOnSamePlane(depth, sampleDepth, vUv, offset.xy, normal, 0.1)) {
+                occluded += 0.0;
+                totalWeight += 1.0;
+            } else {
+                occluded += rangeCheck * weight * (distSample < distWorld ? 1.0 : 0.0);
+                totalWeight += weight;
+            }
+        }
     }
 
     float occ = clamp(1.0 - occluded / totalWeight, 0.0, 1.0);

package/dist/managers/postprocessing/ao/ssao/shader/ssao.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssao.js","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/ssao/shader/ssao.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiInB,CAAA"}
+{"version":3,"file":"ssao.js","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/ssao/shader/ssao.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmHnB,CAAC"}

package/dist/managers/postprocessing/ao/utils/shader/basic.d.ts

@@ -1,2 +1,2 @@
-export declare const basic = "\nvarying vec2 vUv;\n\nvoid main() {\n    vUv = position.xy * 0.5 + 0.5;\n    gl_Position = vec4(position.xy, 1.0, 1.0);\n}\n";
+export declare const basic = "\nvarying vec2 vUv;\n\nout mat4 viewMatrixInverse;\n\nvoid main() {\n    viewMatrixInverse = inverse(viewMatrix);\n    vUv = position.xy * 0.5 + 0.5;\n    gl_Position = vec4(position.xy, 1.0, 1.0);\n}\n";
 //# sourceMappingURL=basic.d.ts.map

package/dist/managers/postprocessing/ao/utils/shader/basic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/utils/shader/basic.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,kIAOjB,CAAA"}
+{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/utils/shader/basic.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,+MAUjB,CAAA"}

package/dist/managers/postprocessing/ao/utils/shader/basic.js

@@ -4,7 +4,10 @@ exports.basic = void 0;
 exports.basic = `
 varying vec2 vUv;
 
+out mat4 viewMatrixInverse;
+
 void main() {
+    viewMatrixInverse = inverse(viewMatrix);
     vUv = position.xy * 0.5 + 0.5;
     gl_Position = vec4(position.xy, 1.0, 1.0);
 }

package/dist/managers/postprocessing/ao/utils/shader/basic.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/utils/shader/basic.ts"],"names":[],"mappings":";;;AAAa,QAAA,KAAK,GAAG;;;;;;;CAOpB,CAAA"}
+{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../../../../../src/managers/postprocessing/ao/utils/shader/basic.ts"],"names":[],"mappings":";;;AAAa,QAAA,KAAK,GAAG;;;;;;;;;;CAUpB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapediver/viewer.rendering-engine.rendering-engine-threejs",
-  "version": "3.6.0",
+  "version": "3.7.1",
   "description": "",
   "keywords": [],
   "author": "Michael Oppitz <michael@shapediver.com>",
@@ -38,21 +38,21 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@shapediver/viewer.data-engine.gltf-converter": "3.6.0",
-    "@shapediver/viewer.data-engine.shared-types": "3.6.0",
-    "@shapediver/viewer.data-engine.tag3d-engine": "3.6.0",
-    "@shapediver/viewer.rendering-engine.animation-engine": "3.6.0",
-    "@shapediver/viewer.rendering-engine.animation-frame-engine": "3.6.0",
-    "@shapediver/viewer.rendering-engine.camera-engine": "3.6.0",
-    "@shapediver/viewer.rendering-engine.canvas-engine": "3.6.0",
-    "@shapediver/viewer.rendering-engine.intersection-engine": "3.6.0",
-    "@shapediver/viewer.rendering-engine.light-engine": "3.6.0",
-    "@shapediver/viewer.rendering-engine.rendering-engine": "3.6.0",
-    "@shapediver/viewer.shared.global-access-objects": "3.6.0",
-    "@shapediver/viewer.shared.math": "3.6.0",
-    "@shapediver/viewer.shared.node-tree": "3.6.0",
-    "@shapediver/viewer.shared.services": "3.6.0",
-    "@shapediver/viewer.shared.types": "3.6.0",
+    "@shapediver/viewer.data-engine.gltf-converter": "3.7.1",
+    "@shapediver/viewer.data-engine.shared-types": "3.7.1",
+    "@shapediver/viewer.data-engine.tag3d-engine": "3.7.1",
+    "@shapediver/viewer.rendering-engine.animation-engine": "3.7.1",
+    "@shapediver/viewer.rendering-engine.animation-frame-engine": "3.7.1",
+    "@shapediver/viewer.rendering-engine.camera-engine": "3.7.1",
+    "@shapediver/viewer.rendering-engine.canvas-engine": "3.7.1",
+    "@shapediver/viewer.rendering-engine.intersection-engine": "3.7.1",
+    "@shapediver/viewer.rendering-engine.light-engine": "3.7.1",
+    "@shapediver/viewer.rendering-engine.rendering-engine": "3.7.1",
+    "@shapediver/viewer.shared.global-access-objects": "3.7.1",
+    "@shapediver/viewer.shared.math": "3.7.1",
+    "@shapediver/viewer.shared.node-tree": "3.7.1",
+    "@shapediver/viewer.shared.services": "3.7.1",
+    "@shapediver/viewer.shared.types": "3.7.1",
     "@tweenjs/tween.js": "^18.6.4",
     "@types/stats.js": "^0.17.0",
     "@types/three": "0.162.0",
@@ -61,5 +61,5 @@
     "stats.js": "^0.17.0",
     "three": "0.162.0"
   },
-  "gitHead": "55ab8adc3bb462e58542778431c3cfb01e5fc77c"
+  "gitHead": "8bbe1cf6dbde5b0cc23f18a9528df5917dfb5435"
 }