@ma2yama/ar.js 3.4.9-beta.0 → 3.4.9-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ma2yama/ar.js",
3
- "version": "3.4.9-beta.0",
3
+ "version": "3.4.9-beta.2",
4
4
  "description": "Efficient Augmented Reality for the Web",
5
5
  "main": "./aframe/build/aframe-ar.js",
6
6
  "publishConfig": {
@@ -1,7 +1,7 @@
1
- import { Camera, EventDispatcher, Object3D, Scene} from 'three';
1
+ import { Camera, EventDispatcher, Object3D, Scene, WebGLRenderer} from 'three';
2
2
 
3
3
  export class WebcamRenderer {
4
- constructor(renderer: THREE.WebGLRenderer, videoElement?: string | HTMLVideoElement);
4
+ constructor(renderer: WebGLRenderer, videoElement?: string | HTMLVideoElement);
5
5
  update(): void;
6
6
  dispose(): void;
7
7
  createErrorPopup(msg: string): void;
@@ -1,4 +1,4 @@
1
- import { Camera, EventDispatcher, Object3D, WebGLRenderer, Matrix4, Mesh, Group, Texture } from 'three';
1
+ import { Camera, EventDispatcher, Object3D, WebGLRenderer, Matrix4, Mesh, Group, Texture, Intersection } from 'three';
2
2
 
3
3
  export interface ArToolkitContextParameters {
4
4
  trackingBackend?: 'artoolkit';
@@ -14,13 +14,37 @@ export interface ArToolkitContextParameters {
14
14
  imageSmoothingEnabled?: boolean;
15
15
  }
16
16
 
17
+ export interface ArToolkitContextArControllerArtoolkit {
18
+ AR_TEMPLATE_MATCHING_COLOR: number;
19
+ AR_TEMPLATE_MATCHING_COLOR_AND_MATRIX: number;
20
+ AR_TEMPLATE_MATCHING_MONO: number;
21
+ AR_TEMPLATE_MATCHING_MONO_AND_MATRIX: number;
22
+ AR_MATRIX_CODE_3x3: number;
23
+ AR_MATRIX_CODE_3x3_HAMMING63: number;
24
+ AR_MATRIX_CODE_3x3_PARITY65: number;
25
+ AR_MATRIX_CODE_4x4: number;
26
+ AR_MATRIX_CODE_4x4_BCH_13_9_3: number;
27
+ AR_MATRIX_CODE_4x4_BCH_13_5_5: number;
28
+ AR_MATRIX_CODE_5x5_BCH_22_12_5: number;
29
+ AR_MATRIX_CODE_5x5_BCH_22_7_7: number;
30
+ AR_MATRIX_CODE_5x5: number;
31
+ AR_MATRIX_CODE_6x6: number;
32
+ }
33
+
34
+ export interface ArToolkitContextArController {
35
+ ctx: CanvasRenderingContext2D;
36
+ debugSetup(): void;
37
+ canvas: HTMLCanvasElement;
38
+ artoolkit: ArToolkitContextArControllerArtoolkit;
39
+ }
40
+
17
41
  export class ArToolkitContext extends EventDispatcher {
18
42
  constructor(parameters?: ArToolkitContextParameters);
19
43
  static baseURL: string;
20
44
  static REVISION: string;
21
45
  parameters: ArToolkitContextParameters;
22
46
  initialized: boolean;
23
- arController: any; // TODO: Define proper type for ARController
47
+ arController: ArToolkitContextArController;
24
48
  _arMarkersControls: ArMarkerControls[];
25
49
  _updatedAt: number | null;
26
50
  _artoolkitProjectionAxisTransformMatrix: Matrix4;
@@ -63,7 +87,7 @@ export class ArBaseControls extends EventDispatcher {
63
87
  constructor(object3d: Object3D);
64
88
  id: number;
65
89
  object3d: Object3D;
66
- update(): void;
90
+ update(targetObject3d?: Object3D): void;
67
91
  name(): string;
68
92
  }
69
93
 
@@ -184,6 +208,6 @@ export class MarkersAreaLearning {
184
208
  export class ARClickability {
185
209
  constructor(sourceElement: HTMLElement);
186
210
  onResize(): void;
187
- computeIntersects(domEvent: MouseEvent, objects: Object3D[]): any[];
211
+ computeIntersects(domEvent: MouseEvent, objects: Object3D[]): Intersection[];
188
212
  update(): void;
189
213
  }