diff --git a/package-lock.json b/package-lock.json index 0cc8002..0824a09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ngx-three", - "version": "0.35.0", + "version": "0.36.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ngx-three", - "version": "0.35.0", + "version": "0.36.0", "dependencies": { "@angular/animations": "^18.2.11", "@angular/cdk": "^18.2.12", @@ -26,7 +26,7 @@ "normalize.css": "^8.0.1", "rxjs": "~7.8.1", "simplex-noise": "^4.0.1", - "three": "~0.165.0", + "three": "~0.171.0", "tslib": "^2.6.2", "zone.js": "~0.14.10" }, @@ -41,7 +41,7 @@ "@angular/compiler-cli": "^18.2.11", "@types/jasmine": "^4.3.5", "@types/node": "^20.5.3", - "@types/three": "^0.165.0", + "@types/three": "^0.171.0", "@typescript-eslint/eslint-plugin": "^7.2.0", "@typescript-eslint/parser": "^7.2.0", "acorn": ">=8", @@ -5425,10 +5425,11 @@ } }, "node_modules/@tweenjs/tween.js": { - "version": "23.1.1", - "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.1.tgz", - "integrity": "sha512-ZpboH7pCPPeyBWKf8c7TJswtCEQObFo3bOBYalm99NzZarATALYCo5OhbCa/n4RQyJyHfhkdx+hNrdL5ByFYDw==", - "dev": true + "version": "23.1.3", + "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.3.tgz", + "integrity": "sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==", + "dev": true, + "license": "MIT" }, "node_modules/@types/body-parser": { "version": "1.19.5", @@ -5710,14 +5711,16 @@ "dev": true }, "node_modules/@types/three": { - "version": "0.165.0", - "resolved": "https://registry.npmjs.org/@types/three/-/three-0.165.0.tgz", - "integrity": "sha512-AJK8JZAFNBF0kBXiAIl5pggYlzAGGA8geVYQXAcPCEDRbyA+oEjkpUBcJJrtNz6IiALwzGexFJGZG2yV3WsYBw==", + "version": "0.171.0", + "resolved": "https://registry.npmjs.org/@types/three/-/three-0.171.0.tgz", + "integrity": "sha512-oLuT1SAsT+CUg/wxUTFHo0K3NtJLnx9sJhZWQJp/0uXqFpzSk1hRHmvWvpaAWSfvx2db0lVKZ5/wV0I0isD2mQ==", "dev": true, + "license": "MIT", "dependencies": { - "@tweenjs/tween.js": "~23.1.1", + "@tweenjs/tween.js": "~23.1.3", "@types/stats.js": "*", "@types/webxr": "*", + "@webgpu/types": "*", "fflate": "~0.8.2", "meshoptimizer": "~0.18.1" } @@ -6561,6 +6564,13 @@ "@xtuc/long": "4.2.2" } }, + "node_modules/@webgpu/types": { + "version": "0.1.51", + "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.51.tgz", + "integrity": "sha512-ktR3u64NPjwIViNCck+z9QeyN0iPkQCUOQ07ZCV1RzlkfP+olLTeEZ95O1QHS+v4w9vJeY9xj/uJuSphsHy5rQ==", + "dev": true, + "license": "BSD-3-Clause" + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -17484,9 +17494,10 @@ } }, "node_modules/three": { - "version": "0.165.0", - "resolved": "https://registry.npmjs.org/three/-/three-0.165.0.tgz", - "integrity": "sha512-cc96IlVYGydeceu0e5xq70H8/yoVT/tXBxV/W8A/U6uOq7DXc4/s1Mkmnu6SqoYGhSRWWYFOhVwvq6V0VtbplA==" + "version": "0.171.0", + "resolved": "https://registry.npmjs.org/three/-/three-0.171.0.tgz", + "integrity": "sha512-Y/lAXPaKZPcEdkKjh0JOAHVv8OOnv/NDJqm0wjfCzyQmfKxV7zvkwsnBgPBKTzJHToSOhRGQAGbPJObT59B/PQ==", + "license": "MIT" }, "node_modules/thunky": { "version": "1.1.0", @@ -22937,9 +22948,9 @@ } }, "@tweenjs/tween.js": { - "version": "23.1.1", - "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.1.tgz", - "integrity": "sha512-ZpboH7pCPPeyBWKf8c7TJswtCEQObFo3bOBYalm99NzZarATALYCo5OhbCa/n4RQyJyHfhkdx+hNrdL5ByFYDw==", + "version": "23.1.3", + "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.3.tgz", + "integrity": "sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==", "dev": true }, "@types/body-parser": { @@ -23204,14 +23215,15 @@ "dev": true }, "@types/three": { - "version": "0.165.0", - "resolved": "https://registry.npmjs.org/@types/three/-/three-0.165.0.tgz", - "integrity": "sha512-AJK8JZAFNBF0kBXiAIl5pggYlzAGGA8geVYQXAcPCEDRbyA+oEjkpUBcJJrtNz6IiALwzGexFJGZG2yV3WsYBw==", + "version": "0.171.0", + "resolved": "https://registry.npmjs.org/@types/three/-/three-0.171.0.tgz", + "integrity": "sha512-oLuT1SAsT+CUg/wxUTFHo0K3NtJLnx9sJhZWQJp/0uXqFpzSk1hRHmvWvpaAWSfvx2db0lVKZ5/wV0I0isD2mQ==", "dev": true, "requires": { - "@tweenjs/tween.js": "~23.1.1", + "@tweenjs/tween.js": "~23.1.3", "@types/stats.js": "*", "@types/webxr": "*", + "@webgpu/types": "*", "fflate": "~0.8.2", "meshoptimizer": "~0.18.1" } @@ -23778,6 +23790,12 @@ "@xtuc/long": "4.2.2" } }, + "@webgpu/types": { + "version": "0.1.51", + "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.51.tgz", + "integrity": "sha512-ktR3u64NPjwIViNCck+z9QeyN0iPkQCUOQ07ZCV1RzlkfP+olLTeEZ95O1QHS+v4w9vJeY9xj/uJuSphsHy5rQ==", + "dev": true + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -31637,9 +31655,9 @@ "requires": {} }, "three": { - "version": "0.165.0", - "resolved": "https://registry.npmjs.org/three/-/three-0.165.0.tgz", - "integrity": "sha512-cc96IlVYGydeceu0e5xq70H8/yoVT/tXBxV/W8A/U6uOq7DXc4/s1Mkmnu6SqoYGhSRWWYFOhVwvq6V0VtbplA==" + "version": "0.171.0", + "resolved": "https://registry.npmjs.org/three/-/three-0.171.0.tgz", + "integrity": "sha512-Y/lAXPaKZPcEdkKjh0JOAHVv8OOnv/NDJqm0wjfCzyQmfKxV7zvkwsnBgPBKTzJHToSOhRGQAGbPJObT59B/PQ==" }, "thunky": { "version": "1.1.0", diff --git a/package.json b/package.json index 2131a64..fa40a05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-three", - "version": "0.35.0", + "version": "0.36.0", "scripts": { "ng": "ng", "start": "ng serve", @@ -35,7 +35,7 @@ "normalize.css": "^8.0.1", "rxjs": "~7.8.1", "simplex-noise": "^4.0.1", - "three": "~0.165.0", + "three": "~0.171.0", "tslib": "^2.6.2", "zone.js": "~0.14.10" }, @@ -50,7 +50,7 @@ "@angular/compiler-cli": "^18.2.11", "@types/jasmine": "^4.3.5", "@types/node": "^20.5.3", - "@types/three": "^0.165.0", + "@types/three": "^0.171.0", "@typescript-eslint/eslint-plugin": "^7.2.0", "@typescript-eslint/parser": "^7.2.0", "acorn": ">=8", @@ -73,4 +73,4 @@ "typescript": "^5.4.5", "utility-types": "^3.10.0" } -} +} \ No newline at end of file diff --git a/projects/ngx-three-demo/src/app/animation-example/robot.component.ts b/projects/ngx-three-demo/src/app/animation-example/robot.component.ts index b07d382..39b602b 100644 --- a/projects/ngx-three-demo/src/app/animation-example/robot.component.ts +++ b/projects/ngx-three-demo/src/app/animation-example/robot.component.ts @@ -7,7 +7,7 @@ import { ASSET_PATH } from '../assets'; @Component({ selector: 'app-robot', templateUrl: './robot.component.html', - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class RobotComponent { public readonly assetPath = ASSET_PATH + 'RobotExpressive.glb'; diff --git a/projects/ngx-three/package.json b/projects/ngx-three/package.json index bdf2dfa..10befcb 100644 --- a/projects/ngx-three/package.json +++ b/projects/ngx-three/package.json @@ -20,7 +20,7 @@ "peerDependencies": { "@angular/common": "^18.2.11", "@angular/core": "^18.2.11", - "three": "~0.165.0" + "three": "~0.171.0" }, "dependencies": { "tslib": "^2.6.2" diff --git a/projects/ngx-three/src/lib/ThControlBase.ts b/projects/ngx-three/src/lib/ThControlBase.ts index d24112a..059b4c8 100644 --- a/projects/ngx-three/src/lib/ThControlBase.ts +++ b/projects/ngx-three/src/lib/ThControlBase.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, Component, inject, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, Input, OnDestroy } from '@angular/core'; import { Subscription } from 'rxjs'; -import { EventDispatcher } from 'three'; +import { Controls, EventDispatcher, Object3D } from 'three'; import { ThObject3D } from './generated/ThObject3D'; import { ThAnimationLoopService } from './renderer/th-animation-loop.service'; import { ThCanvas } from './ThCanvas'; @@ -11,11 +11,50 @@ import { ThWrapperBase } from './ThWrapperBase'; changeDetection: ChangeDetectionStrategy.OnPush, }) // eslint-disable-next-line @angular-eslint/component-class-suffix -export class ThControlBase extends ThWrapperBase implements OnDestroy { +export class ThControlBase< + TEventMap extends object = object, + T extends Controls = Controls, + TARGS = [], + > + extends ThWrapperBase + implements OnDestroy +{ protected origDispatchEventMethod?: EventDispatcher['dispatchEvent']; protected beforeRenderSubscription?: Subscription; protected renderLoop = inject(ThAnimationLoopService); + @Input() + public set domElement(value: HTMLElement) { + if (this._objRef) { + this._objRef.domElement = value; + } + } + + public get domElement(): HTMLElement | null | undefined { + return this._objRef?.domElement; + } + + @Input() + public set object(value: Object3D) { + if (this._objRef) { + this._objRef.object = value; + } + } + + public get object(): Object3D | undefined { + return this._objRef?.object; + } + @Input() + public set enabled(value: boolean) { + if (this._objRef) { + this._objRef.enabled = value; + } + } + + public get enabled(): boolean | undefined { + return this._objRef?.enabled; + } + constructor( protected _camera: ThObject3D, protected canvas?: ThCanvas, diff --git a/projects/ngx-three/src/lib/generated/ThAfterimagePass.ts b/projects/ngx-three/src/lib/generated/ThAfterimagePass.ts index 6c764c8..a3df1fd 100644 --- a/projects/ngx-three/src/lib/generated/ThAfterimagePass.ts +++ b/projects/ngx-three/src/lib/generated/ThAfterimagePass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThAmbientLight.ts b/projects/ngx-three/src/lib/generated/ThAmbientLight.ts index 986dd73..b0802a4 100644 --- a/projects/ngx-three/src/lib/generated/ThAmbientLight.ts +++ b/projects/ngx-three/src/lib/generated/ThAmbientLight.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { AmbientLight, ColorRepresentation } from 'three'; +import { AmbientLight } from 'three'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { ThLight } from './ThLight'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThAmbientLightProbe.ts b/projects/ngx-three/src/lib/generated/ThAmbientLightProbe.ts deleted file mode 100644 index fceb03b..0000000 --- a/projects/ngx-three/src/lib/generated/ThAmbientLightProbe.ts +++ /dev/null @@ -1,33 +0,0 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -/* eslint-disable no-underscore-dangle */ -/* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ -import { - ChangeDetectionStrategy, - Component, - Type, - forwardRef, -} from '@angular/core'; -import { AmbientLightProbe, ColorRepresentation } from 'three'; -import { ThLightProbe } from './ThLightProbe'; -import { ThObject3D } from './ThObject3D'; - -@Component({ - selector: 'th-ambientLightProbe', - template: '', - changeDetection: ChangeDetectionStrategy.OnPush, - providers: [ - { provide: ThObject3D, useExisting: forwardRef(() => ThAmbientLightProbe) }, - ], -}) -export class ThAmbientLightProbe< - T extends AmbientLightProbe = AmbientLightProbe, - TARGS = [color?: ColorRepresentation, intensity?: number], -> extends ThLightProbe { - public getType(): Type { - return AmbientLightProbe; - } - - public get isAmbientLightProbe(): true | undefined { - return this._objRef?.isAmbientLightProbe; - } -} diff --git a/projects/ngx-three/src/lib/generated/ThArcballControls.ts b/projects/ngx-three/src/lib/generated/ThArcballControls.ts index 12a1b2e..0f4ee27 100644 --- a/projects/ngx-three/src/lib/generated/ThArcballControls.ts +++ b/projects/ngx-three/src/lib/generated/ThArcballControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,10 +9,12 @@ import { Type, forwardRef, } from '@angular/core'; -import { Camera, Scene, Vector3 } from 'three'; -import { ArcballControls } from 'three/examples/jsm/controls/ArcballControls.js'; +import { Camera, Scene } from 'three'; +import { + ArcballControls, + ArcballControlsEventMap, +} from 'three/examples/jsm/controls/ArcballControls.js'; import { ThControlBase } from '../ThControlBase'; -import { applyValue } from '../util'; @Component({ selector: 'th-arcballControls', @@ -26,41 +29,35 @@ import { applyValue } from '../util'; }) export class ThArcballControls< T extends ArcballControls = ArcballControls, - TARGS = [camera: Camera, domElement: HTMLElement, scene?: Scene | null], -> extends ThControlBase { + TARGS = [ + camera: Camera, + domElement?: HTMLElement | null, + scene?: Scene | null, + ], +> extends ThControlBase { public getType(): Type { return ArcballControls; } @Input() - public set camera(value: Camera | null) { - if (this._objRef) { - this._objRef.camera = value; - } - } - - public get camera(): (Camera | null) | undefined { - return this._objRef?.camera; - } - @Input() - public set domElement(value: HTMLElement) { + public set scene(value: Scene | null) { if (this._objRef) { - this._objRef.domElement = value; + this._objRef.scene = value; } } - public get domElement(): HTMLElement | undefined { - return this._objRef?.domElement; + public get scene(): (Scene | null) | undefined { + return this._objRef?.scene; } @Input() - public set scene(value: Scene | null | undefined) { + public set radiusFactor(value: number) { if (this._objRef) { - this._objRef.scene = value; + this._objRef.radiusFactor = value; } } - public get scene(): (Scene | null | undefined) | undefined { - return this._objRef?.scene; + public get radiusFactor(): number | undefined { + return this._objRef?.radiusFactor; } @Input() public set focusAnimationTime(value: number) { @@ -73,56 +70,6 @@ export class ThArcballControls< return this._objRef?.focusAnimationTime; } @Input() - public set enabled(value: boolean) { - if (this._objRef) { - this._objRef.enabled = value; - } - } - - public get enabled(): boolean | undefined { - return this._objRef?.enabled; - } - @Input() - public set enablePan(value: boolean) { - if (this._objRef) { - this._objRef.enablePan = value; - } - } - - public get enablePan(): boolean | undefined { - return this._objRef?.enablePan; - } - @Input() - public set enableRotate(value: boolean) { - if (this._objRef) { - this._objRef.enableRotate = value; - } - } - - public get enableRotate(): boolean | undefined { - return this._objRef?.enableRotate; - } - @Input() - public set enableZoom(value: boolean) { - if (this._objRef) { - this._objRef.enableZoom = value; - } - } - - public get enableZoom(): boolean | undefined { - return this._objRef?.enableZoom; - } - @Input() - public set enableGizmos(value: boolean) { - if (this._objRef) { - this._objRef.enableGizmos = value; - } - } - - public get enableGizmos(): boolean | undefined { - return this._objRef?.enableGizmos; - } - @Input() public set adjustNearFar(value: boolean) { if (this._objRef) { this._objRef.adjustNearFar = value; @@ -173,6 +120,16 @@ export class ThArcballControls< return this._objRef?.enableAnimations; } @Input() + public set enableFocus(value: boolean) { + if (this._objRef) { + this._objRef.enableFocus = value; + } + } + + public get enableFocus(): boolean | undefined { + return this._objRef?.enableFocus; + } + @Input() public set enableGrid(value: boolean) { if (this._objRef) { this._objRef.enableGrid = value; @@ -193,24 +150,44 @@ export class ThArcballControls< return this._objRef?.cursorZoom; } @Input() - public set minFov(value: number) { + public set rotateSpeed(value: number) { if (this._objRef) { - this._objRef.minFov = value; + this._objRef.rotateSpeed = value; } } - public get minFov(): number | undefined { - return this._objRef?.minFov; + public get rotateSpeed(): number | undefined { + return this._objRef?.rotateSpeed; + } + @Input() + public set enablePan(value: boolean) { + if (this._objRef) { + this._objRef.enablePan = value; + } + } + + public get enablePan(): boolean | undefined { + return this._objRef?.enablePan; + } + @Input() + public set enableRotate(value: boolean) { + if (this._objRef) { + this._objRef.enableRotate = value; + } + } + + public get enableRotate(): boolean | undefined { + return this._objRef?.enableRotate; } @Input() - public set maxFov(value: number) { + public set enableZoom(value: boolean) { if (this._objRef) { - this._objRef.maxFov = value; + this._objRef.enableZoom = value; } } - public get maxFov(): number | undefined { - return this._objRef?.maxFov; + public get enableZoom(): boolean | undefined { + return this._objRef?.enableZoom; } @Input() public set minDistance(value: number) { @@ -252,33 +229,4 @@ export class ThArcballControls< public get maxZoom(): number | undefined { return this._objRef?.maxZoom; } - @Input() - public set target(value: Vector3 | [x: number, y: number, z: number]) { - if (this._objRef) { - this._objRef.target = applyValue(this._objRef.target, value); - } - } - public get target(): Vector3 | undefined { - return this._objRef?.target; - } - @Input() - public set radiusFactor(value: number) { - if (this._objRef) { - this._objRef.radiusFactor = value; - } - } - - public get radiusFactor(): number | undefined { - return this._objRef?.radiusFactor; - } - @Input() - public set rotateSpeed(value: number) { - if (this._objRef) { - this._objRef.rotateSpeed = value; - } - } - - public get rotateSpeed(): number | undefined { - return this._objRef?.rotateSpeed; - } } diff --git a/projects/ngx-three/src/lib/generated/ThArrayCamera.ts b/projects/ngx-three/src/lib/generated/ThArrayCamera.ts index 1c6b5c9..1471aee 100644 --- a/projects/ngx-three/src/lib/generated/ThArrayCamera.ts +++ b/projects/ngx-three/src/lib/generated/ThArrayCamera.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { ArrayCamera, PerspectiveCamera } from 'three'; +import { ArrayCamera } from 'three'; +import { PerspectiveCamera } from 'three/src/cameras/PerspectiveCamera.js'; import { ThCamera } from './ThCamera'; import { ThObject3D } from './ThObject3D'; import { ThPerspectiveCamera } from './ThPerspectiveCamera'; diff --git a/projects/ngx-three/src/lib/generated/ThArrowHelper.ts b/projects/ngx-three/src/lib/generated/ThArrowHelper.ts index 8e62353..44b4123 100644 --- a/projects/ngx-three/src/lib/generated/ThArrowHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThArrowHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,14 +9,11 @@ import { Type, forwardRef, } from '@angular/core'; -import { - ArrowHelper, - ColorRepresentation, - Line, - Mesh, - Object3DEventMap, - Vector3, -} from 'three'; +import { ArrowHelper, Object3DEventMap } from 'three'; +import { ColorRepresentation } from 'three/src/math/Color.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; +import { Line } from 'three/src/objects/Line.js'; +import { Mesh } from 'three/src/objects/Mesh.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThAudio.ts b/projects/ngx-three/src/lib/generated/ThAudio.ts index 7b5d3b8..e74d344 100644 --- a/projects/ngx-three/src/lib/generated/ThAudio.ts +++ b/projects/ngx-three/src/lib/generated/ThAudio.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,9 @@ import { Type, forwardRef, } from '@angular/core'; -import { Audio, AudioContext, AudioListener, Object3DEventMap } from 'three'; +import { Audio, Object3DEventMap } from 'three'; +import { AudioContext } from 'three/src/audio/AudioContext.js'; +import { AudioListener } from 'three/src/audio/AudioListener.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThAudioListener.ts b/projects/ngx-three/src/lib/generated/ThAudioListener.ts index a01acef..45cee2a 100644 --- a/projects/ngx-three/src/lib/generated/ThAudioListener.ts +++ b/projects/ngx-three/src/lib/generated/ThAudioListener.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { AudioContext, AudioListener, Object3DEventMap } from 'three'; +import { AudioListener, Object3DEventMap } from 'three'; +import { AudioContext } from 'three/src/audio/AudioContext.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThAxesHelper.ts b/projects/ngx-three/src/lib/generated/ThAxesHelper.ts index aca682b..9745e97 100644 --- a/projects/ngx-three/src/lib/generated/ThAxesHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThAxesHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThBatchedMesh.ts b/projects/ngx-three/src/lib/generated/ThBatchedMesh.ts index 1a21781..20e507f 100644 --- a/projects/ngx-three/src/lib/generated/ThBatchedMesh.ts +++ b/projects/ngx-three/src/lib/generated/ThBatchedMesh.ts @@ -1,8 +1,20 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ -import { ChangeDetectionStrategy, Component, Input, Type, forwardRef } from '@angular/core'; -import { BatchedMesh, Box3, BufferGeometry, Camera, Material, Object3DEventMap, Sphere, Vector3 } from 'three'; +import { + ChangeDetectionStrategy, + Component, + Input, + Type, + forwardRef, +} from '@angular/core'; +import { BatchedMesh, Box3, Object3DEventMap } from 'three'; +import { Camera } from 'three/src/cameras/Camera.js'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Material } from 'three/src/materials/Material.js'; +import { Sphere } from 'three/src/math/Sphere.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { applyValue } from '../util'; import { ThMesh } from './ThMesh'; import { ThObject3D } from './ThObject3D'; @@ -11,11 +23,18 @@ import { ThObject3D } from './ThObject3D'; selector: 'th-batchedMesh', template: '', changeDetection: ChangeDetectionStrategy.OnPush, - providers: [{ provide: ThObject3D, useExisting: forwardRef(() => ThBatchedMesh) }], + providers: [ + { provide: ThObject3D, useExisting: forwardRef(() => ThBatchedMesh) }, + ], }) export class ThBatchedMesh< T extends BatchedMesh = BatchedMesh, - TARGS = [maxGeometryCount: number, maxVertexCount: number, maxIndexCount?: number, material?: Material], + TARGS = [ + maxInstanceCount: number, + maxVertexCount: number, + maxIndexCount?: number, + material?: Material, + ], > extends ThMesh { public getType(): Type { return BatchedMesh; @@ -24,16 +43,24 @@ export class ThBatchedMesh< @Input() public set boundingBox(value: Box3 | null | [min: Vector3, max: Vector3]) { if (this._objRef) { - this._objRef.boundingBox = applyValue(this._objRef.boundingBox, value); + this._objRef.boundingBox = applyValue( + this._objRef.boundingBox, + value, + ); } } public get boundingBox(): (Box3 | null) | undefined { return this._objRef?.boundingBox; } @Input() - public set boundingSphere(value: Sphere | null | [center: Vector3, radius: number]) { + public set boundingSphere( + value: Sphere | null | [center: Vector3, radius: number], + ) { if (this._objRef) { - this._objRef.boundingSphere = applyValue(this._objRef.boundingSphere, value); + this._objRef.boundingSphere = applyValue( + this._objRef.boundingSphere, + value, + ); } } public get boundingSphere(): (Sphere | null) | undefined { @@ -41,7 +68,13 @@ export class ThBatchedMesh< } @Input() public set customSort( - value: ((this: any, list: Array<{ start: number; count: number; z: number }>, camera: Camera) => void) | null, + value: + | (( + this: T, + list: Array<{ start: number; count: number; z: number }>, + camera: Camera, + ) => void) + | null, ) { if (this._objRef) { this._objRef.customSort = value; @@ -49,7 +82,14 @@ export class ThBatchedMesh< } public get customSort(): - | (((this: any, list: Array<{ start: number; count: number; z: number }>, camera: Camera) => void) | null) + | ( + | (( + this: T, + list: Array<{ start: number; count: number; z: number }>, + camera: Camera, + ) => void) + | null + ) | undefined { return this._objRef?.customSort; } @@ -73,16 +113,18 @@ export class ThBatchedMesh< public get sortObjects(): boolean | undefined { return this._objRef?.sortObjects; } - public get maxGeometryCount(): number | undefined { - return this._objRef?.maxGeometryCount; + public get maxInstanceCount(): number | undefined { + return this._objRef?.maxInstanceCount; } - @Input() - public set isBatchedMesh(value: true) { - if (this._objRef) { - this._objRef.isBatchedMesh = value; - } + public get instanceCount(): number | undefined { + return this._objRef?.instanceCount; + } + public get unusedVertexCount(): number | undefined { + return this._objRef?.unusedVertexCount; + } + public get unusedIndexCount(): number | undefined { + return this._objRef?.unusedIndexCount; } - public get isBatchedMesh(): true | undefined { return this._objRef?.isBatchedMesh; } diff --git a/projects/ngx-three/src/lib/generated/ThBloomPass.ts b/projects/ngx-three/src/lib/generated/ThBloomPass.ts index 03f458b..4553b7a 100644 --- a/projects/ngx-three/src/lib/generated/ThBloomPass.ts +++ b/projects/ngx-three/src/lib/generated/ThBloomPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThBokehPass.ts b/projects/ngx-three/src/lib/generated/ThBokehPass.ts index 6f65c76..e7c540e 100644 --- a/projects/ngx-three/src/lib/generated/ThBokehPass.ts +++ b/projects/ngx-three/src/lib/generated/ThBokehPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThBone.ts b/projects/ngx-three/src/lib/generated/ThBone.ts index 4752a76..7285807 100644 --- a/projects/ngx-three/src/lib/generated/ThBone.ts +++ b/projects/ngx-three/src/lib/generated/ThBone.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { Bone, Object3DEventMap } from 'three'; +import { Bone } from 'three'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThBox3Helper.ts b/projects/ngx-three/src/lib/generated/ThBox3Helper.ts index 59ff910..9425dfa 100644 --- a/projects/ngx-three/src/lib/generated/ThBox3Helper.ts +++ b/projects/ngx-three/src/lib/generated/ThBox3Helper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -12,11 +13,11 @@ import { Box3, Box3Helper, BufferGeometry, - ColorRepresentation, Material, Object3DEventMap, - Vector3, } from 'three'; +import { ColorRepresentation } from 'three/src/math/Color.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { applyValue } from '../util'; import { ThLineSegments } from './ThLineSegments'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThBoxGeometry.ts b/projects/ngx-three/src/lib/generated/ThBoxGeometry.ts index ca05734..2483fe5 100644 --- a/projects/ngx-three/src/lib/generated/ThBoxGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThBoxGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThBoxHelper.ts b/projects/ngx-three/src/lib/generated/ThBoxHelper.ts index 5465f2c..4adb31c 100644 --- a/projects/ngx-three/src/lib/generated/ThBoxHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThBoxHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,14 +8,11 @@ import { Type, forwardRef, } from '@angular/core'; -import { - BoxHelper, - BufferGeometry, - ColorRepresentation, - LineBasicMaterial, - Object3D, - Object3DEventMap, -} from 'three'; +import { BoxHelper, Object3DEventMap } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Object3D } from 'three/src/core/Object3D.js'; +import { LineBasicMaterial } from 'three/src/materials/LineBasicMaterial.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { ThLineSegments } from './ThLineSegments'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThBoxLineGeometry.ts b/projects/ngx-three/src/lib/generated/ThBoxLineGeometry.ts index 9bcfb02..cb2ff69 100644 --- a/projects/ngx-three/src/lib/generated/ThBoxLineGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThBoxLineGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThBufferGeometry.ts b/projects/ngx-three/src/lib/generated/ThBufferGeometry.ts index 192f59b..dadc669 100644 --- a/projects/ngx-three/src/lib/generated/ThBufferGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThBufferGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -13,12 +14,13 @@ import { BufferAttribute, BufferGeometry, GeometryGroup, - InterleavedBufferAttribute, NormalBufferAttributes, NormalOrGLBufferAttributes, - Sphere, - Vector3, } from 'three'; +import { InterleavedBufferAttribute } from 'three/src/core/InterleavedBufferAttribute.js'; +import { Sphere } from 'three/src/math/Sphere.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; +import IndirectStorageBufferAttribute from 'three/src/renderers/common/IndirectStorageBufferAttribute.js'; import { ThGeometryBase } from '../ThGeometryBase'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; @@ -89,6 +91,23 @@ export class ThBufferGeometry< return this._objRef?.index; } @Input() + public set indirect( + value: + | IndirectStorageBufferAttribute + | null + | [value: ArrayLike | ArrayBufferView, offset?: number], + ) { + if (this._objRef) { + this._objRef.indirect = applyValue( + this._objRef.indirect, + value, + ); + } + } + public get indirect(): (IndirectStorageBufferAttribute | null) | undefined { + return this._objRef?.indirect; + } + @Input() public set attributes(value: Attributes) { if (this._objRef) { this._objRef.attributes = value; diff --git a/projects/ngx-three/src/lib/generated/ThCSS2DObjectGen.ts b/projects/ngx-three/src/lib/generated/ThCSS2DObjectGen.ts index 9443636..2c24bd9 100644 --- a/projects/ngx-three/src/lib/generated/ThCSS2DObjectGen.ts +++ b/projects/ngx-three/src/lib/generated/ThCSS2DObjectGen.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThCSS3DObjectGen.ts b/projects/ngx-three/src/lib/generated/ThCSS3DObjectGen.ts index 47c9a25..e73040a 100644 --- a/projects/ngx-three/src/lib/generated/ThCSS3DObjectGen.ts +++ b/projects/ngx-three/src/lib/generated/ThCSS3DObjectGen.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThCamera.ts b/projects/ngx-three/src/lib/generated/ThCamera.ts index ad76798..4460ebe 100644 --- a/projects/ngx-three/src/lib/generated/ThCamera.ts +++ b/projects/ngx-three/src/lib/generated/ThCamera.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,14 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { - Camera, - CoordinateSystem, - Layers, - Matrix4, - Object3DEventMap, - Vector4, -} from 'three'; +import { Camera, Layers, Matrix4, Object3DEventMap, Vector4 } from 'three'; +import { CoordinateSystem } from 'three/src/constants.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThCameraHelper.ts b/projects/ngx-three/src/lib/generated/ThCameraHelper.ts index 32f31cf..2cd0038 100644 --- a/projects/ngx-three/src/lib/generated/ThCameraHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThCameraHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -10,12 +11,12 @@ import { } from '@angular/core'; import { BufferGeometry, - Camera, CameraHelper, Material, Matrix4, Object3DEventMap, } from 'three'; +import { Camera } from 'three/src/cameras/Camera.js'; import { applyValue } from '../util'; import { ThLineSegments } from './ThLineSegments'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThCanvasTexture.ts b/projects/ngx-three/src/lib/generated/ThCanvasTexture.ts index fc4c517..4f16e6a 100644 --- a/projects/ngx-three/src/lib/generated/ThCanvasTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThCanvasTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,16 +8,16 @@ import { Type, forwardRef, } from '@angular/core'; +import { CanvasTexture } from 'three'; import { - CanvasTexture, MagnificationTextureFilter, Mapping, MinificationTextureFilter, - OffscreenCanvas, PixelFormat, TextureDataType, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; +import { OffscreenCanvas } from 'three/src/textures/Texture.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; diff --git a/projects/ngx-three/src/lib/generated/ThCapsuleGeometry.ts b/projects/ngx-three/src/lib/generated/ThCapsuleGeometry.ts index ed16cc0..009d35f 100644 --- a/projects/ngx-three/src/lib/generated/ThCapsuleGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThCapsuleGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThCircleGeometry.ts b/projects/ngx-three/src/lib/generated/ThCircleGeometry.ts index 63529cd..53085d6 100644 --- a/projects/ngx-three/src/lib/generated/ThCircleGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThCircleGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThClearMaskPass.ts b/projects/ngx-three/src/lib/generated/ThClearMaskPass.ts index eec9dcc..414dd8f 100644 --- a/projects/ngx-three/src/lib/generated/ThClearMaskPass.ts +++ b/projects/ngx-three/src/lib/generated/ThClearMaskPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThClearPass.ts b/projects/ngx-three/src/lib/generated/ThClearPass.ts index a5d7a71..3c2a4c7 100644 --- a/projects/ngx-three/src/lib/generated/ThClearPass.ts +++ b/projects/ngx-three/src/lib/generated/ThClearPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThCompressedArrayTexture.ts b/projects/ngx-three/src/lib/generated/ThCompressedArrayTexture.ts index 3a44241..08efa12 100644 --- a/projects/ngx-three/src/lib/generated/ThCompressedArrayTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThCompressedArrayTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,12 +9,13 @@ import { Type, forwardRef, } from '@angular/core'; +import { CompressedArrayTexture } from 'three'; import { - CompressedArrayTexture, CompressedPixelFormat, TextureDataType, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; +import { CompressedTextureMipmap } from 'three/src/textures/CompressedTexture.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThCompressedTexture } from './ThCompressedTexture'; @@ -31,7 +33,7 @@ import { ThCompressedTexture } from './ThCompressedTexture'; export class ThCompressedArrayTexture< T extends CompressedArrayTexture = CompressedArrayTexture, TARGS = [ - mipmaps: ImageData[], + mipmaps: CompressedTextureMipmap[], width: number, height: number, depth: number, diff --git a/projects/ngx-three/src/lib/generated/ThCompressedCubeTexture.ts b/projects/ngx-three/src/lib/generated/ThCompressedCubeTexture.ts index 87d88e5..8e50c35 100644 --- a/projects/ngx-three/src/lib/generated/ThCompressedCubeTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThCompressedCubeTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,11 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { - CompressedCubeTexture, - CompressedPixelFormat, - TextureDataType, -} from 'three'; +import { CompressedCubeTexture } from 'three'; +import { CompressedPixelFormat, TextureDataType } from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThCompressedTexture } from './ThCompressedTexture'; diff --git a/projects/ngx-three/src/lib/generated/ThCompressedTexture.ts b/projects/ngx-three/src/lib/generated/ThCompressedTexture.ts index 258e631..e82b700 100644 --- a/projects/ngx-three/src/lib/generated/ThCompressedTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThCompressedTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,16 +9,15 @@ import { Type, forwardRef, } from '@angular/core'; +import { CompressedTexture, CompressedTextureMipmap } from 'three'; import { - ColorSpace, CompressedPixelFormat, - CompressedTexture, MagnificationTextureFilter, Mapping, MinificationTextureFilter, TextureDataType, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; @@ -35,10 +35,10 @@ import { ThTexture } from './ThTexture'; export class ThCompressedTexture< T extends CompressedTexture = CompressedTexture, TARGS = [ - mipmaps: ImageData[], - width: number, - height: number, - format: CompressedPixelFormat, + mipmaps?: CompressedTextureMipmap[], + width?: number, + height?: number, + format?: CompressedPixelFormat, type?: TextureDataType, mapping?: Mapping, wrapS?: Wrapping, @@ -46,7 +46,7 @@ export class ThCompressedTexture< magFilter?: MagnificationTextureFilter, minFilter?: MinificationTextureFilter, anisotropy?: number, - colorSpace?: ColorSpace, + colorSpace?: string, ], > extends ThTexture { public getType(): Type { @@ -67,13 +67,13 @@ export class ThCompressedTexture< } @Input() - public set mipmaps(value: ImageData[]) { + public set mipmaps(value: CompressedTextureMipmap[] | undefined) { if (this._objRef) { this._objRef.mipmaps = value; } } - public get mipmaps(): ImageData[] | undefined { + public get mipmaps(): (CompressedTextureMipmap[] | undefined) | undefined { return this._objRef?.mipmaps; } @Input() diff --git a/projects/ngx-three/src/lib/generated/ThConeGeometry.ts b/projects/ngx-three/src/lib/generated/ThConeGeometry.ts index e1f0500..4e545ba 100644 --- a/projects/ngx-three/src/lib/generated/ThConeGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThConeGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThConvexGeometry.ts b/projects/ngx-three/src/lib/generated/ThConvexGeometry.ts index bcac208..947b083 100644 --- a/projects/ngx-three/src/lib/generated/ThConvexGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThConvexGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThCubeCamera.ts b/projects/ngx-three/src/lib/generated/ThCubeCamera.ts index e8989fc..acfc680 100644 --- a/projects/ngx-three/src/lib/generated/ThCubeCamera.ts +++ b/projects/ngx-three/src/lib/generated/ThCubeCamera.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,12 +9,9 @@ import { Type, forwardRef, } from '@angular/core'; -import { - CoordinateSystem, - CubeCamera, - Object3DEventMap, - WebGLCubeRenderTarget, -} from 'three'; +import { CubeCamera, Object3DEventMap } from 'three'; +import { CoordinateSystem } from 'three/src/constants.js'; +import { WebGLCubeRenderTarget } from 'three/src/renderers/WebGLCubeRenderTarget.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThCubeTexture.ts b/projects/ngx-three/src/lib/generated/ThCubeTexture.ts index 36a290a..b82b439 100644 --- a/projects/ngx-three/src/lib/generated/ThCubeTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThCubeTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,16 +9,15 @@ import { Type, forwardRef, } from '@angular/core'; +import { CubeTexture } from 'three'; import { - ColorSpace, - CubeTexture, CubeTextureMapping, MagnificationTextureFilter, MinificationTextureFilter, PixelFormat, TextureDataType, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; @@ -41,7 +41,7 @@ export class ThCubeTexture< format?: PixelFormat, type?: TextureDataType, anisotropy?: number, - colorSpace?: ColorSpace, + colorSpace?: string, ], > extends ThTexture { public getType(): Type { diff --git a/projects/ngx-three/src/lib/generated/ThCubeTexturePass.ts b/projects/ngx-three/src/lib/generated/ThCubeTexturePass.ts index 120a891..9771d5a 100644 --- a/projects/ngx-three/src/lib/generated/ThCubeTexturePass.ts +++ b/projects/ngx-three/src/lib/generated/ThCubeTexturePass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThCylinderGeometry.ts b/projects/ngx-three/src/lib/generated/ThCylinderGeometry.ts index c000912..cdeeff9 100644 --- a/projects/ngx-three/src/lib/generated/ThCylinderGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThCylinderGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThData3DTexture.ts b/projects/ngx-three/src/lib/generated/ThData3DTexture.ts index b481c5f..cff18c7 100644 --- a/projects/ngx-three/src/lib/generated/ThData3DTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThData3DTexture.ts @@ -1,21 +1,39 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ -import { ChangeDetectionStrategy, Component, Input, Type, forwardRef } from '@angular/core'; -import { Data3DTexture, MagnificationTextureFilter, MinificationTextureFilter, Wrapping } from 'three'; +import { + ChangeDetectionStrategy, + Component, + Input, + Type, + forwardRef, +} from '@angular/core'; +import { Data3DTexture, Texture3DImageData } from 'three'; +import { + MagnificationTextureFilter, + MinificationTextureFilter, + Wrapping, +} from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; -import { Texture3DImageData } from 'three/src/textures/types'; @Component({ selector: 'th-data3DTexture', template: '', changeDetection: ChangeDetectionStrategy.OnPush, - providers: [{ provide: ThTextureBase, useExisting: forwardRef(() => ThData3DTexture) }], + providers: [ + { provide: ThTextureBase, useExisting: forwardRef(() => ThData3DTexture) }, + ], }) export class ThData3DTexture< T extends Data3DTexture = Data3DTexture, - TARGS = [data?: BufferSource | null, width?: number, height?: number, depth?: number], + TARGS = [ + data?: BufferSource | null, + width?: number, + height?: number, + depth?: number, + ], > extends ThTexture { public getType(): Type { return Data3DTexture; diff --git a/projects/ngx-three/src/lib/generated/ThDataArrayTexture.ts b/projects/ngx-three/src/lib/generated/ThDataArrayTexture.ts index 56d9133..7204cbf 100644 --- a/projects/ngx-three/src/lib/generated/ThDataArrayTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThDataArrayTexture.ts @@ -1,11 +1,22 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ -import { ChangeDetectionStrategy, Component, Input, Type, forwardRef } from '@angular/core'; -import { DataArrayTexture, MagnificationTextureFilter, MinificationTextureFilter } from 'three'; +import { + ChangeDetectionStrategy, + Component, + Input, + Type, + forwardRef, +} from '@angular/core'; +import { DataArrayTexture } from 'three'; +import { + MagnificationTextureFilter, + MinificationTextureFilter, +} from 'three/src/constants.js'; +import { Texture3DImageData } from 'three/src/textures/Data3DTexture.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; -import { Texture3DImageData } from 'three/src/textures/types'; @Component({ selector: 'th-dataArrayTexture', @@ -20,7 +31,12 @@ import { Texture3DImageData } from 'three/src/textures/types'; }) export class ThDataArrayTexture< T extends DataArrayTexture = DataArrayTexture, - TARGS = [data?: BufferSource | null, width?: number, height?: number, depth?: number], + TARGS = [ + data?: BufferSource | null, + width?: number, + height?: number, + depth?: number, + ], > extends ThTexture { public getType(): Type { return DataArrayTexture; diff --git a/projects/ngx-three/src/lib/generated/ThDataTexture.ts b/projects/ngx-three/src/lib/generated/ThDataTexture.ts index 26b4a4a..15aa9e7 100644 --- a/projects/ngx-three/src/lib/generated/ThDataTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThDataTexture.ts @@ -1,26 +1,33 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ -import { ChangeDetectionStrategy, Component, Input, Type, forwardRef } from '@angular/core'; import { - ColorSpace, - DataTexture, + ChangeDetectionStrategy, + Component, + Input, + Type, + forwardRef, +} from '@angular/core'; +import { DataTexture, TextureImageData } from 'three'; +import { MagnificationTextureFilter, Mapping, MinificationTextureFilter, PixelFormat, TextureDataType, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; -import { TextureImageData } from 'three/src/textures/types'; @Component({ selector: 'th-dataTexture', template: '', changeDetection: ChangeDetectionStrategy.OnPush, - providers: [{ provide: ThTextureBase, useExisting: forwardRef(() => ThDataTexture) }], + providers: [ + { provide: ThTextureBase, useExisting: forwardRef(() => ThDataTexture) }, + ], }) export class ThDataTexture< T extends DataTexture = DataTexture, @@ -36,7 +43,7 @@ export class ThDataTexture< magFilter?: MagnificationTextureFilter, minFilter?: MinificationTextureFilter, anisotropy?: number, - colorSpace?: ColorSpace, + colorSpace?: string, ], > extends ThTexture { public getType(): Type { diff --git a/projects/ngx-three/src/lib/generated/ThDecalGeometry.ts b/projects/ngx-three/src/lib/generated/ThDecalGeometry.ts index cb66357..c8287a2 100644 --- a/projects/ngx-three/src/lib/generated/ThDecalGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThDecalGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -24,7 +25,12 @@ import { ThBufferGeometry } from './ThBufferGeometry'; }) export class ThDecalGeometry< T extends DecalGeometry = DecalGeometry, - TARGS = [mesh: Mesh, position: Vector3, orientation: Euler, size: Vector3], + TARGS = [ + mesh?: Mesh, + position?: Vector3, + orientation?: Euler, + size?: Vector3, + ], > extends ThBufferGeometry { public getType(): Type { return DecalGeometry; diff --git a/projects/ngx-three/src/lib/generated/ThDepthTexture.ts b/projects/ngx-three/src/lib/generated/ThDepthTexture.ts index 8c1b588..01e2b17 100644 --- a/projects/ngx-three/src/lib/generated/ThDepthTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThDepthTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,8 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; +import { DepthTexture } from 'three'; import { - DepthTexture, DepthTexturePixelFormat, MagnificationTextureFilter, Mapping, @@ -17,7 +18,7 @@ import { TextureComparisonFunction, TextureDataType, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; diff --git a/projects/ngx-three/src/lib/generated/ThDirectionalLight.ts b/projects/ngx-three/src/lib/generated/ThDirectionalLight.ts index 47e54ae..cc27820 100644 --- a/projects/ngx-three/src/lib/generated/ThDirectionalLight.ts +++ b/projects/ngx-three/src/lib/generated/ThDirectionalLight.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,13 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - ColorRepresentation, - DirectionalLight, - DirectionalLightShadow, - Object3D, - Vector3, -} from 'three'; +import { DirectionalLight, Vector3 } from 'three'; +import { Object3D } from 'three/src/core/Object3D.js'; +import { DirectionalLightShadow } from 'three/src/lights/DirectionalLightShadow.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { applyValue } from '../util'; import { ThLight } from './ThLight'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThDirectionalLightHelper.ts b/projects/ngx-three/src/lib/generated/ThDirectionalLightHelper.ts index 56862c3..a4c31ee 100644 --- a/projects/ngx-three/src/lib/generated/ThDirectionalLightHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThDirectionalLightHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,14 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - ColorRepresentation, - DirectionalLight, - DirectionalLightHelper, - Line, - Matrix4, - Object3DEventMap, -} from 'three'; +import { DirectionalLightHelper, Matrix4, Object3DEventMap } from 'three'; +import { DirectionalLight } from 'three/src/lights/DirectionalLight.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; +import { Line } from 'three/src/objects/Line.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThDodecahedronGeometry.ts b/projects/ngx-three/src/lib/generated/ThDodecahedronGeometry.ts index 15762f6..1f147a8 100644 --- a/projects/ngx-three/src/lib/generated/ThDodecahedronGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThDodecahedronGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThDotScreenPass.ts b/projects/ngx-three/src/lib/generated/ThDotScreenPass.ts index ef17e25..8098a20 100644 --- a/projects/ngx-three/src/lib/generated/ThDotScreenPass.ts +++ b/projects/ngx-three/src/lib/generated/ThDotScreenPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThDragControls.ts b/projects/ngx-three/src/lib/generated/ThDragControls.ts index ae667e7..c7ee9d7 100644 --- a/projects/ngx-three/src/lib/generated/ThDragControls.ts +++ b/projects/ngx-three/src/lib/generated/ThDragControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,12 +9,16 @@ import { Type, forwardRef, } from '@angular/core'; -import { Camera, Object3D, Raycaster } from 'three'; +import { MOUSE, Raycaster, TOUCH } from 'three'; import { DragControls, - DragControlsMode, + DragControlsEventMap, } from 'three/examples/jsm/controls/DragControls.js'; +import { Camera } from 'three/src/cameras/Camera.js'; +import { Object3D } from 'three/src/core/Object3D.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { ThControlBase } from '../ThControlBase'; +import { applyValue } from '../util'; @Component({ selector: 'th-dragControls', @@ -25,21 +30,25 @@ import { ThControlBase } from '../ThControlBase'; }) export class ThDragControls< T extends DragControls = DragControls, - TARGS = [objects: Object3D[], camera: Camera, domElement?: HTMLElement], -> extends ThControlBase { + TARGS = [ + objects: Object3D[], + camera: Camera, + domElement?: HTMLElement | null, + ], +> extends ThControlBase { public getType(): Type { return DragControls; } @Input() - public set enabled(value: boolean) { + public set objects(value: Object3D[]) { if (this._objRef) { - this._objRef.enabled = value; + this._objRef.objects = value; } } - public get enabled(): boolean | undefined { - return this._objRef?.enabled; + public get objects(): Object3D[] | undefined { + return this._objRef?.objects; } @Input() public set recursive(value: boolean) { @@ -62,16 +71,6 @@ export class ThDragControls< return this._objRef?.transformGroup; } @Input() - public set mode(value: DragControlsMode) { - if (this._objRef) { - this._objRef.mode = value; - } - } - - public get mode(): DragControlsMode | undefined { - return this._objRef?.mode; - } - @Input() public set rotateSpeed(value: number) { if (this._objRef) { this._objRef.rotateSpeed = value; @@ -82,65 +81,47 @@ export class ThDragControls< return this._objRef?.rotateSpeed; } @Input() - public set activate(value: () => void) { - if (this._objRef) { - this._objRef.activate = value; - } - } - - public get activate(): (() => void) | undefined { - return this._objRef?.activate; - } - @Input() - public set deactivate(value: () => void) { - if (this._objRef) { - this._objRef.deactivate = value; - } - } - - public get deactivate(): (() => void) | undefined { - return this._objRef?.deactivate; - } - @Input() - public set dispose(value: () => void) { - if (this._objRef) { - this._objRef.dispose = value; - } - } - - public get dispose(): (() => void) | undefined { - return this._objRef?.dispose; - } - @Input() - public set getObjects(value: () => Object3D[]) { + public set raycaster( + value: Raycaster | [origin: Vector3, direction: Vector3], + ) { if (this._objRef) { - this._objRef.getObjects = value; + this._objRef.raycaster = applyValue( + this._objRef.raycaster, + value, + ); } } - - public get getObjects(): (() => Object3D[]) | undefined { - return this._objRef?.getObjects; + public get raycaster(): Raycaster | undefined { + return this._objRef?.raycaster; } @Input() - public set getRaycaster(value: () => Raycaster) { + public set mouseButtons(value: { + LEFT?: MOUSE | null | undefined; + MIDDLE?: MOUSE | null | undefined; + RIGHT?: MOUSE | null | undefined; + }) { if (this._objRef) { - this._objRef.getRaycaster = value; + this._objRef.mouseButtons = value; } } - public get getRaycaster(): (() => Raycaster) | undefined { - return this._objRef?.getRaycaster; + public get mouseButtons(): + | { + LEFT?: MOUSE | null | undefined; + MIDDLE?: MOUSE | null | undefined; + RIGHT?: MOUSE | null | undefined; + } + | undefined { + return this._objRef?.mouseButtons; } @Input() - public set setObjects(value: (objects: readonly Object3D[]) => void) { + public set touches(value: { ONE?: TOUCH | null | undefined }) { if (this._objRef) { - this._objRef.setObjects = value; + this._objRef.touches = value; } } - public get setObjects(): - | ((objects: readonly Object3D[]) => void) - | undefined { - return this._objRef?.setObjects; + public get touches(): { ONE?: TOUCH | null | undefined } | undefined { + return this._objRef?.touches; } } diff --git a/projects/ngx-three/src/lib/generated/ThEdgesGeometry.ts b/projects/ngx-three/src/lib/generated/ThEdgesGeometry.ts index b444967..f6376e5 100644 --- a/projects/ngx-three/src/lib/generated/ThEdgesGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThEdgesGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { BufferGeometry, EdgesGeometry, NormalBufferAttributes } from 'three'; +import { EdgesGeometry, NormalBufferAttributes } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; import { ThBufferGeometry } from './ThBufferGeometry'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThEffectComposerGen.ts b/projects/ngx-three/src/lib/generated/ThEffectComposerGen.ts index 8ff6c73..4ac9b30 100644 --- a/projects/ngx-three/src/lib/generated/ThEffectComposerGen.ts +++ b/projects/ngx-three/src/lib/generated/ThEffectComposerGen.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThExtrudeGeometry.ts b/projects/ngx-three/src/lib/generated/ThExtrudeGeometry.ts index def4084..b29c29e 100644 --- a/projects/ngx-three/src/lib/generated/ThExtrudeGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThExtrudeGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -11,8 +12,8 @@ import { ExtrudeGeometry, ExtrudeGeometryOptions, NormalBufferAttributes, - Shape, } from 'three'; +import { Shape } from 'three/src/extras/core/Shape.js'; import { ThBufferGeometry } from './ThBufferGeometry'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThFilmPass.ts b/projects/ngx-three/src/lib/generated/ThFilmPass.ts index 154434c..9c55fe5 100644 --- a/projects/ngx-three/src/lib/generated/ThFilmPass.ts +++ b/projects/ngx-three/src/lib/generated/ThFilmPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThFirstPersonControls.ts b/projects/ngx-three/src/lib/generated/ThFirstPersonControls.ts index f156a8d..7f48cc3 100644 --- a/projects/ngx-three/src/lib/generated/ThFirstPersonControls.ts +++ b/projects/ngx-three/src/lib/generated/ThFirstPersonControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -26,41 +27,11 @@ import { ThControlBase } from '../ThControlBase'; export class ThFirstPersonControls< T extends FirstPersonControls = FirstPersonControls, TARGS = [object: Camera, domElement?: HTMLElement], -> extends ThControlBase { +> extends ThControlBase<{}, T, TARGS> { public getType(): Type { return FirstPersonControls; } - @Input() - public set object(value: Camera) { - if (this._objRef) { - this._objRef.object = value; - } - } - - public get object(): Camera | undefined { - return this._objRef?.object; - } - @Input() - public set domElement(value: HTMLElement | Document) { - if (this._objRef) { - this._objRef.domElement = value; - } - } - - public get domElement(): (HTMLElement | Document) | undefined { - return this._objRef?.domElement; - } - @Input() - public set enabled(value: boolean) { - if (this._objRef) { - this._objRef.enabled = value; - } - } - - public get enabled(): boolean | undefined { - return this._objRef?.enabled; - } @Input() public set movementSpeed(value: number) { if (this._objRef) { diff --git a/projects/ngx-three/src/lib/generated/ThFlyControls.ts b/projects/ngx-three/src/lib/generated/ThFlyControls.ts index 74953cb..9de04f4 100644 --- a/projects/ngx-three/src/lib/generated/ThFlyControls.ts +++ b/projects/ngx-three/src/lib/generated/ThFlyControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -9,7 +10,10 @@ import { forwardRef, } from '@angular/core'; import { Camera } from 'three'; -import { FlyControls } from 'three/examples/jsm/controls/FlyControls.js'; +import { + FlyControls, + FlyControlsEventMap, +} from 'three/examples/jsm/controls/FlyControls.js'; import { ThControlBase } from '../ThControlBase'; @Component({ @@ -22,31 +26,31 @@ import { ThControlBase } from '../ThControlBase'; }) export class ThFlyControls< T extends FlyControls = FlyControls, - TARGS = [object: Camera, domElement?: HTMLElement], -> extends ThControlBase { + TARGS = [object: Camera, domElement?: HTMLElement | null], +> extends ThControlBase { public getType(): Type { return FlyControls; } @Input() - public set autoForward(value: boolean) { + public set movementSpeed(value: number) { if (this._objRef) { - this._objRef.autoForward = value; + this._objRef.movementSpeed = value; } } - public get autoForward(): boolean | undefined { - return this._objRef?.autoForward; + public get movementSpeed(): number | undefined { + return this._objRef?.movementSpeed; } @Input() - public set domElement(value: HTMLElement | Document) { + public set rollSpeed(value: number) { if (this._objRef) { - this._objRef.domElement = value; + this._objRef.rollSpeed = value; } } - public get domElement(): (HTMLElement | Document) | undefined { - return this._objRef?.domElement; + public get rollSpeed(): number | undefined { + return this._objRef?.rollSpeed; } @Input() public set dragToLook(value: boolean) { @@ -59,43 +63,13 @@ export class ThFlyControls< return this._objRef?.dragToLook; } @Input() - public set enabled(value: boolean) { - if (this._objRef) { - this._objRef.enabled = value; - } - } - - public get enabled(): boolean | undefined { - return this._objRef?.enabled; - } - @Input() - public set movementSpeed(value: number) { - if (this._objRef) { - this._objRef.movementSpeed = value; - } - } - - public get movementSpeed(): number | undefined { - return this._objRef?.movementSpeed; - } - @Input() - public set object(value: Camera) { - if (this._objRef) { - this._objRef.object = value; - } - } - - public get object(): Camera | undefined { - return this._objRef?.object; - } - @Input() - public set rollSpeed(value: number) { + public set autoForward(value: boolean) { if (this._objRef) { - this._objRef.rollSpeed = value; + this._objRef.autoForward = value; } } - public get rollSpeed(): number | undefined { - return this._objRef?.rollSpeed; + public get autoForward(): boolean | undefined { + return this._objRef?.autoForward; } } diff --git a/projects/ngx-three/src/lib/generated/ThFramebufferTexture.ts b/projects/ngx-three/src/lib/generated/ThFramebufferTexture.ts index b040261..1a2a22a 100644 --- a/projects/ngx-three/src/lib/generated/ThFramebufferTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThFramebufferTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,11 +9,11 @@ import { Type, forwardRef, } from '@angular/core'; +import { FramebufferTexture } from 'three'; import { - FramebufferTexture, MagnificationTextureFilter, MinificationTextureFilter, -} from 'three'; +} from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; diff --git a/projects/ngx-three/src/lib/generated/ThGlitchPass.ts b/projects/ngx-three/src/lib/generated/ThGlitchPass.ts index 84345a5..d3fab34 100644 --- a/projects/ngx-three/src/lib/generated/ThGlitchPass.ts +++ b/projects/ngx-three/src/lib/generated/ThGlitchPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThGridHelper.ts b/projects/ngx-three/src/lib/generated/ThGridHelper.ts index 21b2019..b64d027 100644 --- a/projects/ngx-three/src/lib/generated/ThGridHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThGridHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,13 +8,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - BufferGeometry, - ColorRepresentation, - GridHelper, - LineBasicMaterial, - Object3DEventMap, -} from 'three'; +import { GridHelper, Object3DEventMap } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { LineBasicMaterial } from 'three/src/materials/LineBasicMaterial.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { ThLineSegments } from './ThLineSegments'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThGroup.ts b/projects/ngx-three/src/lib/generated/ThGroup.ts index 040d20a..caeca49 100644 --- a/projects/ngx-three/src/lib/generated/ThGroup.ts +++ b/projects/ngx-three/src/lib/generated/ThGroup.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { Group, Object3DEventMap } from 'three'; +import { Group } from 'three'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; import { ThObject3D } from './ThObject3D'; @Component({ @@ -28,7 +30,4 @@ export class ThGroup< public get isGroup(): true | undefined { return this._objRef?.isGroup; } - public get type(): (string | 'Group') | undefined { - return this._objRef?.type; - } } diff --git a/projects/ngx-three/src/lib/generated/ThHalftonePass.ts b/projects/ngx-three/src/lib/generated/ThHalftonePass.ts index b460403..eb90524 100644 --- a/projects/ngx-three/src/lib/generated/ThHalftonePass.ts +++ b/projects/ngx-three/src/lib/generated/ThHalftonePass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThHemisphereLight.ts b/projects/ngx-three/src/lib/generated/ThHemisphereLight.ts index 9c464d5..eecfb1e 100644 --- a/projects/ngx-three/src/lib/generated/ThHemisphereLight.ts +++ b/projects/ngx-three/src/lib/generated/ThHemisphereLight.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThHemisphereLightHelper.ts b/projects/ngx-three/src/lib/generated/ThHemisphereLightHelper.ts index 99ea8c2..4956da4 100644 --- a/projects/ngx-three/src/lib/generated/ThHemisphereLightHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThHemisphereLightHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,14 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - ColorRepresentation, - HemisphereLight, - HemisphereLightHelper, - Matrix4, - MeshBasicMaterial, - Object3DEventMap, -} from 'three'; +import { HemisphereLightHelper, Matrix4, Object3DEventMap } from 'three'; +import { HemisphereLight } from 'three/src/lights/HemisphereLight.js'; +import { MeshBasicMaterial } from 'three/src/materials/MeshBasicMaterial.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThHemisphereLightProbe.ts b/projects/ngx-three/src/lib/generated/ThHemisphereLightProbe.ts deleted file mode 100644 index ee8d0d1..0000000 --- a/projects/ngx-three/src/lib/generated/ThHemisphereLightProbe.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -/* eslint-disable no-underscore-dangle */ -/* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ -import { - ChangeDetectionStrategy, - Component, - Type, - forwardRef, -} from '@angular/core'; -import { ColorRepresentation, HemisphereLightProbe } from 'three'; -import { ThLightProbe } from './ThLightProbe'; -import { ThObject3D } from './ThObject3D'; - -@Component({ - selector: 'th-hemisphereLightProbe', - template: '', - changeDetection: ChangeDetectionStrategy.OnPush, - providers: [ - { - provide: ThObject3D, - useExisting: forwardRef(() => ThHemisphereLightProbe), - }, - ], -}) -export class ThHemisphereLightProbe< - T extends HemisphereLightProbe = HemisphereLightProbe, - TARGS = [ - skyColor?: ColorRepresentation, - groundColor?: ColorRepresentation, - intensity?: number, - ], -> extends ThLightProbe { - public getType(): Type { - return HemisphereLightProbe; - } - - public get isHemisphereLightProbe(): true | undefined { - return this._objRef?.isHemisphereLightProbe; - } -} diff --git a/projects/ngx-three/src/lib/generated/ThIcosahedronGeometry.ts b/projects/ngx-three/src/lib/generated/ThIcosahedronGeometry.ts index 161e6ea..2414c9b 100644 --- a/projects/ngx-three/src/lib/generated/ThIcosahedronGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThIcosahedronGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThInstancedBufferGeometry.ts b/projects/ngx-three/src/lib/generated/ThInstancedBufferGeometry.ts index c0ec219..7122307 100644 --- a/projects/ngx-three/src/lib/generated/ThInstancedBufferGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThInstancedBufferGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThInstancedMesh.ts b/projects/ngx-three/src/lib/generated/ThInstancedMesh.ts index 0918bca..11382c2 100644 --- a/projects/ngx-three/src/lib/generated/ThInstancedMesh.ts +++ b/projects/ngx-three/src/lib/generated/ThInstancedMesh.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,17 +9,13 @@ import { Type, forwardRef, } from '@angular/core'; -import { - Box3, - BufferGeometry, - DataTexture, - InstancedBufferAttribute, - InstancedMesh, - InstancedMeshEventMap, - Material, - Sphere, - Vector3, -} from 'three'; +import { Box3, InstancedMesh, InstancedMeshEventMap } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { InstancedBufferAttribute } from 'three/src/core/InstancedBufferAttribute.js'; +import { Material } from 'three/src/materials/Material.js'; +import { Sphere } from 'three/src/math/Sphere.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; +import { DataTexture } from 'three/src/textures/DataTexture.js'; import { applyValue } from '../util'; import { ThMesh } from './ThMesh'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThLOD.ts b/projects/ngx-three/src/lib/generated/ThLOD.ts index 084c1dc..dbf39b5 100644 --- a/projects/ngx-three/src/lib/generated/ThLOD.ts +++ b/projects/ngx-three/src/lib/generated/ThLOD.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { LOD, Object3D, Object3DEventMap } from 'three'; +import { LOD } from 'three'; +import { Object3D, Object3DEventMap } from 'three/src/core/Object3D.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThLUTPass.ts b/projects/ngx-three/src/lib/generated/ThLUTPass.ts index 2e459e2..aa05d1e 100644 --- a/projects/ngx-three/src/lib/generated/ThLUTPass.ts +++ b/projects/ngx-three/src/lib/generated/ThLUTPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThLatheGeometry.ts b/projects/ngx-three/src/lib/generated/ThLatheGeometry.ts index 182d756..3c0a354 100644 --- a/projects/ngx-three/src/lib/generated/ThLatheGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThLatheGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { LatheGeometry, NormalBufferAttributes, Vector2 } from 'three'; +import { LatheGeometry, NormalBufferAttributes } from 'three'; +import { Vector2 } from 'three/src/math/Vector2.js'; import { ThBufferGeometry } from './ThBufferGeometry'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThLight.ts b/projects/ngx-three/src/lib/generated/ThLight.ts index 17cc6d5..33a6ef9 100644 --- a/projects/ngx-three/src/lib/generated/ThLight.ts +++ b/projects/ngx-three/src/lib/generated/ThLight.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,13 +8,8 @@ import { Input, forwardRef, } from '@angular/core'; -import { - Color, - ColorRepresentation, - Light, - LightShadow, - Object3DEventMap, -} from 'three'; +import { Color, ColorRepresentation, Light, Object3DEventMap } from 'three'; +import { LightShadow } from 'three/src/lights/LightShadow.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThLightProbe.ts b/projects/ngx-three/src/lib/generated/ThLightProbe.ts index 804556e..c33356e 100644 --- a/projects/ngx-three/src/lib/generated/ThLightProbe.ts +++ b/projects/ngx-three/src/lib/generated/ThLightProbe.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { LightProbe, LightShadow, SphericalHarmonics3, Vector3 } from 'three'; +import { LightProbe, LightShadow, SphericalHarmonics3 } from 'three'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { applyValue } from '../util'; import { ThLight } from './ThLight'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThLine.ts b/projects/ngx-three/src/lib/generated/ThLine.ts index b94622b..a7478f0 100644 --- a/projects/ngx-three/src/lib/generated/ThLine.ts +++ b/projects/ngx-three/src/lib/generated/ThLine.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { BufferGeometry, Line, Material, Object3DEventMap } from 'three'; +import { Line } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; +import { Material } from 'three/src/materials/Material.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThLineBasicMaterial.ts b/projects/ngx-three/src/lib/generated/ThLineBasicMaterial.ts index 88d1b71..a06c8d7 100644 --- a/projects/ngx-three/src/lib/generated/ThLineBasicMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThLineBasicMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -13,8 +14,8 @@ import { ColorRepresentation, LineBasicMaterial, LineBasicMaterialParameters, - Texture, } from 'three'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -38,16 +39,6 @@ export class ThLineBasicMaterial< return this._objRef?.isLineBasicMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set color( value: | Color diff --git a/projects/ngx-three/src/lib/generated/ThLineDashedMaterial.ts b/projects/ngx-three/src/lib/generated/ThLineDashedMaterial.ts index da7e610..5ced4cc 100644 --- a/projects/ngx-three/src/lib/generated/ThLineDashedMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThLineDashedMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -35,16 +36,6 @@ export class ThLineDashedMaterial< return this._objRef?.isLineDashedMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set scale(value: number) { if (this._objRef) { this._objRef.scale = value; diff --git a/projects/ngx-three/src/lib/generated/ThLineLoop.ts b/projects/ngx-three/src/lib/generated/ThLineLoop.ts index 96de574..2b49396 100644 --- a/projects/ngx-three/src/lib/generated/ThLineLoop.ts +++ b/projects/ngx-three/src/lib/generated/ThLineLoop.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { BufferGeometry, LineLoop, Material, Object3DEventMap } from 'three'; +import { LineLoop } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; +import { Material } from 'three/src/materials/Material.js'; import { ThLine } from './ThLine'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThLineSegments.ts b/projects/ngx-three/src/lib/generated/ThLineSegments.ts index 39fdb41..139a837 100644 --- a/projects/ngx-three/src/lib/generated/ThLineSegments.ts +++ b/projects/ngx-three/src/lib/generated/ThLineSegments.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,12 +8,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - BufferGeometry, - LineSegments, - Material, - Object3DEventMap, -} from 'three'; +import { LineSegments } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; +import { Material } from 'three/src/materials/Material.js'; import { ThLine } from './ThLine'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThMapControls.ts b/projects/ngx-three/src/lib/generated/ThMapControls.ts index 0054ded..31ece4a 100644 --- a/projects/ngx-three/src/lib/generated/ThMapControls.ts +++ b/projects/ngx-three/src/lib/generated/ThMapControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThMaskPass.ts b/projects/ngx-three/src/lib/generated/ThMaskPass.ts index 234544a..2dd883c 100644 --- a/projects/ngx-three/src/lib/generated/ThMaskPass.ts +++ b/projects/ngx-three/src/lib/generated/ThMaskPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThMaterial.ts b/projects/ngx-three/src/lib/generated/ThMaterial.ts index 3946fc4..a6ab326 100644 --- a/projects/ngx-three/src/lib/generated/ThMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,20 +9,18 @@ import { SkipSelf, Type, } from '@angular/core'; +import { Color, ColorRepresentation, Material } from 'three'; import { Blending, BlendingDstFactor, BlendingEquation, BlendingSrcFactor, - Color, - ColorRepresentation, DepthModes, - Material, - Plane, Side, StencilFunc, StencilOp, -} from 'three'; +} from 'three/src/constants.js'; +import { Plane } from 'three/src/math/Plane.js'; import { ThMaterialBase } from '../ThMaterialBase'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; @@ -44,6 +43,16 @@ export class ThMaterial< return this._objRef?.isMaterial; } @Input() + public set type(value: string) { + if (this._objRef) { + this._objRef.type = value; + } + } + + public get type(): string | undefined { + return this._objRef?.type; + } + @Input() public set alphaHash(value: boolean) { if (this._objRef) { this._objRef.alphaHash = value; @@ -464,16 +473,6 @@ export class ThMaterial< return this._objRef?.transparent; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set uuid(value: string) { if (this._objRef) { this._objRef.uuid = value; diff --git a/projects/ngx-three/src/lib/generated/ThMesh.ts b/projects/ngx-three/src/lib/generated/ThMesh.ts index b958689..cf6be3f 100644 --- a/projects/ngx-three/src/lib/generated/ThMesh.ts +++ b/projects/ngx-three/src/lib/generated/ThMesh.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { BufferGeometry, Material, Mesh, Object3DEventMap } from 'three'; +import { Mesh } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; +import { Material } from 'three/src/materials/Material.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThMeshBasicMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshBasicMaterial.ts index 643cc56..dd2bc8a 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshBasicMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshBasicMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -11,13 +12,13 @@ import { import { Color, ColorRepresentation, - Combine, Euler, EulerOrder, MeshBasicMaterial, MeshBasicMaterialParameters, - Texture, } from 'three'; +import { Combine } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -41,16 +42,6 @@ export class ThMeshBasicMaterial< return this._objRef?.isMeshBasicMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set color( value: | Color diff --git a/projects/ngx-three/src/lib/generated/ThMeshDepthMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshDepthMaterial.ts index 402c5aa..d3a6d0b 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshDepthMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshDepthMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,12 +9,9 @@ import { Type, forwardRef, } from '@angular/core'; -import { - DepthPackingStrategies, - MeshDepthMaterial, - MeshDepthMaterialParameters, - Texture, -} from 'three'; +import { MeshDepthMaterial, MeshDepthMaterialParameters } from 'three'; +import { DepthPackingStrategies } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { ThMaterial } from './ThMaterial'; @Component({ @@ -36,16 +34,6 @@ export class ThMeshDepthMaterial< return this._objRef?.isMeshDepthMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set map(value: Texture | null) { if (this._objRef) { this._objRef.map = value; diff --git a/projects/ngx-three/src/lib/generated/ThMeshDistanceMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshDistanceMaterial.ts index 7582d01..c5d067a 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshDistanceMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshDistanceMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,11 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { - MeshDistanceMaterial, - MeshDistanceMaterialParameters, - Texture, -} from 'three'; +import { MeshDistanceMaterial, MeshDistanceMaterialParameters } from 'three'; +import { Texture } from 'three/src/textures/Texture.js'; import { ThMaterial } from './ThMaterial'; @Component({ @@ -38,16 +36,6 @@ export class ThMeshDistanceMaterial< return this._objRef?.isMeshDistanceMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set map(value: Texture | null) { if (this._objRef) { this._objRef.map = value; diff --git a/projects/ngx-three/src/lib/generated/ThMeshLambertMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshLambertMaterial.ts index 568e56b..5f4808b 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshLambertMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshLambertMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -11,15 +12,14 @@ import { import { Color, ColorRepresentation, - Combine, Euler, EulerOrder, MeshLambertMaterial, MeshLambertMaterialParameters, - NormalMapTypes, - Texture, Vector2, } from 'three'; +import { Combine, NormalMapTypes } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -46,16 +46,6 @@ export class ThMeshLambertMaterial< return this._objRef?.isMeshLambertMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set color( value: | Color diff --git a/projects/ngx-three/src/lib/generated/ThMeshMatcapMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshMatcapMaterial.ts index 8403bae..c26e1cc 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshMatcapMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshMatcapMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -13,10 +14,10 @@ import { ColorRepresentation, MeshMatcapMaterial, MeshMatcapMaterialParameters, - NormalMapTypes, - Texture, Vector2, } from 'three'; +import { NormalMapTypes } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -43,16 +44,6 @@ export class ThMeshMatcapMaterial< return this._objRef?.isMeshMatcapMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set defines(value: { [key: string]: any }) { if (this._objRef) { this._objRef.defines = value; diff --git a/projects/ngx-three/src/lib/generated/ThMeshNormalMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshNormalMaterial.ts index b5c1cc9..2840f9b 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshNormalMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshNormalMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -11,10 +12,10 @@ import { import { MeshNormalMaterial, MeshNormalMaterialParameters, - NormalMapTypes, - Texture, Vector2, } from 'three'; +import { NormalMapTypes } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -41,16 +42,6 @@ export class ThMeshNormalMaterial< return this._objRef?.isMeshNormalMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set bumpMap(value: Texture | null) { if (this._objRef) { this._objRef.bumpMap = value; diff --git a/projects/ngx-three/src/lib/generated/ThMeshPhongMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshPhongMaterial.ts index 3afb570..493633a 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshPhongMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshPhongMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -11,15 +12,14 @@ import { import { Color, ColorRepresentation, - Combine, Euler, EulerOrder, MeshPhongMaterial, MeshPhongMaterialParameters, - NormalMapTypes, - Texture, Vector2, } from 'three'; +import { Combine, NormalMapTypes } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -43,16 +43,6 @@ export class ThMeshPhongMaterial< return this._objRef?.isMeshPhongMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set color( value: | Color diff --git a/projects/ngx-three/src/lib/generated/ThMeshPhysicalMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshPhysicalMaterial.ts index 40b4933..c10d86b 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshPhysicalMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshPhysicalMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -13,9 +14,9 @@ import { ColorRepresentation, MeshPhysicalMaterial, MeshPhysicalMaterialParameters, - Texture, Vector2, } from 'three'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; import { ThMeshStandardMaterial } from './ThMeshStandardMaterial'; @@ -53,16 +54,6 @@ export class ThMeshPhysicalMaterial< return this._objRef?.defines; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set anisotropyRotation(value: number) { if (this._objRef) { this._objRef.anisotropyRotation = value; diff --git a/projects/ngx-three/src/lib/generated/ThMeshStandardMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshStandardMaterial.ts index 115a583..2fc1e8f 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshStandardMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshStandardMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -15,10 +16,10 @@ import { EulerOrder, MeshStandardMaterial, MeshStandardMaterialParameters, - NormalMapTypes, - Texture, Vector2, } from 'three'; +import { NormalMapTypes } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -45,16 +46,6 @@ export class ThMeshStandardMaterial< return this._objRef?.isMeshStandardMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set defines(value: { [key: string]: any }) { if (this._objRef) { this._objRef.defines = value; diff --git a/projects/ngx-three/src/lib/generated/ThMeshToonMaterial.ts b/projects/ngx-three/src/lib/generated/ThMeshToonMaterial.ts index 215d17a..c54562f 100644 --- a/projects/ngx-three/src/lib/generated/ThMeshToonMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThMeshToonMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -13,10 +14,10 @@ import { ColorRepresentation, MeshToonMaterial, MeshToonMaterialParameters, - NormalMapTypes, - Texture, Vector2, } from 'three'; +import { NormalMapTypes } from 'three/src/constants.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -40,16 +41,6 @@ export class ThMeshToonMaterial< return this._objRef?.isMeshToonMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set defines(value: { [key: string]: any }) { if (this._objRef) { this._objRef.defines = value; diff --git a/projects/ngx-three/src/lib/generated/ThObject3D.ts b/projects/ngx-three/src/lib/generated/ThObject3D.ts index 2e61eb7..ee93eba 100644 --- a/projects/ngx-three/src/lib/generated/ThObject3D.ts +++ b/projects/ngx-three/src/lib/generated/ThObject3D.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,19 +9,13 @@ import { SkipSelf, Type, } from '@angular/core'; -import { - AnimationClip, - Euler, - EulerOrder, - Layers, - Material, - Matrix3, - Matrix4, - Object3D, - Object3DEventMap, - Quaternion, - Vector3, -} from 'three'; +import { EulerOrder, Layers, Object3D, Object3DEventMap, Vector3 } from 'three'; +import { AnimationClip } from 'three/src/animation/AnimationClip.js'; +import { Material } from 'three/src/materials/Material.js'; +import { Euler } from 'three/src/math/Euler.js'; +import { Matrix3 } from 'three/src/math/Matrix3.js'; +import { Matrix4 } from 'three/src/math/Matrix4.js'; +import { Quaternion } from 'three/src/math/Quaternion.js'; import { ThObjectBase } from '../ThObjectBase'; import { applyValue } from '../util'; @@ -65,7 +60,7 @@ export class ThObject3D< public get name(): string | undefined { return this._objRef?.name; } - public get type(): (string | 'Object3D') | undefined { + public get type(): string | undefined { return this._objRef?.type; } @Input() diff --git a/projects/ngx-three/src/lib/generated/ThOctahedronGeometry.ts b/projects/ngx-three/src/lib/generated/ThOctahedronGeometry.ts index 9d16a5b..2e0df00 100644 --- a/projects/ngx-three/src/lib/generated/ThOctahedronGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThOctahedronGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThOrbitControls.ts b/projects/ngx-three/src/lib/generated/ThOrbitControls.ts index 4448453..236fb48 100644 --- a/projects/ngx-three/src/lib/generated/ThOrbitControls.ts +++ b/projects/ngx-three/src/lib/generated/ThOrbitControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,8 +9,12 @@ import { Type, forwardRef, } from '@angular/core'; -import { Camera, MOUSE, TOUCH, Vector3 } from 'three'; -import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; +import { MOUSE, TOUCH, Vector3 } from 'three'; +import { + OrbitControls, + OrbitControlsEventMap, +} from 'three/examples/jsm/controls/OrbitControls.js'; +import { Camera } from 'three/src/cameras/Camera.js'; import { ThControlBase } from '../ThControlBase'; import { applyValue } from '../util'; @@ -23,42 +28,12 @@ import { applyValue } from '../util'; }) export class ThOrbitControls< T extends OrbitControls = OrbitControls, - TARGS = [object: Camera, domElement: HTMLElement], -> extends ThControlBase { + TARGS = [object: Camera, domElement?: HTMLElement | null], +> extends ThControlBase { public getType(): Type { return OrbitControls; } - @Input() - public set object(value: Camera) { - if (this._objRef) { - this._objRef.object = value; - } - } - - public get object(): Camera | undefined { - return this._objRef?.object; - } - @Input() - public set domElement(value: HTMLElement | Document) { - if (this._objRef) { - this._objRef.domElement = value; - } - } - - public get domElement(): (HTMLElement | Document) | undefined { - return this._objRef?.domElement; - } - @Input() - public set enabled(value: boolean) { - if (this._objRef) { - this._objRef.enabled = value; - } - } - - public get enabled(): boolean | undefined { - return this._objRef?.enabled; - } @Input() public set target(value: Vector3 | [x: number, y: number, z: number]) { if (this._objRef) { @@ -69,15 +44,6 @@ export class ThOrbitControls< return this._objRef?.target; } @Input() - public set center(value: Vector3 | [x: number, y: number, z: number]) { - if (this._objRef) { - this._objRef.center = applyValue(this._objRef.center, value); - } - } - public get center(): Vector3 | undefined { - return this._objRef?.center; - } - @Input() public set cursor(value: Vector3 | [x: number, y: number, z: number]) { if (this._objRef) { this._objRef.cursor = applyValue(this._objRef.cursor, value); @@ -227,16 +193,6 @@ export class ThOrbitControls< return this._objRef?.zoomSpeed; } @Input() - public set zoomToCursor(value: boolean) { - if (this._objRef) { - this._objRef.zoomToCursor = value; - } - } - - public get zoomToCursor(): boolean | undefined { - return this._objRef?.zoomToCursor; - } - @Input() public set enableRotate(value: boolean) { if (this._objRef) { this._objRef.enableRotate = value; @@ -297,6 +253,16 @@ export class ThOrbitControls< return this._objRef?.keyPanSpeed; } @Input() + public set zoomToCursor(value: boolean) { + if (this._objRef) { + this._objRef.zoomToCursor = value; + } + } + + public get zoomToCursor(): boolean | undefined { + return this._objRef?.zoomToCursor; + } + @Input() public set autoRotate(value: boolean) { if (this._objRef) { this._objRef.autoRotate = value; diff --git a/projects/ngx-three/src/lib/generated/ThOrthographicCamera.ts b/projects/ngx-three/src/lib/generated/ThOrthographicCamera.ts index 09802cb..2fa3f64 100644 --- a/projects/ngx-three/src/lib/generated/ThOrthographicCamera.ts +++ b/projects/ngx-three/src/lib/generated/ThOrthographicCamera.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThOutlinePass.ts b/projects/ngx-three/src/lib/generated/ThOutlinePass.ts index f335fc6..ce8f894 100644 --- a/projects/ngx-three/src/lib/generated/ThOutlinePass.ts +++ b/projects/ngx-three/src/lib/generated/ThOutlinePass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThOutputPass.ts b/projects/ngx-three/src/lib/generated/ThOutputPass.ts index 6dd6cc7..035667a 100644 --- a/projects/ngx-three/src/lib/generated/ThOutputPass.ts +++ b/projects/ngx-three/src/lib/generated/ThOutputPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThParametricGeometry.ts b/projects/ngx-three/src/lib/generated/ThParametricGeometry.ts index 2161a89..fe4254c 100644 --- a/projects/ngx-three/src/lib/generated/ThParametricGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThParametricGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThPass.ts b/projects/ngx-three/src/lib/generated/ThPass.ts index a56bcba..7a2125c 100644 --- a/projects/ngx-three/src/lib/generated/ThPass.ts +++ b/projects/ngx-three/src/lib/generated/ThPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThPerspectiveCamera.ts b/projects/ngx-three/src/lib/generated/ThPerspectiveCamera.ts index c594af2..e39c2a4 100644 --- a/projects/ngx-three/src/lib/generated/ThPerspectiveCamera.ts +++ b/projects/ngx-three/src/lib/generated/ThPerspectiveCamera.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThPlaneGeometry.ts b/projects/ngx-three/src/lib/generated/ThPlaneGeometry.ts index b3a934b..f50355f 100644 --- a/projects/ngx-three/src/lib/generated/ThPlaneGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThPlaneGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThPlaneHelper.ts b/projects/ngx-three/src/lib/generated/ThPlaneHelper.ts index b1c8cd7..3273bff 100644 --- a/projects/ngx-three/src/lib/generated/ThPlaneHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThPlaneHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -14,8 +15,8 @@ import { Object3DEventMap, Plane, PlaneHelper, - Vector3, } from 'three'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { applyValue } from '../util'; import { ThLineSegments } from './ThLineSegments'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThPointLight.ts b/projects/ngx-three/src/lib/generated/ThPointLight.ts index 48c7611..9a22dc8 100644 --- a/projects/ngx-three/src/lib/generated/ThPointLight.ts +++ b/projects/ngx-three/src/lib/generated/ThPointLight.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,9 @@ import { Type, forwardRef, } from '@angular/core'; -import { ColorRepresentation, PointLight, PointLightShadow } from 'three'; +import { PointLight } from 'three'; +import { PointLightShadow } from 'three/src/lights/PointLightShadow.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { ThLight } from './ThLight'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThPointLightHelper.ts b/projects/ngx-three/src/lib/generated/ThPointLightHelper.ts index a50369b..679a917 100644 --- a/projects/ngx-three/src/lib/generated/ThPointLightHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThPointLightHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,13 +9,9 @@ import { Type, forwardRef, } from '@angular/core'; -import { - ColorRepresentation, - Matrix4, - Object3DEventMap, - PointLight, - PointLightHelper, -} from 'three'; +import { Matrix4, Object3DEventMap, PointLightHelper } from 'three'; +import { PointLight } from 'three/src/lights/PointLight.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThPointerLockControls.ts b/projects/ngx-three/src/lib/generated/ThPointerLockControls.ts index a26461f..110c216 100644 --- a/projects/ngx-three/src/lib/generated/ThPointerLockControls.ts +++ b/projects/ngx-three/src/lib/generated/ThPointerLockControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -9,7 +10,10 @@ import { forwardRef, } from '@angular/core'; import { Camera } from 'three'; -import { PointerLockControls } from 'three/examples/jsm/controls/PointerLockControls.js'; +import { + PointerLockControls, + PointerLockControlsEventMap, +} from 'three/examples/jsm/controls/PointerLockControls.js'; import { ThControlBase } from '../ThControlBase'; @Component({ @@ -25,32 +29,12 @@ import { ThControlBase } from '../ThControlBase'; }) export class ThPointerLockControls< T extends PointerLockControls = PointerLockControls, - TARGS = [camera: Camera, domElement?: HTMLElement], -> extends ThControlBase { + TARGS = [camera: Camera, domElement?: HTMLElement | null], +> extends ThControlBase { public getType(): Type { return PointerLockControls; } - @Input() - public set camera(value: Camera) { - if (this._objRef) { - this._objRef.camera = value; - } - } - - public get camera(): Camera | undefined { - return this._objRef?.camera; - } - @Input() - public set domElement(value: HTMLElement) { - if (this._objRef) { - this._objRef.domElement = value; - } - } - - public get domElement(): HTMLElement | undefined { - return this._objRef?.domElement; - } @Input() public set isLocked(value: boolean) { if (this._objRef) { diff --git a/projects/ngx-three/src/lib/generated/ThPoints.ts b/projects/ngx-three/src/lib/generated/ThPoints.ts index f9c4281..9a0ee05 100644 --- a/projects/ngx-three/src/lib/generated/ThPoints.ts +++ b/projects/ngx-three/src/lib/generated/ThPoints.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,13 +9,13 @@ import { Type, forwardRef, } from '@angular/core'; +import { Points } from 'three'; import { BufferGeometry, - Material, NormalOrGLBufferAttributes, - Object3DEventMap, - Points, -} from 'three'; +} from 'three/src/core/BufferGeometry.js'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; +import { Material } from 'three/src/materials/Material.js'; import { ThObject3D } from './ThObject3D'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThPointsMaterial.ts b/projects/ngx-three/src/lib/generated/ThPointsMaterial.ts index c89f5eb..b8ca080 100644 --- a/projects/ngx-three/src/lib/generated/ThPointsMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThPointsMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -13,8 +14,8 @@ import { ColorRepresentation, PointsMaterial, PointsMaterialParameters, - Texture, } from 'three'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -38,16 +39,6 @@ export class ThPointsMaterial< return this._objRef?.isPointsMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set color( value: | Color diff --git a/projects/ngx-three/src/lib/generated/ThPolarGridHelper.ts b/projects/ngx-three/src/lib/generated/ThPolarGridHelper.ts index 2ae0aca..b421dd6 100644 --- a/projects/ngx-three/src/lib/generated/ThPolarGridHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThPolarGridHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -9,11 +10,11 @@ import { } from '@angular/core'; import { BufferGeometry, - ColorRepresentation, Material, Object3DEventMap, PolarGridHelper, } from 'three'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { ThLineSegments } from './ThLineSegments'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThPolyhedronGeometry.ts b/projects/ngx-three/src/lib/generated/ThPolyhedronGeometry.ts index 4e6d148..03fb7ff 100644 --- a/projects/ngx-three/src/lib/generated/ThPolyhedronGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThPolyhedronGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThPositionalAudio.ts b/projects/ngx-three/src/lib/generated/ThPositionalAudio.ts index 8ef9425..a5237ba 100644 --- a/projects/ngx-three/src/lib/generated/ThPositionalAudio.ts +++ b/projects/ngx-three/src/lib/generated/ThPositionalAudio.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { AudioListener, PositionalAudio } from 'three'; +import { PositionalAudio } from 'three'; +import { AudioListener } from 'three/src/audio/AudioListener.js'; import { ThAudio } from './ThAudio'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThRawShaderMaterial.ts b/projects/ngx-three/src/lib/generated/ThRawShaderMaterial.ts index 19cb51f..5edcfed 100644 --- a/projects/ngx-three/src/lib/generated/ThRawShaderMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThRawShaderMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { RawShaderMaterial, ShaderMaterialParameters } from 'three'; +import { RawShaderMaterial } from 'three'; +import { ShaderMaterialParameters } from 'three/src/materials/ShaderMaterial.js'; import { ThMaterial } from './ThMaterial'; import { ThShaderMaterial } from './ThShaderMaterial'; @@ -30,7 +32,4 @@ export class ThRawShaderMaterial< public get isRawShaderMaterial(): true | undefined { return this._objRef?.isRawShaderMaterial; } - public get type(): 'RawShaderMaterial' | undefined { - return this._objRef?.type; - } } diff --git a/projects/ngx-three/src/lib/generated/ThRectAreaLight.ts b/projects/ngx-three/src/lib/generated/ThRectAreaLight.ts index 5540c77..ffabc00 100644 --- a/projects/ngx-three/src/lib/generated/ThRectAreaLight.ts +++ b/projects/ngx-three/src/lib/generated/ThRectAreaLight.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { ColorRepresentation, RectAreaLight } from 'three'; +import { RectAreaLight } from 'three'; +import { ColorRepresentation } from 'three/src/math/Color.js'; import { ThLight } from './ThLight'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThRenderPassGen.ts b/projects/ngx-three/src/lib/generated/ThRenderPassGen.ts index e110260..734524e 100644 --- a/projects/ngx-three/src/lib/generated/ThRenderPassGen.ts +++ b/projects/ngx-three/src/lib/generated/ThRenderPassGen.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThRingGeometry.ts b/projects/ngx-three/src/lib/generated/ThRingGeometry.ts index 8807e07..c2ccbe1 100644 --- a/projects/ngx-three/src/lib/generated/ThRingGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThRingGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThRoundedBoxGeometry.ts b/projects/ngx-three/src/lib/generated/ThRoundedBoxGeometry.ts index 7e9203a..c7c5b29 100644 --- a/projects/ngx-three/src/lib/generated/ThRoundedBoxGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThRoundedBoxGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThSAOPass.ts b/projects/ngx-three/src/lib/generated/ThSAOPass.ts index 0d00beb..fa16682 100644 --- a/projects/ngx-three/src/lib/generated/ThSAOPass.ts +++ b/projects/ngx-three/src/lib/generated/ThSAOPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThSMAAPass.ts b/projects/ngx-three/src/lib/generated/ThSMAAPass.ts index c3aa236..544861a 100644 --- a/projects/ngx-three/src/lib/generated/ThSMAAPass.ts +++ b/projects/ngx-three/src/lib/generated/ThSMAAPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThSSAARenderPass.ts b/projects/ngx-three/src/lib/generated/ThSSAARenderPass.ts index 3e2eaa7..6b3c0e3 100644 --- a/projects/ngx-three/src/lib/generated/ThSSAARenderPass.ts +++ b/projects/ngx-three/src/lib/generated/ThSSAARenderPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -83,6 +84,16 @@ export class ThSSAARenderPass< return this._objRef?.unbiased; } @Input() + public set stencilBuffer(value: boolean) { + if (this._objRef) { + this._objRef.stencilBuffer = value; + } + } + + public get stencilBuffer(): boolean | undefined { + return this._objRef?.stencilBuffer; + } + @Input() public set clearColor(value: ColorRepresentation) { if (this._objRef) { this._objRef.clearColor = value; @@ -133,13 +144,13 @@ export class ThSSAARenderPass< return this._objRef?.fsQuad; } @Input() - public set sampleRenderTarget(value: undefined | WebGLRenderTarget) { + public set sampleRenderTarget(value: WebGLRenderTarget | undefined) { if (this._objRef) { this._objRef.sampleRenderTarget = value; } } - public get sampleRenderTarget(): (undefined | WebGLRenderTarget) | undefined { + public get sampleRenderTarget(): (WebGLRenderTarget | undefined) | undefined { return this._objRef?.sampleRenderTarget; } } diff --git a/projects/ngx-three/src/lib/generated/ThSSAOPass.ts b/projects/ngx-three/src/lib/generated/ThSSAOPass.ts index 7e3d4da..dc1e55f 100644 --- a/projects/ngx-three/src/lib/generated/ThSSAOPass.ts +++ b/projects/ngx-three/src/lib/generated/ThSSAOPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -17,7 +18,6 @@ import { MeshNormalMaterial, Scene, ShaderMaterial, - Vector3, WebGLRenderTarget, } from 'three'; import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js'; @@ -25,6 +25,7 @@ import { SSAOPass, SSAOPassOUTPUT, } from 'three/examples/jsm/postprocessing/SSAOPass.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { ThPassBase } from '../ThPassBase'; import { applyValue } from '../util'; import { ThPass } from './ThPass'; diff --git a/projects/ngx-three/src/lib/generated/ThSSRPass.ts b/projects/ngx-three/src/lib/generated/ThSSRPass.ts index 9898a82..70f5830 100644 --- a/projects/ngx-three/src/lib/generated/ThSSRPass.ts +++ b/projects/ngx-three/src/lib/generated/ThSSRPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThSavePass.ts b/projects/ngx-three/src/lib/generated/ThSavePass.ts index 945bbac..2510734 100644 --- a/projects/ngx-three/src/lib/generated/ThSavePass.ts +++ b/projects/ngx-three/src/lib/generated/ThSavePass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThScene.ts b/projects/ngx-three/src/lib/generated/ThScene.ts index 840d6bb..bdb1f41 100644 --- a/projects/ngx-three/src/lib/generated/ThScene.ts +++ b/projects/ngx-three/src/lib/generated/ThScene.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -11,15 +12,16 @@ import { import { Color, ColorRepresentation, - CubeTexture, Euler, EulerOrder, - FogBase, - Material, Object3DEventMap, Scene, - Texture, } from 'three'; +import { Material } from 'three/src/materials/Material.js'; +import { Fog } from 'three/src/scenes/Fog.js'; +import { FogExp2 } from 'three/src/scenes/FogExp2.js'; +import { CubeTexture } from 'three/src/textures/CubeTexture.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; @@ -52,13 +54,13 @@ export class ThScene extends ThObject3D< return this._objRef?.type; } @Input() - public set fog(value: FogBase | null) { + public set fog(value: Fog | FogExp2 | null) { if (this._objRef) { this._objRef.fog = value; } } - public get fog(): (FogBase | null) | undefined { + public get fog(): (Fog | FogExp2 | null) | undefined { return this._objRef?.fog; } @Input() diff --git a/projects/ngx-three/src/lib/generated/ThShaderMaterial.ts b/projects/ngx-three/src/lib/generated/ThShaderMaterial.ts index 6ae06e7..3587f07 100644 --- a/projects/ngx-three/src/lib/generated/ThShaderMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThShaderMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,13 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - GLSLVersion, - IUniform, - ShaderMaterial, - ShaderMaterialParameters, - UniformsGroup, -} from 'three'; +import { ShaderMaterial, ShaderMaterialParameters } from 'three'; +import { GLSLVersion } from 'three/src/constants.js'; +import { UniformsGroup } from 'three/src/core/UniformsGroup.js'; +import { IUniform } from 'three/src/renderers/shaders/UniformsLib.js'; import { ThMaterial } from './ThMaterial'; @Component({ @@ -37,16 +35,6 @@ export class ThShaderMaterial< return this._objRef?.isShaderMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set defines(value: { [key: string]: any }) { if (this._objRef) { this._objRef.defines = value; diff --git a/projects/ngx-three/src/lib/generated/ThShaderPass.ts b/projects/ngx-three/src/lib/generated/ThShaderPass.ts index 44d7cb2..55ad416 100644 --- a/projects/ngx-three/src/lib/generated/ThShaderPass.ts +++ b/projects/ngx-three/src/lib/generated/ThShaderPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThShadowMaterial.ts b/projects/ngx-three/src/lib/generated/ThShadowMaterial.ts index bd54df4..6d16311 100644 --- a/projects/ngx-three/src/lib/generated/ThShadowMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThShadowMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -37,16 +38,6 @@ export class ThShadowMaterial< return this._objRef?.isShadowMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set color( value: | Color diff --git a/projects/ngx-three/src/lib/generated/ThShapeGeometry.ts b/projects/ngx-three/src/lib/generated/ThShapeGeometry.ts index 71f3294..1b463f0 100644 --- a/projects/ngx-three/src/lib/generated/ThShapeGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThShapeGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,7 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { NormalBufferAttributes, Shape, ShapeGeometry } from 'three'; +import { NormalBufferAttributes, ShapeGeometry } from 'three'; +import { Shape } from 'three/src/extras/core/Shape.js'; import { ThBufferGeometry } from './ThBufferGeometry'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThSkeletonHelper.ts b/projects/ngx-three/src/lib/generated/ThSkeletonHelper.ts index 13e12d1..4f76ed8 100644 --- a/projects/ngx-three/src/lib/generated/ThSkeletonHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThSkeletonHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -9,15 +10,15 @@ import { forwardRef, } from '@angular/core'; import { - Bone, BufferGeometry, Material, Matrix4, - Object3D, Object3DEventMap, SkeletonHelper, - SkinnedMesh, } from 'three'; +import { Object3D } from 'three/src/core/Object3D.js'; +import { Bone } from 'three/src/objects/Bone.js'; +import { SkinnedMesh } from 'three/src/objects/SkinnedMesh.js'; import { applyValue } from '../util'; import { ThLineSegments } from './ThLineSegments'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThSkinnedMesh.ts b/projects/ngx-three/src/lib/generated/ThSkinnedMesh.ts index 4de1e92..ad68fcd 100644 --- a/projects/ngx-three/src/lib/generated/ThSkinnedMesh.ts +++ b/projects/ngx-three/src/lib/generated/ThSkinnedMesh.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,18 +9,14 @@ import { Type, forwardRef, } from '@angular/core'; -import { - BindMode, - Box3, - BufferGeometry, - Material, - Matrix4, - Object3DEventMap, - Skeleton, - SkinnedMesh, - Sphere, - Vector3, -} from 'three'; +import { Box3, Matrix4, SkinnedMesh } from 'three'; +import { BindMode } from 'three/src/constants.js'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; +import { Material } from 'three/src/materials/Material.js'; +import { Sphere } from 'three/src/math/Sphere.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; +import { Skeleton } from 'three/src/objects/Skeleton.js'; import { applyValue } from '../util'; import { ThMesh } from './ThMesh'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThSphereGeometry.ts b/projects/ngx-three/src/lib/generated/ThSphereGeometry.ts index c9f2c3f..f12102d 100644 --- a/projects/ngx-three/src/lib/generated/ThSphereGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThSphereGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThSpotLight.ts b/projects/ngx-three/src/lib/generated/ThSpotLight.ts index 7cde817..e6b2953 100644 --- a/projects/ngx-three/src/lib/generated/ThSpotLight.ts +++ b/projects/ngx-three/src/lib/generated/ThSpotLight.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,14 +9,11 @@ import { Type, forwardRef, } from '@angular/core'; -import { - ColorRepresentation, - Object3D, - SpotLight, - SpotLightShadow, - Texture, - Vector3, -} from 'three'; +import { SpotLight, Vector3 } from 'three'; +import { Object3D } from 'three/src/core/Object3D.js'; +import { SpotLightShadow } from 'three/src/lights/SpotLightShadow.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThLight } from './ThLight'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThSpotLightHelper.ts b/projects/ngx-three/src/lib/generated/ThSpotLightHelper.ts index 62ec96a..bfe7212 100644 --- a/projects/ngx-three/src/lib/generated/ThSpotLightHelper.ts +++ b/projects/ngx-three/src/lib/generated/ThSpotLightHelper.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,14 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - ColorRepresentation, - Light, - LineSegments, - Matrix4, - Object3DEventMap, - SpotLightHelper, -} from 'three'; +import { Matrix4, Object3DEventMap, SpotLightHelper } from 'three'; +import { Light } from 'three/src/lights/Light.js'; +import { ColorRepresentation } from 'three/src/math/Color.js'; +import { LineSegments } from 'three/src/objects/LineSegments.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThSprite.ts b/projects/ngx-three/src/lib/generated/ThSprite.ts index 9607210..c48e95a 100644 --- a/projects/ngx-three/src/lib/generated/ThSprite.ts +++ b/projects/ngx-three/src/lib/generated/ThSprite.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,13 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { - BufferGeometry, - Object3DEventMap, - Sprite, - SpriteMaterial, - Vector2, -} from 'three'; +import { Sprite, Vector2 } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; +import { Object3DEventMap } from 'three/src/core/Object3D.js'; +import { SpriteMaterial } from 'three/src/materials/Materials.js'; import { applyValue } from '../util'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThSpriteMaterial.ts b/projects/ngx-three/src/lib/generated/ThSpriteMaterial.ts index 7eb127b..e74a9bc 100644 --- a/projects/ngx-three/src/lib/generated/ThSpriteMaterial.ts +++ b/projects/ngx-three/src/lib/generated/ThSpriteMaterial.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -13,8 +14,8 @@ import { ColorRepresentation, SpriteMaterial, SpriteMaterialParameters, - Texture, } from 'three'; +import { Texture } from 'three/src/textures/Texture.js'; import { applyValue } from '../util'; import { ThMaterial } from './ThMaterial'; @@ -38,16 +39,6 @@ export class ThSpriteMaterial< return this._objRef?.isSpriteMaterial; } @Input() - public set type(value: string) { - if (this._objRef) { - this._objRef.type = value; - } - } - - public get type(): string | undefined { - return this._objRef?.type; - } - @Input() public set color( value: | Color diff --git a/projects/ngx-three/src/lib/generated/ThStereoCamera.ts b/projects/ngx-three/src/lib/generated/ThStereoCamera.ts index 567d6c4..d0e3173 100644 --- a/projects/ngx-three/src/lib/generated/ThStereoCamera.ts +++ b/projects/ngx-three/src/lib/generated/ThStereoCamera.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { PerspectiveCamera, StereoCamera } from 'three'; +import { StereoCamera } from 'three'; +import { PerspectiveCamera } from 'three/src/cameras/PerspectiveCamera.js'; import { ThCamera } from './ThCamera'; import { ThObject3D } from './ThObject3D'; diff --git a/projects/ngx-three/src/lib/generated/ThTAARenderPass.ts b/projects/ngx-three/src/lib/generated/ThTAARenderPass.ts index ea7f6e6..5bdd2c2 100644 --- a/projects/ngx-three/src/lib/generated/ThTAARenderPass.ts +++ b/projects/ngx-three/src/lib/generated/ThTAARenderPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThTeapotGeometry.ts b/projects/ngx-three/src/lib/generated/ThTeapotGeometry.ts index cb4f269..a2dfbb6 100644 --- a/projects/ngx-three/src/lib/generated/ThTeapotGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThTeapotGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThTetrahedronGeometry.ts b/projects/ngx-three/src/lib/generated/ThTetrahedronGeometry.ts index d48b6c1..b63b547 100644 --- a/projects/ngx-three/src/lib/generated/ThTetrahedronGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThTetrahedronGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThTextGeometry.ts b/projects/ngx-three/src/lib/generated/ThTextGeometry.ts index f1a26ea..abf8144 100644 --- a/projects/ngx-three/src/lib/generated/ThTextGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThTextGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThTexture.ts b/projects/ngx-three/src/lib/generated/ThTexture.ts index d79750c..fa72d0c 100644 --- a/projects/ngx-three/src/lib/generated/ThTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,23 +9,22 @@ import { Type, forwardRef, } from '@angular/core'; +import { Matrix3, OffscreenCanvas, Texture } from 'three'; import { AnyMapping, AnyPixelFormat, - ColorSpace, MagnificationTextureFilter, Mapping, - Matrix3, MinificationTextureFilter, - OffscreenCanvas, PixelFormat, PixelFormatGPU, - Source, - Texture, TextureDataType, - Vector2, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; +import { Vector2 } from 'three/src/math/Vector2.js'; +import { CompressedTextureMipmap } from 'three/src/textures/CompressedTexture.js'; +import { CubeTexture } from 'three/src/textures/CubeTexture.js'; +import { Source } from 'three/src/textures/Source.js'; import { ThTextureBase } from '../ThTextureBase'; import { applyValue } from '../util'; @@ -49,7 +49,7 @@ export class ThTexture< format?: PixelFormat, type?: TextureDataType, anisotropy?: number, - colorSpace?: ColorSpace, + colorSpace?: string, ] | [ image: TexImageSource | OffscreenCanvas, @@ -114,13 +114,26 @@ export class ThTexture< } @Input() - public set mipmaps(value: any[]) { + public set mipmaps( + value: + | CompressedTextureMipmap[] + | CubeTexture[] + | HTMLCanvasElement[] + | undefined, + ) { if (this._objRef) { this._objRef.mipmaps = value; } } - public get mipmaps(): any[] | undefined { + public get mipmaps(): + | ( + | CompressedTextureMipmap[] + | CubeTexture[] + | HTMLCanvasElement[] + | undefined + ) + | undefined { return this._objRef?.mipmaps; } @Input() @@ -334,13 +347,13 @@ export class ThTexture< return this._objRef?.unpackAlignment; } @Input() - public set colorSpace(value: ColorSpace) { + public set colorSpace(value: string) { if (this._objRef) { this._objRef.colorSpace = value; } } - public get colorSpace(): ColorSpace | undefined { + public get colorSpace(): string | undefined { return this._objRef?.colorSpace; } @Input() diff --git a/projects/ngx-three/src/lib/generated/ThTexturePass.ts b/projects/ngx-three/src/lib/generated/ThTexturePass.ts index e96173d..12a64dc 100644 --- a/projects/ngx-three/src/lib/generated/ThTexturePass.ts +++ b/projects/ngx-three/src/lib/generated/ThTexturePass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThTorusGeometry.ts b/projects/ngx-three/src/lib/generated/ThTorusGeometry.ts index dc0b00d..f551f93 100644 --- a/projects/ngx-three/src/lib/generated/ThTorusGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThTorusGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThTorusKnotGeometry.ts b/projects/ngx-three/src/lib/generated/ThTorusKnotGeometry.ts index 1d2233a..0a464be 100644 --- a/projects/ngx-three/src/lib/generated/ThTorusKnotGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThTorusKnotGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ diff --git a/projects/ngx-three/src/lib/generated/ThTrackballControls.ts b/projects/ngx-three/src/lib/generated/ThTrackballControls.ts index cab65ee..b00c48e 100644 --- a/projects/ngx-three/src/lib/generated/ThTrackballControls.ts +++ b/projects/ngx-three/src/lib/generated/ThTrackballControls.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,8 +9,12 @@ import { Type, forwardRef, } from '@angular/core'; -import { Camera, MOUSE, Vector3 } from 'three'; -import { TrackballControls } from 'three/examples/jsm/controls/TrackballControls.js'; +import { MOUSE, Vector3 } from 'three'; +import { + TrackballControls, + TrackballControlsEventMap, +} from 'three/examples/jsm/controls/TrackballControls.js'; +import { Camera } from 'three/src/cameras/Camera.js'; import { ThControlBase } from '../ThControlBase'; import { applyValue } from '../util'; @@ -26,42 +31,12 @@ import { applyValue } from '../util'; }) export class ThTrackballControls< T extends TrackballControls = TrackballControls, - TARGS = [object: Camera, domElement?: HTMLElement], -> extends ThControlBase { + TARGS = [camera: Camera, domElement?: HTMLElement | null], +> extends ThControlBase { public getType(): Type { return TrackballControls; } - @Input() - public set object(value: Camera) { - if (this._objRef) { - this._objRef.object = value; - } - } - - public get object(): Camera | undefined { - return this._objRef?.object; - } - @Input() - public set domElement(value: HTMLElement) { - if (this._objRef) { - this._objRef.domElement = value; - } - } - - public get domElement(): HTMLElement | undefined { - return this._objRef?.domElement; - } - @Input() - public set enabled(value: boolean) { - if (this._objRef) { - this._objRef.enabled = value; - } - } - - public get enabled(): boolean | undefined { - return this._objRef?.enabled; - } @Input() public set screen(value: { left: number; @@ -140,16 +115,6 @@ export class ThTrackballControls< return this._objRef?.noPan; } @Input() - public set noRoll(value: boolean) { - if (this._objRef) { - this._objRef.noRoll = value; - } - } - - public get noRoll(): boolean | undefined { - return this._objRef?.noRoll; - } - @Input() public set staticMoving(value: boolean) { if (this._objRef) { this._objRef.staticMoving = value; @@ -210,13 +175,13 @@ export class ThTrackballControls< return this._objRef?.maxZoom; } @Input() - public set keys(value: string[]) { + public set keys(value: [string, string, string]) { if (this._objRef) { this._objRef.keys = value; } } - public get keys(): string[] | undefined { + public get keys(): [string, string, string] | undefined { return this._objRef?.keys; } @Input() @@ -248,34 +213,4 @@ export class ThTrackballControls< public get target(): Vector3 | undefined { return this._objRef?.target; } - @Input() - public set position0(value: Vector3 | [x: number, y: number, z: number]) { - if (this._objRef) { - this._objRef.position0 = applyValue( - this._objRef.position0, - value, - ); - } - } - public get position0(): Vector3 | undefined { - return this._objRef?.position0; - } - @Input() - public set target0(value: Vector3 | [x: number, y: number, z: number]) { - if (this._objRef) { - this._objRef.target0 = applyValue(this._objRef.target0, value); - } - } - public get target0(): Vector3 | undefined { - return this._objRef?.target0; - } - @Input() - public set up0(value: Vector3 | [x: number, y: number, z: number]) { - if (this._objRef) { - this._objRef.up0 = applyValue(this._objRef.up0, value); - } - } - public get up0(): Vector3 | undefined { - return this._objRef?.up0; - } } diff --git a/projects/ngx-three/src/lib/generated/ThTransformControlsGen.ts b/projects/ngx-three/src/lib/generated/ThTransformControlsGen.ts index 81af85e..44d7921 100644 --- a/projects/ngx-three/src/lib/generated/ThTransformControlsGen.ts +++ b/projects/ngx-three/src/lib/generated/ThTransformControlsGen.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,9 +9,10 @@ import { Type, forwardRef, } from '@angular/core'; -import { Camera, MOUSE, Object3D } from 'three'; +import { Camera } from 'three'; import { TransformControls, + TransformControlsEventMap, TransformControlsMode, } from 'three/examples/jsm/controls/TransformControls.js'; import { ThControlBase } from '../ThControlBase'; @@ -28,22 +30,12 @@ import { ThControlBase } from '../ThControlBase'; }) export class ThTransformControlsGen< T extends TransformControls = TransformControls, - TARGS = [object: Camera, domElement?: HTMLElement], -> extends ThControlBase { + TARGS = [camera: Camera, domElement?: HTMLElement], +> extends ThControlBase { public getType(): Type { return TransformControls; } - @Input() - public set domElement(value: HTMLElement) { - if (this._objRef) { - this._objRef.domElement = value; - } - } - - public get domElement(): HTMLElement | undefined { - return this._objRef?.domElement; - } @Input() public set camera(value: Camera) { if (this._objRef) { @@ -55,26 +47,6 @@ export class ThTransformControlsGen< return this._objRef?.camera; } @Input() - public set object(value: Object3D | undefined) { - if (this._objRef) { - this._objRef.object = value; - } - } - - public get object(): (Object3D | undefined) | undefined { - return this._objRef?.object; - } - @Input() - public set enabled(value: boolean) { - if (this._objRef) { - this._objRef.enabled = value; - } - } - - public get enabled(): boolean | undefined { - return this._objRef?.enabled; - } - @Input() public set axis( value: 'X' | 'Y' | 'Z' | 'E' | 'XY' | 'YZ' | 'XZ' | 'XYZ' | 'XYZE' | null, ) { @@ -119,6 +91,16 @@ export class ThTransformControlsGen< return this._objRef?.rotationSnap; } @Input() + public set scaleSnap(value: number | null) { + if (this._objRef) { + this._objRef.scaleSnap = value; + } + } + + public get scaleSnap(): (number | null) | undefined { + return this._objRef?.scaleSnap; + } + @Input() public set space(value: 'world' | 'local') { if (this._objRef) { this._objRef.space = value; @@ -178,27 +160,64 @@ export class ThTransformControlsGen< public get showZ(): boolean | undefined { return this._objRef?.showZ; } - public get isTransformControls(): true | undefined { - return this._objRef?.isTransformControls; + @Input() + public set minx(value: number) { + if (this._objRef) { + this._objRef.minx = value; + } + } + + public get minx(): number | undefined { + return this._objRef?.minx; } @Input() - public set mouseButtons(value: { - LEFT?: MOUSE | null | undefined; - MIDDLE?: MOUSE | null | undefined; - RIGHT?: MOUSE | null | undefined; - }) { + public set maxX(value: number) { if (this._objRef) { - this._objRef.mouseButtons = value; + this._objRef.maxX = value; } } - public get mouseButtons(): - | { - LEFT?: MOUSE | null | undefined; - MIDDLE?: MOUSE | null | undefined; - RIGHT?: MOUSE | null | undefined; - } - | undefined { - return this._objRef?.mouseButtons; + public get maxX(): number | undefined { + return this._objRef?.maxX; + } + @Input() + public set minY(value: number) { + if (this._objRef) { + this._objRef.minY = value; + } + } + + public get minY(): number | undefined { + return this._objRef?.minY; + } + @Input() + public set maxY(value: number) { + if (this._objRef) { + this._objRef.maxY = value; + } + } + + public get maxY(): number | undefined { + return this._objRef?.maxY; + } + @Input() + public set minZ(value: number) { + if (this._objRef) { + this._objRef.minZ = value; + } + } + + public get minZ(): number | undefined { + return this._objRef?.minZ; + } + @Input() + public set maxZ(value: number) { + if (this._objRef) { + this._objRef.maxZ = value; + } + } + + public get maxZ(): number | undefined { + return this._objRef?.maxZ; } } diff --git a/projects/ngx-three/src/lib/generated/ThTubeGeometry.ts b/projects/ngx-three/src/lib/generated/ThTubeGeometry.ts index 1ad9736..af0629c 100644 --- a/projects/ngx-three/src/lib/generated/ThTubeGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThTubeGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,7 +9,9 @@ import { Type, forwardRef, } from '@angular/core'; -import { Curve, NormalBufferAttributes, TubeGeometry, Vector3 } from 'three'; +import { NormalBufferAttributes, TubeGeometry } from 'three'; +import { Curve } from 'three/src/extras/core/Curve.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { ThBufferGeometry } from './ThBufferGeometry'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/ThUnrealBloomPass.ts b/projects/ngx-three/src/lib/generated/ThUnrealBloomPass.ts index 1997214..9207d6c 100644 --- a/projects/ngx-three/src/lib/generated/ThUnrealBloomPass.ts +++ b/projects/ngx-three/src/lib/generated/ThUnrealBloomPass.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -15,11 +16,11 @@ import { MeshBasicMaterial, ShaderMaterial, Vector2, - Vector3, WebGLRenderTarget, } from 'three'; import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js'; import { UnrealBloomPass } from 'three/examples/jsm/postprocessing/UnrealBloomPass.js'; +import { Vector3 } from 'three/src/math/Vector3.js'; import { ThPassBase } from '../ThPassBase'; import { applyValue } from '../util'; import { ThPass } from './ThPass'; diff --git a/projects/ngx-three/src/lib/generated/ThVideoTexture.ts b/projects/ngx-three/src/lib/generated/ThVideoTexture.ts index eb9bb27..ccc0173 100644 --- a/projects/ngx-three/src/lib/generated/ThVideoTexture.ts +++ b/projects/ngx-three/src/lib/generated/ThVideoTexture.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -8,15 +9,15 @@ import { Type, forwardRef, } from '@angular/core'; +import { VideoTexture } from 'three'; import { MagnificationTextureFilter, Mapping, MinificationTextureFilter, PixelFormat, TextureDataType, - VideoTexture, Wrapping, -} from 'three'; +} from 'three/src/constants.js'; import { ThTextureBase } from '../ThTextureBase'; import { ThTexture } from './ThTexture'; diff --git a/projects/ngx-three/src/lib/generated/ThWireframeGeometry.ts b/projects/ngx-three/src/lib/generated/ThWireframeGeometry.ts index 9866540..1915a2d 100644 --- a/projects/ngx-three/src/lib/generated/ThWireframeGeometry.ts +++ b/projects/ngx-three/src/lib/generated/ThWireframeGeometry.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -7,11 +8,8 @@ import { Type, forwardRef, } from '@angular/core'; -import { - BufferGeometry, - NormalBufferAttributes, - WireframeGeometry, -} from 'three'; +import { NormalBufferAttributes, WireframeGeometry } from 'three'; +import { BufferGeometry } from 'three/src/core/BufferGeometry.js'; import { ThBufferGeometry } from './ThBufferGeometry'; @Component({ diff --git a/projects/ngx-three/src/lib/generated/overrides/ThTransformControls.ts b/projects/ngx-three/src/lib/generated/overrides/ThTransformControls.ts index f7d1fd4..769268d 100644 --- a/projects/ngx-three/src/lib/generated/overrides/ThTransformControls.ts +++ b/projects/ngx-three/src/lib/generated/overrides/ThTransformControls.ts @@ -67,14 +67,14 @@ export class ThTransformControls< }; public addToParent(): void { - if (this._objRef && !this._objRef.parent) { - this.scene?.objRef?.add(this._objRef); + if (this._objRef && !this._objRef.object) { + this.scene?.objRef?.add(this._objRef.object); } } public removeFromParent(): void { if (this._objRef) { - this.scene?.objRef?.remove(this._objRef); + this.scene?.objRef?.remove(this._objRef.object); } } diff --git a/projects/ngx-three/src/lib/generator/ImportOrganizer.ts b/projects/ngx-three/src/lib/generator/ImportOrganizer.ts index 28809f5..f7f47c4 100644 --- a/projects/ngx-three/src/lib/generator/ImportOrganizer.ts +++ b/projects/ngx-three/src/lib/generator/ImportOrganizer.ts @@ -1,59 +1,74 @@ import { existsSync, readFileSync } from 'fs'; import * as ts from 'typescript'; +import { normalize } from 'path'; class LanguageServiceHostImpl implements ts.LanguageServiceHost { - public name: string; - public content: string; + private files: { [fileName: string]: { content: string; version: number } } = {}; + public options: ts.CompilerOptions; - public getDefaultLibFileName = ts.getDefaultLibFileName; - /** - * Create a service host instance. - * - * @param name path to file - * @param content file content - */ - constructor(name: string, content: string) { - const tsconfig = ts.findConfigFile(name, ts.sys.fileExists); + constructor(public readonly basePath: string) { + // this.basePath = path.normalize(basePath); + const tsconfig = ts.findConfigFile(this.basePath, ts.sys.fileExists, 'tsconfig.lib.json'); const compilerOptions = tsconfig - ? ts.convertCompilerOptionsFromJson(ts.readConfigFile(tsconfig, ts.sys.readFile).config.compilerOptions, '..') - .options + ? ts.convertCompilerOptionsFromJson( + ts.readConfigFile(tsconfig, ts.sys.readFile).config.compilerOptions, + this.basePath, + ).options : ts.getDefaultCompilerOptions(); - this.name = name; - this.content = content; this.options = compilerOptions; } - readFile(path: string, encoding?: string | undefined): string | undefined { - const options = encoding !== undefined ? { encoding: encoding as BufferEncoding } : 'utf8'; - return readFileSync(path, options) as string | undefined; + + readFile(path: string, encoding?: string | undefined): string { + path = normalize(path); + const file = this.files[path]; + if (!file) { + const options = encoding !== undefined ? { encoding: encoding as BufferEncoding } : 'utf8'; + const content = readFileSync(path, options); + this.addFile(path, content); + return content; + } + + return file.content; + } + + addFile(fileName: string, content: string) { + this.files[fileName] = { content, version: 0 }; } - fileExists(path: string): boolean { - return existsSync(path); + + getScriptFileNames(): string[] { + return Object.keys(this.files); } - getNewLine() { - return '\n'; + getScriptVersion(fileName: string): string { + return this.files[fileName]?.version.toString() || '0'; } - getCurrentDirectory() { - return process.cwd(); + getScriptSnapshot(fileName: string): ts.IScriptSnapshot | undefined { + fileName = normalize(fileName); + const file = this.files[fileName]; + if (file) { + return ts.ScriptSnapshot.fromString(file.content); + } + return undefined; } - getCompilationSettings() { - return this.options; + getCurrentDirectory(): string { + return this.basePath; // process.cwd(); } - getScriptFileNames() { - return [this.name]; + getCompilationSettings(): ts.CompilerOptions { + return this.options; } - getScriptVersion() { - return ts.version; + getDefaultLibFileName(options: ts.CompilerOptions): string { + return ts.getDefaultLibFilePath(options); } - getScriptSnapshot() { - return ts.ScriptSnapshot.fromString(this.content); + fileExists(fileName: string): boolean { + fileName = normalize(fileName); + return !!this.files[fileName] || existsSync(fileName); } } @@ -66,12 +81,39 @@ const applyChanges = (input: string, changes: readonly ts.TextChange[]) => }, input); export class ImportOrganizer { - organizeImports(fileName: string, content: string) { - const host = new LanguageServiceHostImpl(fileName, content); - const ls = ts.createLanguageService(host); + private ls: ts.LanguageService; + private host: LanguageServiceHostImpl; + constructor(basePath: string) { + this.host = new LanguageServiceHostImpl(basePath); + this.ls = ts.createLanguageService(this.host); + } + + addFile(fileName: string, content: string) { + this.host.addFile(fileName, content); + } + + getFile(fileName: string) { + return this.host.readFile(fileName); + } + + organizeImports(fileName: string) { + fileName = normalize(fileName); + const fileChanges = this.ls.organizeImports({ type: 'file', fileName }, {}, {}); + const content = this.host.readFile(fileName); + if (fileChanges.length > 0 && content) { + this.host.addFile(fileName, applyChanges(content, fileChanges[0].textChanges)); + } + } - const fileChanges = ls.organizeImports({ type: 'file', fileName }, {}, {}); + addMissingImports(fileName: string) { + fileName = normalize(fileName); + const combinedCodeFix = this.ls.getCombinedCodeFix({ type: 'file', fileName }, 'fixMissingImport', {}, {}); - return fileChanges.length > 0 ? applyChanges(content, fileChanges[0].textChanges) : content; + if (combinedCodeFix?.changes.length > 0) { + const content = this.host.readFile(fileName); + if (content) { + this.host.addFile(fileName, applyChanges(content, combinedCodeFix.changes[0].textChanges)); + } + } } } diff --git a/projects/ngx-three/src/lib/generator/NgxThreeClass.ts b/projects/ngx-three/src/lib/generator/NgxThreeClass.ts index 7bbf98e..7ac487b 100644 --- a/projects/ngx-three/src/lib/generator/NgxThreeClass.ts +++ b/projects/ngx-three/src/lib/generator/NgxThreeClass.ts @@ -86,6 +86,7 @@ export abstract class NgxThreeClass { this.imports.add("import { applyValue } from '../util';"); const ngxClassDeclarationString = ` + /* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable no-underscore-dangle */ /* eslint-disable @angular-eslint/component-selector, @angular-eslint/component-class-suffix */ @@ -125,7 +126,7 @@ export abstract class NgxThreeClass { */ public abstract getWrapperBaseClassName(): string; - public useWrapperBaseClassNameForBaseClass(potentialBaseClass: string) { + public useWrapperBaseClassNameForBaseClass(potentialBaseClass: string): boolean { return 'EventDispatcher' === potentialBaseClass; } @@ -243,7 +244,7 @@ export abstract class NgxThreeClass { let str = ` @Input() - public set ${memberName}( value: ${typeName ?? member.type?.getText()}`; + public set ${memberName}( value: ${this.sanitizeMemberType(typeName ?? member.type?.getText())}`; if (setters.length === 0) { // no setter just set it @@ -315,7 +316,7 @@ export abstract class NgxThreeClass { } return ` - public get ${memberName}(): ( ${member.type?.getText()}) | undefined { + public get ${memberName}(): ( ${this.sanitizeMemberType(member.type?.getText())}) | undefined { return this._objRef?.${memberName}; }`; } @@ -381,6 +382,10 @@ export abstract class NgxThreeClass { } const importPath = path.normalize(path.join(path.dirname(srcFilePath), importStatementFrom)).replace(/\\/g, '/'); + return `${importStatement.substring(0, fromPos)} from "${importPath.substring( + importPath.search('@types/three/') + 7, + )}";`; + /* let strFrom = ' "three";'; if (importPath.search('node_modules/@types/three/examples') >= 0) { strFrom = " '" + importPath.substr(importPath.search('three/examples/jsm')).replace('.d.ts', '') + "';"; @@ -388,6 +393,7 @@ export abstract class NgxThreeClass { importStatement = importStatement.substr(0, fromPos) + ' from ' + strFrom; return importStatement; + */ } protected getImportPathForSourceFile(srcFile: ts.SourceFile) { @@ -477,4 +483,8 @@ export abstract class NgxThreeClass { return `public getType(): Type<${this.wrappedClassName}${this.wrappedClassGenericTypeNames}> { return ${this.wrappedClassName}; };`; } + + protected sanitizeMemberType(type?: string) { + return type?.replace(': this', ': T'); + } } diff --git a/projects/ngx-three/src/lib/generator/NgxThreeControl.ts b/projects/ngx-three/src/lib/generator/NgxThreeControl.ts index 2093afe..b404577 100644 --- a/projects/ngx-three/src/lib/generator/NgxThreeControl.ts +++ b/projects/ngx-three/src/lib/generator/NgxThreeControl.ts @@ -53,7 +53,7 @@ export class NgxThreeControl extends NgxThreeClass { } protected generateClassHeader() { - // TransformControl is derived from object3d but we need the ThControlBase wrapper - return super.generateClassHeader().replace('extends ThObject3D', 'extends ThControlBase'); + // TransformControl is derived from Control but we need the ThControlBase wrapper + return super.generateClassHeader().replace('extends ThControls<', 'extends ThControlBase<'); } } diff --git a/projects/ngx-three/src/lib/generator/generateComponents.ts b/projects/ngx-three/src/lib/generator/generateComponents.ts index 092beba..e3ffaa1 100644 --- a/projects/ngx-three/src/lib/generator/generateComponents.ts +++ b/projects/ngx-three/src/lib/generator/generateComponents.ts @@ -1,6 +1,7 @@ import { existsSync, readFileSync, promises } from 'fs'; -import { join } from 'path'; +import { join, normalize } from 'path'; import * as ts from 'typescript'; + import { NgxThreeClass } from './NgxThreeClass'; import { NgxThreeModuleGen } from './NgxThreeModuleGen'; import * as prettier from 'prettier'; @@ -13,27 +14,31 @@ import { NgxThreeControl } from './NgxThreeControl'; import { NgxThreeBarrelGen } from './NgxThreeBarrelGen'; import { NgxThreePass } from './NgxThreePass'; import { NgxThreeTexture } from './NgxThreeTexture'; +import { ESLint } from 'eslint'; class NgxThreeClassGenerator { - public readonly baseOutPath = join(__dirname, '../generated/'); + public readonly baseOutPath = normalize(join(__dirname, '../generated/')); public readonly ngxThreeClassMap = new Map(); private typeChecker?: ts.TypeChecker; + public readonly importOrganizer = new ImportOrganizer(this.baseOutPath); + constructor() {} async execute() { await Promise.allSettled([ - generator.generateControls(), - generator.generateObjects(), - generator.generateMaterials(), - generator.generateGeometries(), - generator.generatePasses(), - generator.generateTextures(), + this.generateControls(), + this.generateObjects(), + this.generateMaterials(), + this.generateGeometries(), + this.generatePasses(), + this.generateTextures(), ]); return Promise.allSettled([ - generator.generateNgxModule(Array.from(generator.ngxThreeClassMap.values())), - generator.generateNgxBarrelFile(Array.from(generator.ngxThreeClassMap.values())), + this.generateNgxModule(Array.from(this.ngxThreeClassMap.values())), + this.generateNgxBarrelFile(Array.from(this.ngxThreeClassMap.values())), + // this.fixLint(), ]); } @@ -101,11 +106,24 @@ class NgxThreeClassGenerator { return this.writeFile('index', ngxBarrel.content); } + public async fixLint() { + const eslint = new ESLint({ fix: true, useEslintrc: true }); + const results = await eslint.lintFiles(this.baseOutPath); + + // Apply automatic fixes and output fixed code + await ESLint.outputFixes(results); + console.log(results); + } + private async writeFile(fileName: string, content: string) { + const filePath = normalize(this.baseOutPath + fileName + '.ts'); try { - const organizer = new ImportOrganizer(); - content = organizer.organizeImports(this.baseOutPath + fileName + '.ts', content); - content = await prettier.format(content, { + this.importOrganizer.addFile(filePath, content); + + this.importOrganizer.organizeImports(filePath); + // this.importOrganizer.addMissingImports(filePath); + + content = await prettier.format(this.importOrganizer.getFile(filePath), { parser: 'babel-ts', singleQuote: true, }); @@ -113,7 +131,7 @@ class NgxThreeClassGenerator { console.log(`error creating file: ${fileName}`, e); } - return promises.writeFile(join(this.baseOutPath, fileName + '.ts'), content); + return promises.writeFile(filePath, content); } private doesFileExist(fileName: string): boolean { diff --git a/projects/ngx-three/src/lib/generator/geometry_extra_types.ts b/projects/ngx-three/src/lib/generator/geometry_extra_types.ts index 0d74f27..9324f9b 100644 --- a/projects/ngx-three/src/lib/generator/geometry_extra_types.ts +++ b/projects/ngx-three/src/lib/generator/geometry_extra_types.ts @@ -1,7 +1,6 @@ export * from 'three/examples/jsm/geometries/BoxLineGeometry'; export * from 'three/examples/jsm/geometries/ConvexGeometry'; export * from 'three/examples/jsm/geometries/DecalGeometry'; -export * from 'three/examples/jsm/geometries/LightningStrike'; export * from 'three/examples/jsm/geometries/ParametricGeometries'; export * from 'three/examples/jsm/geometries/ParametricGeometry'; export * from 'three/examples/jsm/geometries/RoundedBoxGeometry'; diff --git a/projects/ngx-three/src/lib/generator/three_types.ts b/projects/ngx-three/src/lib/generator/three_types.ts index c247d82..c691d04 100644 --- a/projects/ngx-three/src/lib/generator/three_types.ts +++ b/projects/ngx-three/src/lib/generator/three_types.ts @@ -11,10 +11,7 @@ type MissingInThreeRuntimeExports = | THREE.WebGLInfo | THREE.WebGLProperties | THREE.WebGLRenderList - | THREE.WebGLRenderLists - | THREE.WebGLColorBuffer - | THREE.WebGLDepthBuffer - | THREE.WebGLStencilBuffer; + | THREE.WebGLRenderLists; type InterestingThreeExports = OmitByValue; diff --git a/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.spec.ts b/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.spec.ts index 8f04ee8..d4dc91e 100644 --- a/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.spec.ts +++ b/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.spec.ts @@ -2,7 +2,7 @@ import { Object3D, Object3DEventMap } from 'three'; import { createLazyObject3DProxy, LazyObject3DProxy } from './LazyObject3dProxy'; describe('LazyObj3DProxy', () => { - let proxy: LazyObject3DProxy; + let proxy: LazyObject3DProxy<{ click: { customAttr: string } } & Object3DEventMap>; beforeEach(async () => { proxy = createLazyObject3DProxy(); @@ -89,7 +89,7 @@ describe('LazyObj3DProxy', () => { }); it('should remove event listeners of the real object3D when it is applied', () => { - const obj = new Object3D(); + const obj = new Object3D<{ click: { customAttr: string } } & Object3DEventMap>(); expect(obj.children.length).toBe(0); const listener = () => {}; diff --git a/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.ts b/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.ts index 3418532..455e77e 100644 --- a/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.ts +++ b/projects/ngx-three/src/lib/loaders/LazyObject3dProxy.ts @@ -1,4 +1,4 @@ -import { Object3D, Event } from 'three'; +import { Object3D, Event, Object3DEventMap } from 'three'; import { applyValue, isSettable } from '../util'; class Object3DProxyHandler implements ProxyHandler { @@ -111,7 +111,10 @@ class Object3DProxyHandler implements ProxyHandler { * @param type The type of event to listen to. * @param listener The function that gets called when the event is fired. */ - addEventListener = (type: string, listener: (event: Event) => void): void => { + addEventListener = >( + type: T, + listener: (event: Event) => void, + ): void => { let arr = this.eventListener[type]; if (!arr) { arr = []; @@ -144,16 +147,18 @@ class Object3DProxyHandler implements ProxyHandler { }; } -export interface LazyObject3DProxy extends Object3D { +export interface LazyObject3DProxy extends Object3D { // eslint-disable-next-line @typescript-eslint/naming-convention readonly __isProxy?: boolean; objRef?: Object3D; applyToObject3D(real: Object3D): void; } -export function createLazyObject3DProxy(target = new Object3D()): LazyObject3DProxy { +export function createLazyObject3DProxy( + target = new Object3D(), +): LazyObject3DProxy { const handler = new Object3DProxyHandler(target); - return new Proxy(handler as unknown as LazyObject3DProxy, handler); + return new Proxy>(handler as unknown as LazyObject3DProxy, handler); } export function isLazyObject3dProxy(object: Object3D | LazyObject3DProxy): object is LazyObject3DProxy { diff --git a/projects/ngx-three/src/lib/loaders/data-texture/ThLogLuvLoader.ts b/projects/ngx-three/src/lib/loaders/data-texture/ThLogLuvLoader.ts deleted file mode 100644 index bff99c4..0000000 --- a/projects/ngx-three/src/lib/loaders/data-texture/ThLogLuvLoader.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Directive, Host, Injectable, NgZone, Pipe, PipeTransform } from '@angular/core'; -import { ThDataTexture } from '../../generated/ThDataTexture'; -import { LogLuvLoader } from 'three/examples/jsm/loaders/LogLuvLoader.js'; -import { - ThCallbackLoaderBaseDirective, - ThCallbackLoaderBasePipe, - ThCallbackLoaderService, -} from '../ThCallbackLoaderBase'; -import { DataTexture } from 'three'; - -@Injectable({ - providedIn: 'root', -}) -export class LogLuvLoaderService extends ThCallbackLoaderService { - public clazz = LogLuvLoader; -} - -@Pipe({ - name: 'loadLogLuvTexture', - pure: true, -}) -export class ThLogLuvLoaderPipe extends ThCallbackLoaderBasePipe implements PipeTransform { - constructor(protected service: LogLuvLoaderService) { - super(); - } -} - -@Directive({ - selector: '[loadLogLuvTexture]', -}) -export class ThLogLuvLoaderDirective extends ThCallbackLoaderBaseDirective { - constructor( - @Host() protected host: ThDataTexture, - protected zone: NgZone, - protected service: LogLuvLoaderService, - ) { - super(host, zone); - } -} diff --git a/projects/ngx-three/src/lib/loaders/data-texture/ThUltraHDRLoader.ts b/projects/ngx-three/src/lib/loaders/data-texture/ThUltraHDRLoader.ts new file mode 100644 index 0000000..00e7676 --- /dev/null +++ b/projects/ngx-three/src/lib/loaders/data-texture/ThUltraHDRLoader.ts @@ -0,0 +1,39 @@ +import { Directive, Host, Injectable, NgZone, Pipe, PipeTransform } from '@angular/core'; +import { ThDataTexture } from '../../generated/ThDataTexture'; +import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js'; +import { + ThCallbackLoaderBaseDirective, + ThCallbackLoaderBasePipe, + ThCallbackLoaderService, +} from '../ThCallbackLoaderBase'; +import { DataTexture } from 'three'; + +@Injectable({ + providedIn: 'root', +}) +export class UltraHDRLoaderService extends ThCallbackLoaderService { + public clazz = UltraHDRLoader; +} + +@Pipe({ + name: 'loadUltraHDRTexture', + pure: true, +}) +export class ThUltraHDRLoaderPipe extends ThCallbackLoaderBasePipe implements PipeTransform { + constructor(protected service: UltraHDRLoaderService) { + super(); + } +} + +@Directive({ + selector: '[loadUltraHDRTexture]', +}) +export class ThUltraHDRLoaderDirective extends ThCallbackLoaderBaseDirective { + constructor( + @Host() protected host: ThDataTexture, + protected zone: NgZone, + protected service: UltraHDRLoaderService, + ) { + super(host, zone); + } +} diff --git a/projects/ngx-three/src/lib/ngx-three.module.ts b/projects/ngx-three/src/lib/ngx-three.module.ts index 853c1de..4505168 100644 --- a/projects/ngx-three/src/lib/ngx-three.module.ts +++ b/projects/ngx-three/src/lib/ngx-three.module.ts @@ -25,7 +25,7 @@ import { ThObjectBase } from './ThObjectBase'; import { ThView } from './ThView'; import { ThWrapperBase } from './ThWrapperBase'; import { ThFBXLoaderDirective, ThFBXLoaderPipe } from './loaders/ThFBXLoader'; -import { ThLogLuvLoaderDirective, ThLogLuvLoaderPipe } from './loaders/data-texture/ThLogLuvLoader'; +import { ThUltraHDRLoaderDirective, ThUltraHDRLoaderPipe } from './loaders/data-texture/ThUltraHDRLoader'; import { ThPLYLoaderDirective, ThPLYLoaderPipe } from './loaders/ThPLYLoader'; import { BindPipe } from './pipes/bind.pipe'; import { HtmlComponent } from './extra/web/html.component'; @@ -83,8 +83,8 @@ import { RendererProviderDirective } from './renderer/renderer-providers'; ThRGBMLoaderPipe, ThTGALoaderDirective, ThTGALoaderPipe, - ThLogLuvLoaderDirective, - ThLogLuvLoaderPipe, + ThUltraHDRLoaderDirective, + ThUltraHDRLoaderPipe, // directives RefByIdDirective, RendererProviderDirective, @@ -138,8 +138,8 @@ import { RendererProviderDirective } from './renderer/renderer-providers'; ThRGBMLoaderPipe, ThTGALoaderDirective, ThTGALoaderPipe, - ThLogLuvLoaderDirective, - ThLogLuvLoaderPipe, + ThUltraHDRLoaderDirective, + ThUltraHDRLoaderPipe, // directives RefByIdDirective, RendererProviderDirective, diff --git a/projects/ngx-three/src/public-api.ts b/projects/ngx-three/src/public-api.ts index 9766cdb..d2a2ff8 100644 --- a/projects/ngx-three/src/public-api.ts +++ b/projects/ngx-three/src/public-api.ts @@ -54,7 +54,7 @@ export * from './lib/loaders/data-texture/ThEXRLoader'; export * from './lib/loaders/data-texture/ThRGBELoader'; export * from './lib/loaders/data-texture/ThRGBMLoader'; export * from './lib/loaders/data-texture/ThTGALoader'; -export * from './lib/loaders/data-texture/ThLogLuvLoader'; +export * from './lib/loaders/data-texture/ThUltraHDRLoader'; export * from './lib/loaders/ThPLYLoader'; export * from './lib/directives/ref-by-id.directive'; diff --git a/tsconfig.json b/tsconfig.json index 28028d1..2c0a265 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "compileOnSave": false, "compilerOptions": { + "skipLibCheck": true, "baseUrl": "./", "outDir": "./dist/out-tsc", "forceConsistentCasingInFileNames": true, @@ -22,7 +23,8 @@ "paths": { "ngx-three": [ "projects/ngx-three/src/public-api.ts" - ] + ], + "three/webgpu": ["./node_modules/@types/three/build/three.webgpu.d.ts"] }, "useDefineForClassFields": false },