@galacean/engine-xr 0.0.0-experimental-1.3-xr.4 → 0.0.0-experimental-1.3-xr.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-xr",
-  "version": "0.0.0-experimental-1.3-xr.4",
+  "version": "0.0.0-experimental-1.3-xr.8",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -23,11 +23,11 @@
     "types/**/*"
   ],
   "devDependencies": {
-    "@galacean/engine-design": "0.0.0-experimental-1.3-xr.4",
-    "@galacean/engine": "0.0.0-experimental-1.3-xr.4"
+    "@galacean/engine-design": "0.0.0-experimental-1.3-xr.8",
+    "@galacean/engine": "0.0.0-experimental-1.3-xr.8"
   },
   "peerDependencies": {
-    "@galacean/engine": "0.0.0-experimental-1.3-xr.4"
+    "@galacean/engine": "0.0.0-experimental-1.3-xr.8"
   },
   "scripts": {
     "b:types": "tsc"

package/types/XRManagerExtended.d.ts

@@ -1,59 +1,12 @@
-import { Entity, XRManager } from "@galacean/engine";
+import { Entity } from "@galacean/engine";
 import { XRFeature } from "./feature/XRFeature";
 import { XRCameraManager } from "./feature/camera/XRCameraManager";
 import { XRInputManager } from "./input/XRInputManager";
 import { XRSessionManager } from "./session/XRSessionManager";
 import { XRSessionMode } from "./session/XRSessionMode";
-/**
- * XRManager is the entry point of the XR system.
- */
-export declare class XRManagerExtended extends XRManager {
-    /** Input manager for XR. */
-    inputManager: XRInputManager;
-    /** Session manager for XR. */
-    sessionManager: XRSessionManager;
-    /** Camera manager for XR. */
-    cameraManager: XRCameraManager;
-    /** All initialized features at this moment. */
-    readonly features: XRFeature[];
-    private _origin;
-    /**
-     * The current origin of XR space.
-     * @remarks The connection point between the virtual world and the real world ( XR Space )
-     */
-    get origin(): Entity;
-    set origin(value: Entity);
-    /**
-     * Check if the specified feature is supported.
-     * @param type - The type of the feature
-     * @returns If the feature is supported
-     */
-    isSupportedFeature<T extends XRFeature>(feature: TFeatureConstructor<T>): boolean;
-    /**
-     * Add feature based on the xr feature type.
-     * @param type - The type of the feature
-     * @param args - The constructor params of the feature
-     * @returns The feature which has been added
-     */
-    addFeature<T extends new (xrManager: XRManagerExtended, ...args: any[]) => XRFeature>(type: T, ...args: TFeatureConstructorArguments<T>): InstanceType<T> | null;
-    /**
-     * Get feature which match the type.
-     * @param type - The type of the feature
-     * @returns	The feature which match type
-     */
-    getFeature<T extends XRFeature>(type: TFeatureConstructor<T>): T | null;
-    /**
-     * Enter XR immersive mode, when you call this method, it will initialize and display the XR virtual world.
-     * @param sessionMode - The mode of the session
-     * @param autoRun - Whether to automatically run the session, when `autoRun` is set to true, xr will start working immediately after initialization. Otherwise, you need to call `sessionManager.run` later to work.
-     * @returns A promise that resolves if the XR virtual world is entered, otherwise rejects
-     */
-    enterXR(sessionMode: XRSessionMode, autoRun?: boolean): Promise<void>;
-    /**
-     * Exit XR immersive mode, when you call this method, it will destroy the XR virtual world.
-     * @returns A promise that resolves if the XR virtual world is destroyed, otherwise rejects
-     */
-    exitXR(): Promise<void>;
+export interface IXRListener {
+    fn: (...args: any[]) => any;
+    destroyed?: boolean;
 }
 type TFeatureConstructor<T extends XRFeature> = new (xrManager: XRManagerExtended, ...args: any[]) => T;
 type TFeatureConstructorArguments<T extends new (xrManager: XRManagerExtended, ...args: any[]) => XRFeature> = T extends new (xrManager: XRManagerExtended, ...args: infer P) => XRFeature ? P : never;
@@ -65,6 +18,8 @@ declare module "@galacean/engine" {
         sessionManager: XRSessionManager;
         /** Camera manager for XR. */
         cameraManager: XRCameraManager;
+        /** Initialized features. */
+        readonly features: XRFeature[];
         /**
          * The current origin of XR space.
          * @remarks The connection point between the virtual world and the real world ( XR Space )

package/types/feature/trackable/XRTrackableFeature.d.ts

@@ -6,7 +6,7 @@ import { XRTracked } from "./XRTracked";
 /**
  * The base class of XR trackable manager.
  */
-export declare abstract class XRTrackableFeature<T extends XRTracked, K extends XRRequestTracking<T>> extends XRFeature<IXRTrackablePlatformFeature<T, K>> {
+export declare abstract class XRTrackableFeature<T extends XRTracked = XRTracked, K extends XRRequestTracking<T> = XRRequestTracking<T>> extends XRFeature<IXRTrackablePlatformFeature<T, K>> {
     protected static _uuid: number;
     protected _requestTrackings: K[];
     protected _tracked: T[];

package/types/index.d.ts

@@ -30,4 +30,3 @@ export { XRInputEventType } from "./input/XRInputEventType";
 export { XRTargetRayMode } from "./input/XRTargetRayMode";
 export * from "./loader/XRReferenceImageDecoder";
 export * from "./loader/XRReferenceImageLoader";
-export * from "./loader/XRSceneExtendParser";

package/types/session/XRSessionManager.d.ts

@@ -46,11 +46,11 @@ export declare class XRSessionManager {
      * Add a listening function for session state changes.
      * @param listener - The listening function
      */
-    addChangedListener(listener: (state: XRSessionState) => void): void;
+    addStateChangedListener(listener: (state: XRSessionState) => void): void;
     /**
      * Remove a listening function of session state changes.
      * @param listener - The listening function
      */
-    removeChangedListener(listener: (state: XRSessionState) => void): void;
+    removeStateChangedListener(listener: (state: XRSessionState) => void): void;
     private _onSessionExit;
 }

package/types/session/XRSessionState.d.ts

@@ -4,10 +4,12 @@
 export declare enum XRSessionState {
     /** Not initialized. */
     None = 0,
+    /** Initializing session. */
+    Initializing = 1,
     /** Initialized but not started. */
-    Initialized = 1,
+    Initialized = 2,
     /** Running. */
-    Running = 2,
+    Running = 3,
     /** Paused. */
-    Paused = 3
+    Paused = 4
 }