Skip to content

Commit 17c5123

Browse files
committed
fix(soba): reverse occlusion logic in HTML
1 parent b07816b commit 17c5123

File tree

3 files changed

+1193
-687
lines changed

3 files changed

+1193
-687
lines changed

Diff for: libs/soba/misc/src/html/html-wrapper.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,10 @@ export class NgtsHtmlWrapper {
402402
let raytraceTarget: null | undefined | boolean | THREE.Object3D[] = false;
403403

404404
if (isRayCastOcclusion) {
405-
if (occlude !== 'blending') {
406-
raytraceTarget = [scene];
407-
} else if (Array.isArray(occlude)) {
405+
if (Array.isArray(occlude)) {
408406
raytraceTarget = occlude.map((item) => (is.ref(item) ? item.nativeElement : item));
407+
} else if (occlude !== 'blending') {
408+
raytraceTarget = [scene];
409409
}
410410
}
411411

Diff for: package.json

+23-23
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"@angular-eslint/eslint-plugin-template": "~16.1.1",
2323
"@angular-eslint/template-parser": "~16.1.1",
2424
"@angular/cli": "~16.2.0",
25-
"@angular/compiler-cli": "16.2.1",
26-
"@angular/language-service": "16.2.1",
25+
"@angular/compiler-cli": "16.2.2",
26+
"@angular/language-service": "16.2.2",
2727
"@nx/angular": "16.7.4",
2828
"@nx/devkit": "16.7.4",
2929
"@nx/eslint-plugin": "16.7.4",
@@ -49,23 +49,23 @@
4949
"@storybook/theming": "^7.3.2",
5050
"@swc-node/register": "~1.6.7",
5151
"@swc/cli": "~0.1.62",
52-
"@swc/core": "~1.3.78",
53-
"@types/jest": "^29.5.3",
54-
"@types/node": "20.5.1",
55-
"@types/three": "^0.155.0",
52+
"@swc/core": "~1.3.80",
53+
"@types/jest": "^29.5.4",
54+
"@types/node": "20.5.6",
55+
"@types/three": "^0.155.1",
5656
"@typescript-eslint/eslint-plugin": "6.4.1",
5757
"@typescript-eslint/parser": "6.4.1",
5858
"autoprefixer": "^10.4.15",
5959
"dotenv-cli": "^7.3.0",
60-
"eslint": "8.47.0",
60+
"eslint": "8.48.0",
6161
"eslint-config-prettier": "9.0.0",
6262
"glsl-noise": "^0.0.0",
6363
"glslify-loader": "^2.0.0",
64-
"jest": "^29.6.3",
65-
"jest-environment-jsdom": "^29.6.3",
64+
"jest": "^29.6.4",
65+
"jest-environment-jsdom": "^29.6.4",
6666
"jest-preset-angular": "~13.1.1",
6767
"jsdom": "^22.1.0",
68-
"ng-packagr": "16.2.0",
68+
"ng-packagr": "16.2.1",
6969
"ngx-resize": "^2.0.0",
7070
"nx": "16.7.4",
7171
"postcss": "^8.4.28",
@@ -85,31 +85,31 @@
8585
"vite": "^4.4.9",
8686
"vite-plugin-glslify": "^2.0.2",
8787
"vite-tsconfig-paths": "^4.2.0",
88-
"vitest": "^0.34.2"
88+
"vitest": "^0.34.3"
8989
},
9090
"dependencies": {
9191
"@analogjs/content": "^0.2.0",
9292
"@analogjs/router": "^0.2.0",
93-
"@angular/animations": "16.2.1",
94-
"@angular/common": "16.2.1",
95-
"@angular/compiler": "16.2.1",
96-
"@angular/core": "16.2.1",
97-
"@angular/forms": "16.2.1",
98-
"@angular/platform-browser": "16.2.1",
99-
"@angular/platform-browser-dynamic": "16.2.1",
100-
"@angular/platform-server": "16.2.1",
101-
"@angular/router": "16.2.1",
93+
"@angular/animations": "16.2.2",
94+
"@angular/common": "16.2.2",
95+
"@angular/compiler": "16.2.2",
96+
"@angular/core": "16.2.2",
97+
"@angular/forms": "16.2.2",
98+
"@angular/platform-browser": "16.2.2",
99+
"@angular/platform-browser-dynamic": "16.2.2",
100+
"@angular/platform-server": "16.2.2",
101+
"@angular/router": "16.2.2",
102102
"@pmndrs/cannon-worker-api": "^2.4.0",
103103
"@swc/helpers": "~0.5.1",
104104
"cannon-es": "^0.20.0",
105105
"cannon-es-debugger": "^1.0.0",
106106
"front-matter": "^4.0.2",
107107
"gsap": "^3.12.2",
108108
"maath": "^0.7.0",
109-
"marked": "^7.0.4",
109+
"marked": "^7.0.5",
110110
"marked-gfm-heading-id": "^3.0.6",
111111
"marked-highlight": "^2.0.4",
112-
"mermaid": "^10.3.1",
112+
"mermaid": "^10.4.0",
113113
"meshline": "^3.1.6",
114114
"nice-color-palettes": "^3.0.0",
115115
"prismjs": "^1.29.0",
@@ -118,7 +118,7 @@
118118
"rxjs": "~7.8.1",
119119
"stats-gl": "^1.0.4",
120120
"three-mesh-bvh": "^0.6.3",
121-
"three-stdlib": "^2.24.2",
121+
"three-stdlib": "^2.25.0",
122122
"troika-three-text": "^0.47.2",
123123
"tslib": "^2.6.2",
124124
"zone.js": "~0.13.1"

0 commit comments

Comments
 (0)