angular-three 2.0.0-beta.270 → 2.0.0-beta.271

package/lib/canvas.d.ts

@@ -93,8 +93,8 @@ export declare class NgtCanvas {
         name?: string | undefined;
         readonly type?: string | undefined;
         attach: string | string[] | import("angular-three").NgtAttachFunction;
-        addEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<Camera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<Camera, typeof Camera>, ev: import("./three-types").NgtNodeEventMap<Camera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtObject3DEventsMap[TEventKey]) => any) => void);
-        removeEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<Camera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<Camera, typeof Camera>, ev: import("./three-types").NgtNodeEventMap<Camera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtObject3DEventsMap[TEventKey]) => any) => void);
+        addEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<Camera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<Camera, typeof Camera>, ev: import("./three-types").NgtNodeEventMap<Camera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
+        removeEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<Camera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<Camera, typeof Camera>, ev: import("./three-types").NgtNodeEventMap<Camera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
         __ngt_args__: [];
         readonly isCamera?: true | undefined;
         matrixWorldInverse?: import("three").Matrix4 | undefined;
@@ -191,8 +191,8 @@ export declare class NgtCanvas {
         name?: string | undefined;
         readonly type?: string | undefined;
         attach: string | string[] | import("angular-three").NgtAttachFunction;
-        addEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<PerspectiveCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<PerspectiveCamera, typeof PerspectiveCamera>, ev: import("./three-types").NgtNodeEventMap<PerspectiveCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtObject3DEventsMap[TEventKey]) => any) => void);
-        removeEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<PerspectiveCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<PerspectiveCamera, typeof PerspectiveCamera>, ev: import("./three-types").NgtNodeEventMap<PerspectiveCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtObject3DEventsMap[TEventKey]) => any) => void);
+        addEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<PerspectiveCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<PerspectiveCamera, typeof PerspectiveCamera>, ev: import("./three-types").NgtNodeEventMap<PerspectiveCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
+        removeEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<PerspectiveCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<PerspectiveCamera, typeof PerspectiveCamera>, ev: import("./three-types").NgtNodeEventMap<PerspectiveCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
         __ngt_args__: [fov?: number | undefined, aspect?: number | undefined, near?: number | undefined, far?: number | undefined];
         readonly isCamera?: true | undefined;
         matrixWorldInverse?: import("three").Matrix4 | undefined;
@@ -318,8 +318,8 @@ export declare class NgtCanvas {
         name?: string | undefined;
         readonly type?: string | undefined;
         attach: string | string[] | import("angular-three").NgtAttachFunction;
-        addEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<OrthographicCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<OrthographicCamera, typeof OrthographicCamera>, ev: import("./three-types").NgtNodeEventMap<OrthographicCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtObject3DEventsMap[TEventKey]) => any) => void);
-        removeEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<OrthographicCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<OrthographicCamera, typeof OrthographicCamera>, ev: import("./three-types").NgtNodeEventMap<OrthographicCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtObject3DEventsMap[TEventKey]) => any) => void);
+        addEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<OrthographicCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<OrthographicCamera, typeof OrthographicCamera>, ev: import("./three-types").NgtNodeEventMap<OrthographicCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
+        removeEventListener: (<TEventKey extends keyof import("./three-types").NgtNodeEventMap<OrthographicCamera>>(type: TEventKey, listener: (this: import("./three-types").NgtNodeElement<OrthographicCamera, typeof OrthographicCamera>, ev: import("./three-types").NgtNodeEventMap<OrthographicCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("./three-types").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("./three-types").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
         __ngt_args__: [left?: number | undefined, right?: number | undefined, top?: number | undefined, bottom?: number | undefined, near?: number | undefined, far?: number | undefined];
         readonly isCamera?: true | undefined;
         matrixWorldInverse?: import("three").Matrix4 | undefined;

package/lib/three-types.d.ts

@@ -1,4 +1,4 @@
-import { AmbientLight, ArrayCamera, ArrowHelper, Audio, AxesHelper, Bone, Box3Helper, BoxGeometry, BoxHelper, BufferAttribute, BufferGeometry, Camera, CameraHelper, CanvasTexture, CapsuleGeometry, CircleGeometry, Color, ColorRepresentation, CompressedTexture, ConeGeometry, CubeCamera, CubeTexture, CylinderGeometry, Data3DTexture, DataTexture, DepthTexture, DirectionalLight, DirectionalLightHelper, DirectionalLightShadow, DodecahedronGeometry, EdgesGeometry, Euler, ExtrudeGeometry, Float16BufferAttribute, Float32BufferAttribute, Fog, FogExp2, GridHelper, Group, HemisphereLight, HemisphereLightHelper, IcosahedronGeometry, InstancedBufferAttribute, InstancedBufferGeometry, InstancedMesh, Int16BufferAttribute, Int32BufferAttribute, Int8BufferAttribute, LOD, LatheGeometry, Layers, Light, LightProbe, LightShadow, Line, LineBasicMaterial, LineBasicMaterialParameters, LineDashedMaterial, LineDashedMaterialParameters, LineLoop, LineSegments, Material, Matrix3, Matrix4, Mesh, MeshBasicMaterial, MeshBasicMaterialParameters, MeshDepthMaterial, MeshDepthMaterialParameters, MeshDistanceMaterial, MeshDistanceMaterialParameters, MeshLambertMaterial, MeshLambertMaterialParameters, MeshMatcapMaterial, MeshMatcapMaterialParameters, MeshNormalMaterial, MeshNormalMaterialParameters, MeshPhongMaterial, MeshPhongMaterialParameters, MeshPhysicalMaterial, MeshPhysicalMaterialParameters, MeshStandardMaterial, MeshStandardMaterialParameters, MeshToonMaterial, MeshToonMaterialParameters, Object3D, OctahedronGeometry, OrthographicCamera, PerspectiveCamera, PlaneGeometry, PlaneHelper, PointLight, PointLightHelper, Points, PointsMaterial, PointsMaterialParameters, PolarGridHelper, PolyhedronGeometry, PositionalAudio, Quaternion, RawShaderMaterial, Raycaster, RectAreaLight, RingGeometry, Scene, ShaderMaterial, ShaderMaterialParameters, ShadowMaterial, Shape, ShapeGeometry, Skeleton, SkeletonHelper, SkinnedMesh, SphereGeometry, SpotLight, SpotLightHelper, SpotLightShadow, Sprite, SpriteMaterial, SpriteMaterialParameters, TetrahedronGeometry, Texture, TorusGeometry, TorusKnotGeometry, TubeGeometry, Uint16BufferAttribute, Uint32BufferAttribute, Uint8BufferAttribute, Vector2, Vector3, Vector4, VideoTexture, WireframeGeometry } from 'three';
+import { AmbientLight, ArrayCamera, ArrowHelper, Audio, AxesHelper, BatchedMesh, Bone, Box3Helper, BoxGeometry, BoxHelper, BufferAttribute, BufferGeometry, Camera, CameraHelper, CanvasTexture, CapsuleGeometry, CircleGeometry, Color, ColorRepresentation, CompressedTexture, ConeGeometry, CubeCamera, CubeTexture, CylinderGeometry, Data3DTexture, DataTexture, DepthTexture, DirectionalLight, DirectionalLightHelper, DirectionalLightShadow, DodecahedronGeometry, EdgesGeometry, Euler, ExtrudeGeometry, Float16BufferAttribute, Float32BufferAttribute, Fog, FogExp2, GridHelper, Group, HemisphereLight, HemisphereLightHelper, IcosahedronGeometry, InstancedBufferAttribute, InstancedBufferGeometry, InstancedMesh, Int16BufferAttribute, Int32BufferAttribute, Int8BufferAttribute, LOD, LatheGeometry, Layers, Light, LightProbe, LightShadow, Line, LineBasicMaterial, LineBasicMaterialParameters, LineDashedMaterial, LineDashedMaterialParameters, LineLoop, LineSegments, Material, Matrix3, Matrix4, Mesh, MeshBasicMaterial, MeshBasicMaterialParameters, MeshDepthMaterial, MeshDepthMaterialParameters, MeshDistanceMaterial, MeshDistanceMaterialParameters, MeshLambertMaterial, MeshLambertMaterialParameters, MeshMatcapMaterial, MeshMatcapMaterialParameters, MeshNormalMaterial, MeshNormalMaterialParameters, MeshPhongMaterial, MeshPhongMaterialParameters, MeshPhysicalMaterial, MeshPhysicalMaterialParameters, MeshStandardMaterial, MeshStandardMaterialParameters, MeshToonMaterial, MeshToonMaterialParameters, Object3D, OctahedronGeometry, OrthographicCamera, PerspectiveCamera, PlaneGeometry, PlaneHelper, PointLight, PointLightHelper, Points, PointsMaterial, PointsMaterialParameters, PolarGridHelper, PolyhedronGeometry, PositionalAudio, Quaternion, RawShaderMaterial, Raycaster, RectAreaLight, RingGeometry, Scene, ShaderMaterial, ShaderMaterialParameters, ShadowMaterial, Shape, ShapeGeometry, Skeleton, SkeletonHelper, SkinnedMesh, SphereGeometry, SpotLight, SpotLightHelper, SpotLightShadow, Sprite, SpriteMaterial, SpriteMaterialParameters, TetrahedronGeometry, Texture, TorusGeometry, TorusKnotGeometry, TubeGeometry, Uint16BufferAttribute, Uint32BufferAttribute, Uint8BufferAttribute, Vector2, Vector3, Vector4, VideoTexture, WireframeGeometry } from 'three';
 import { NgtEventHandlers } from './events';
 import { NgtAfterAttach, NgtAttachFunction, NgtInstanceNode } from './instance';
 import { NgtBeforeRenderEvent } from './store';
@@ -43,6 +43,7 @@ export type NgtNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOriginal>> = Ex
 export type NgtObject3DEventsMap = {
     [TEvent in keyof NgtEventHandlers]-?: Parameters<NonNullable<NgtEventHandlers[TEvent]>>[0];
 };
+export type NgtAllObject3DEventsMap = NgtObject3DEventsMap & NgtNodeEventMap<NgtInstanceNode>;
 export type NgtObject3DNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOriginal>> = Expand<NgtOverwrite<NgtNode<TOriginal, TConstructor, TNoEvent>, {
     position: NgtVector3;
     up: NgtVector3;
@@ -52,8 +53,8 @@ export type NgtObject3DNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOrigina
     quaternion: NgtQuaternion;
     layers: NgtLayers;
     dispose: (() => void) | null;
-    addEventListener<TEventKey extends keyof NgtObject3DEventsMap>(type: TEventKey, listener: (this: NgtObject3DNode<TOriginal, TConstructor>, ev: NgtObject3DEventsMap[TEventKey]) => any): void;
-    removeEventListener<TEventKey extends keyof NgtObject3DEventsMap>(type: TEventKey, listener: (this: NgtObject3DNode<TOriginal, TConstructor>, ev: NgtObject3DEventsMap[TEventKey]) => any): void;
+    addEventListener<TEventKey extends keyof NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: NgtObject3DNode<TOriginal, TConstructor>, ev: NgtAllObject3DEventsMap[TEventKey]) => any): void;
+    removeEventListener<TEventKey extends keyof NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: NgtObject3DNode<TOriginal, TConstructor>, ev: NgtAllObject3DEventsMap[TEventKey]) => any): void;
 }>>;
 export type NgtGeometry<TGeometry extends BufferGeometry, TConstructor> = NgtNode<TGeometry, TConstructor>;
 export type NgtMaterial<TMaterial extends Material, TConstructor> = NgtNode<TMaterial, TConstructor>;
@@ -64,6 +65,7 @@ export type NgtAudioListener = NgtObject3DNode<AudioListener, typeof AudioListen
 export type NgtPositionalAudio = NgtObject3DNode<PositionalAudio, typeof PositionalAudio>;
 export type NgtMesh = NgtObject3DNode<Mesh, typeof Mesh>;
 export type NgtInstancedMesh = NgtObject3DNode<InstancedMesh, typeof InstancedMesh>;
+export type NgtBatchedMesh = NgtObject3DNode<BatchedMesh, typeof BatchedMesh>;
 export type NgtScene = NgtObject3DNode<Scene, typeof Scene>;
 export type NgtSprite = NgtObject3DNode<Sprite, typeof Sprite>;
 export type NgtLOD = NgtObject3DNode<LOD, typeof LOD>;
@@ -299,5 +301,7 @@ export interface ThreeElements {
 declare global {
     interface HTMLElementTagNameMap extends ThreeElements {
     }
+    interface HTMLElementEventMap extends NgtNodeEventMap<NgtInstanceNode> {
+    }
 }
 export {};

package/lib/utils/make.d.ts

@@ -8,12 +8,8 @@ export declare function makeDpr(dpr: NgtDpr, window?: Window): number;
 export declare function makeRendererInstance<TCanvas extends NgtCanvasElement>(glOptions: NgtGLOptions, canvas: TCanvas): WebGLRenderer;
 export declare function makeCameraInstance(isOrthographic: boolean, size: NgtSize): OrthographicCamera | PerspectiveCamera;
 export type NgtObjectMap = {
-    nodes: {
-        [name: string]: Object3D;
-    };
-    materials: {
-        [name: string]: Material;
-    };
+    nodes: Record<string, Object3D<any>>;
+    materials: Record<string, Material>;
     [key: string]: any;
 };
 export declare function makeObjectGraph(object: Object3D): NgtObjectMap;