Sfoglia il codice sorgente

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

David Catuhe 5 anni fa
parent
commit
99d58ba5ba
34 ha cambiato i file con 128 aggiunte e 128 eliminazioni
  1. 1 1
      dist/preview release/what's new.md
  2. 3 3
      src/Cameras/VR/vrExperienceHelper.ts
  3. 0 1
      src/Cameras/index.ts
  4. 1 1
      src/Helpers/sceneHelpers.ts
  5. 2 2
      src/Cameras/XR/features/WebXRAbstractFeature.ts
  6. 3 3
      src/Cameras/XR/features/WebXRAnchorSystem.ts
  7. 2 2
      src/Cameras/XR/features/WebXRBackgroundRemover.ts
  8. 5 5
      src/Cameras/XR/features/WebXRControllerPhysics.ts
  9. 12 12
      src/Cameras/XR/features/WebXRControllerPointerSelection.ts
  10. 18 18
      src/Cameras/XR/features/WebXRControllerTeleportation.ts
  11. 3 3
      src/Cameras/XR/features/WebXRHitTestLegacy.ts
  12. 3 3
      src/Cameras/XR/features/WebXRPlaneDetector.ts
  13. 0 0
      src/XR/features/index.ts
  14. 0 0
      src/XR/index.ts
  15. 0 0
      src/XR/motionController/index.ts
  16. 8 8
      src/Cameras/XR/motionController/webXRAbstractController.ts
  17. 2 2
      src/Cameras/XR/motionController/webXRControllerComponent.ts
  18. 4 4
      src/Cameras/XR/motionController/webXRGenericMotionController.ts
  19. 4 4
      src/Cameras/XR/motionController/webXRHTCViveMotionController.ts
  20. 6 6
      src/Cameras/XR/motionController/webXRMicrosoftMixedRealityController.ts
  21. 2 2
      src/Cameras/XR/motionController/webXRMotionControllerManager.ts
  22. 4 4
      src/Cameras/XR/motionController/webXROculusTouchMotionController.ts
  23. 8 8
      src/Cameras/XR/motionController/webXRProfiledMotionController.ts
  24. 6 6
      src/Cameras/XR/webXRCamera.ts
  25. 5 5
      src/Cameras/XR/webXRController.ts
  26. 3 3
      src/Cameras/XR/webXRDefaultExperience.ts
  27. 3 3
      src/Cameras/XR/webXREnterExitUI.ts
  28. 5 5
      src/Cameras/XR/webXRExperienceHelper.ts
  29. 1 1
      src/Cameras/XR/webXRFeaturesManager.ts
  30. 3 3
      src/Cameras/XR/webXRInput.ts
  31. 2 2
      src/Cameras/XR/webXRManagedOutputCanvas.ts
  32. 6 6
      src/Cameras/XR/webXRSessionManager.ts
  33. 2 2
      src/Cameras/XR/webXRTypes.ts
  34. 1 0
      src/index.ts

+ 1 - 1
dist/preview release/what's new.md

@@ -204,7 +204,7 @@
 - Selection has gaze mode (which can be forced) and touch-screen support ([#7395](https://github.com/BabylonJS/Babylon.js/issues/7395)) ([RaananW](https://github.com/RaananW/))
 - Laser pointers can be excluded from lighting influence so that they are always visible in both WebXR and WebVR ([#7323](https://github.com/BabylonJS/Babylon.js/issues/7323)) ([RaananW](https://github.com/RaananW/))
 - Full support for the online motion controller repository ([#7323](https://github.com/BabylonJS/Babylon.js/issues/7323)) ([RaananW](https://github.com/RaananW/))
-- New WebXR feature - Controller physics impostor ([RaananW](https://github.com/RaananW/))
+- New feature - XR Controller physics impostor ([RaananW](https://github.com/RaananW/))
 
 ### Ray
 

+ 3 - 3
src/Cameras/VR/vrExperienceHelper.ts

@@ -36,9 +36,9 @@ import "../../Meshes/Builders/cylinderBuilder";
 import "../../Gamepads/gamepadSceneComponent";
 import "../../Animations/animatable";
 import { Axis } from '../../Maths/math.axis';
-import { WebXRSessionManager } from '../XR/webXRSessionManager';
-import { WebXRDefaultExperience } from '../XR/webXRDefaultExperience';
-import { WebXRState } from '../XR/webXRTypes';
+import { WebXRSessionManager } from '../../XR/webXRSessionManager';
+import { WebXRDefaultExperience } from '../../XR/webXRDefaultExperience';
+import { WebXRState } from '../../XR/webXRTypes';
 
 /**
  * Options to modify the vr teleportation behavior.

+ 0 - 1
src/Cameras/index.ts

@@ -17,5 +17,4 @@ export * from "./Stereoscopic/index";
 export * from "./universalCamera";
 export * from "./virtualJoysticksCamera";
 export * from "./VR/index";
-export * from "./XR/index";
 export * from "./RigModes/index";

+ 1 - 1
src/Helpers/sceneHelpers.ts

@@ -18,7 +18,7 @@ import "../Materials/Textures/Loaders/ddsTextureLoader";
 import "../Materials/Textures/Loaders/envTextureLoader";
 import "../Materials/Textures/Loaders/ktxTextureLoader";
 import "../Meshes/Builders/boxBuilder";
-import { WebXRDefaultExperience, WebXRDefaultExperienceOptions } from '../Cameras/XR/webXRDefaultExperience';
+import { WebXRDefaultExperience, WebXRDefaultExperienceOptions } from '../XR/webXRDefaultExperience';
 
 /** @hidden */
 export var _forceSceneHelpersToBundle = true;

+ 2 - 2
src/Cameras/XR/features/WebXRAbstractFeature.ts

@@ -1,6 +1,6 @@
 import { IWebXRFeature } from '../webXRFeaturesManager';
-import { Observer, Observable, EventState } from '../../../Misc/observable';
-import { Nullable } from '../../../types';
+import { Observer, Observable, EventState } from '../../Misc/observable';
+import { Nullable } from '../../types';
 import { WebXRSessionManager } from '../webXRSessionManager';
 
 /**

+ 3 - 3
src/Cameras/XR/features/WebXRAnchorSystem.ts

@@ -1,8 +1,8 @@
 import { WebXRFeatureName } from '../webXRFeaturesManager';
 import { WebXRSessionManager } from '../webXRSessionManager';
-import { Observable } from '../../../Misc/observable';
-import { Matrix } from '../../../Maths/math.vector';
-import { TransformNode } from '../../../Meshes/transformNode';
+import { Observable } from '../../Misc/observable';
+import { Matrix } from '../../Maths/math.vector';
+import { TransformNode } from '../../Meshes/transformNode';
 import { WebXRPlaneDetector } from './WebXRPlaneDetector';
 import { WebXRHitTestLegacy } from './WebXRHitTestLegacy';
 import { WebXRAbstractFeature } from './WebXRAbstractFeature';

+ 2 - 2
src/Cameras/XR/features/WebXRBackgroundRemover.ts

@@ -1,7 +1,7 @@
 import { WebXRFeaturesManager, WebXRFeatureName } from "../webXRFeaturesManager";
 import { WebXRSessionManager } from '../webXRSessionManager';
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Observable } from '../../../Misc/observable';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Observable } from '../../Misc/observable';
 import { WebXRAbstractFeature } from './WebXRAbstractFeature';
 
 /**

+ 5 - 5
src/Cameras/XR/features/WebXRControllerPhysics.ts

@@ -1,13 +1,13 @@
 import { WebXRAbstractFeature } from "./WebXRAbstractFeature";
-import { Vector3, Quaternion } from "../../../Maths/math.vector";
+import { Vector3, Quaternion } from "../../Maths/math.vector";
 import { WebXRController } from "../webXRController";
-import { PhysicsImpostor } from "../../../Physics/physicsImpostor";
+import { PhysicsImpostor } from "../../Physics/physicsImpostor";
 import { WebXRInput } from "../webXRInput";
 import { WebXRSessionManager } from "../webXRSessionManager";
-import { AbstractMesh } from "../../../Meshes/abstractMesh";
-import { SphereBuilder } from "../../../Meshes/Builders/sphereBuilder";
+import { AbstractMesh } from "../../Meshes/abstractMesh";
+import { SphereBuilder } from "../../Meshes/Builders/sphereBuilder";
 import { WebXRFeatureName, WebXRFeaturesManager } from "../webXRFeaturesManager";
-import { Logger } from '../../../Misc/logger';
+import { Logger } from '../../Misc/logger';
 
 /**
  * Options for the controller physics feature

+ 12 - 12
src/Cameras/XR/features/WebXRControllerPointerSelection.ts

@@ -1,20 +1,20 @@
 import { WebXRFeaturesManager, WebXRFeatureName } from "../webXRFeaturesManager";
 import { WebXRSessionManager } from '../webXRSessionManager';
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Observer } from '../../../Misc/observable';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Observer } from '../../Misc/observable';
 import { WebXRInput } from '../webXRInput';
 import { WebXRController } from '../webXRController';
-import { Scene } from '../../../scene';
+import { Scene } from '../../scene';
 import { WebXRControllerComponent } from '../motionController/webXRControllerComponent';
-import { Nullable } from '../../../types';
-import { Vector3 } from '../../../Maths/math.vector';
-import { Color3 } from '../../../Maths/math.color';
-import { Axis } from '../../../Maths/math.axis';
-import { StandardMaterial } from '../../../Materials/standardMaterial';
-import { CylinderBuilder } from '../../../Meshes/Builders/cylinderBuilder';
-import { TorusBuilder } from '../../../Meshes/Builders/torusBuilder';
-import { Ray } from '../../../Culling/ray';
-import { PickingInfo } from '../../../Collisions/pickingInfo';
+import { Nullable } from '../../types';
+import { Vector3 } from '../../Maths/math.vector';
+import { Color3 } from '../../Maths/math.color';
+import { Axis } from '../../Maths/math.axis';
+import { StandardMaterial } from '../../Materials/standardMaterial';
+import { CylinderBuilder } from '../../Meshes/Builders/cylinderBuilder';
+import { TorusBuilder } from '../../Meshes/Builders/torusBuilder';
+import { Ray } from '../../Culling/ray';
+import { PickingInfo } from '../../Collisions/pickingInfo';
 import { WebXRAbstractFeature } from './WebXRAbstractFeature';
 
 /**

+ 18 - 18
src/Cameras/XR/features/WebXRControllerTeleportation.ts

@@ -1,27 +1,27 @@
 import { IWebXRFeature, WebXRFeaturesManager, WebXRFeatureName } from '../webXRFeaturesManager';
-import { Observer } from '../../../Misc/observable';
+import { Observer } from '../../Misc/observable';
 import { WebXRSessionManager } from '../webXRSessionManager';
-import { Nullable } from '../../../types';
+import { Nullable } from '../../types';
 import { WebXRInput } from '../webXRInput';
 import { WebXRController } from '../webXRController';
 import { WebXRControllerComponent, IWebXRMotionControllerAxesValue } from '../motionController/webXRControllerComponent';
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Vector3, Quaternion } from '../../../Maths/math.vector';
-import { Ray } from '../../../Culling/ray';
-import { Material } from '../../../Materials/material';
-import { DynamicTexture } from '../../../Materials/Textures/dynamicTexture';
-import { CylinderBuilder } from '../../../Meshes/Builders/cylinderBuilder';
-import { SineEase, EasingFunction } from '../../../Animations/easing';
-import { Animation } from '../../../Animations/animation';
-import { Axis } from '../../../Maths/math.axis';
-import { StandardMaterial } from '../../../Materials/standardMaterial';
-import { GroundBuilder } from '../../../Meshes/Builders/groundBuilder';
-import { TorusBuilder } from '../../../Meshes/Builders/torusBuilder';
-import { PickingInfo } from '../../../Collisions/pickingInfo';
-import { Curve3 } from '../../../Maths/math.path';
-import { LinesBuilder } from '../../../Meshes/Builders/linesBuilder';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Vector3, Quaternion } from '../../Maths/math.vector';
+import { Ray } from '../../Culling/ray';
+import { Material } from '../../Materials/material';
+import { DynamicTexture } from '../../Materials/Textures/dynamicTexture';
+import { CylinderBuilder } from '../../Meshes/Builders/cylinderBuilder';
+import { SineEase, EasingFunction } from '../../Animations/easing';
+import { Animation } from '../../Animations/animation';
+import { Axis } from '../../Maths/math.axis';
+import { StandardMaterial } from '../../Materials/standardMaterial';
+import { GroundBuilder } from '../../Meshes/Builders/groundBuilder';
+import { TorusBuilder } from '../../Meshes/Builders/torusBuilder';
+import { PickingInfo } from '../../Collisions/pickingInfo';
+import { Curve3 } from '../../Maths/math.path';
+import { LinesBuilder } from '../../Meshes/Builders/linesBuilder';
 import { WebXRAbstractFeature } from './WebXRAbstractFeature';
-import { Color3 } from '../../../Maths/math.color';
+import { Color3 } from '../../Maths/math.color';
 
 /**
  * The options container for the teleportation module

+ 3 - 3
src/Cameras/XR/features/WebXRHitTestLegacy.ts

@@ -1,8 +1,8 @@
 import { WebXRFeaturesManager, WebXRFeatureName } from '../webXRFeaturesManager';
 import { WebXRSessionManager } from '../webXRSessionManager';
-import { Observable } from '../../../Misc/observable';
-import { Vector3, Matrix } from '../../../Maths/math.vector';
-import { TransformNode } from '../../../Meshes/transformNode';
+import { Observable } from '../../Misc/observable';
+import { Vector3, Matrix } from '../../Maths/math.vector';
+import { TransformNode } from '../../Meshes/transformNode';
 import { WebXRAbstractFeature } from './WebXRAbstractFeature';
 
 // the plugin is registered at the end of the file

+ 3 - 3
src/Cameras/XR/features/WebXRPlaneDetector.ts

@@ -1,8 +1,8 @@
 import { WebXRFeaturesManager, WebXRFeatureName } from '../webXRFeaturesManager';
-import { TransformNode } from '../../../Meshes/transformNode';
+import { TransformNode } from '../../Meshes/transformNode';
 import { WebXRSessionManager } from '../webXRSessionManager';
-import { Observable } from '../../../Misc/observable';
-import { Vector3, Matrix } from '../../../Maths/math.vector';
+import { Observable } from '../../Misc/observable';
+import { Vector3, Matrix } from '../../Maths/math.vector';
 import { WebXRAbstractFeature } from './WebXRAbstractFeature';
 
 /**

src/Cameras/XR/features/index.ts → src/XR/features/index.ts


src/Cameras/XR/index.ts → src/XR/index.ts


src/Cameras/XR/motionController/index.ts → src/XR/motionController/index.ts


+ 8 - 8
src/Cameras/XR/motionController/webXRAbstractController.ts

@@ -1,12 +1,12 @@
-import { IDisposable, Scene } from '../../../scene';
+import { IDisposable, Scene } from '../../scene';
 import { WebXRControllerComponent } from './webXRControllerComponent';
-import { Observable } from '../../../Misc/observable';
-import { Logger } from '../../../Misc/logger';
-import { SceneLoader } from '../../../Loading/sceneLoader';
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Nullable } from '../../../types';
-import { Quaternion, Vector3 } from '../../../Maths/math.vector';
-import { Mesh } from '../../../Meshes/mesh';
+import { Observable } from '../../Misc/observable';
+import { Logger } from '../../Misc/logger';
+import { SceneLoader } from '../../Loading/sceneLoader';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Nullable } from '../../types';
+import { Quaternion, Vector3 } from '../../Maths/math.vector';
+import { Mesh } from '../../Meshes/mesh';
 
 /**
  * Handness type in xrInput profiles. These can be used to define layouts in the Layout Map.

+ 2 - 2
src/Cameras/XR/motionController/webXRControllerComponent.ts

@@ -1,6 +1,6 @@
 import { IMinimalMotionControllerObject, MotionControllerComponentType } from "./webXRAbstractController";
-import { Observable } from '../../../Misc/observable';
-import { IDisposable } from '../../../scene';
+import { Observable } from '../../Misc/observable';
+import { IDisposable } from '../../scene';
 
 /**
  * X-Y values for axes in WebXR

+ 4 - 4
src/Cameras/XR/motionController/webXRGenericMotionController.ts

@@ -4,10 +4,10 @@ import {
     MotionControllerHandness,
     IMotionControllerLayoutMap
 } from "./webXRAbstractController";
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Scene } from '../../../scene';
-import { Mesh } from '../../../Meshes/mesh';
-import { Quaternion } from '../../../Maths/math.vector';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Scene } from '../../scene';
+import { Mesh } from '../../Meshes/mesh';
+import { Quaternion } from '../../Maths/math.vector';
 
 /**
  * A generic trigger-only motion controller for WebXR

+ 4 - 4
src/Cameras/XR/motionController/webXRHTCViveMotionController.ts

@@ -4,10 +4,10 @@ import {
     MotionControllerHandness,
     WebXRAbstractMotionController
 } from "./webXRAbstractController";
-import { Scene } from '../../../scene';
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Mesh } from '../../../Meshes/mesh';
-import { Quaternion } from '../../../Maths/math.vector';
+import { Scene } from '../../scene';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Mesh } from '../../Meshes/mesh';
+import { Quaternion } from '../../Maths/math.vector';
 import { WebXRMotionControllerManager } from './webXRMotionControllerManager';
 
 /**

+ 6 - 6
src/Cameras/XR/motionController/webXRMicrosoftMixedRealityController.ts

@@ -5,12 +5,12 @@ import {
     IMotionControllerLayoutMap
 } from "./webXRAbstractController";
 import { WebXRMotionControllerManager } from './webXRMotionControllerManager';
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Scene } from '../../../scene';
-import { Mesh } from '../../../Meshes/mesh';
-import { Quaternion } from '../../../Maths/math.vector';
-import { SceneLoader } from '../../../Loading/sceneLoader';
-import { Logger } from '../../../Misc/logger';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Scene } from '../../scene';
+import { Mesh } from '../../Meshes/mesh';
+import { Quaternion } from '../../Maths/math.vector';
+import { SceneLoader } from '../../Loading/sceneLoader';
+import { Logger } from '../../Misc/logger';
 
 /**
  * The motion controller class for all microsoft mixed reality controllers

+ 2 - 2
src/Cameras/XR/motionController/webXRMotionControllerManager.ts

@@ -2,8 +2,8 @@ import {
     WebXRAbstractMotionController, IMotionControllerProfile,
 } from './webXRAbstractController';
 import { WebXRGenericTriggerMotionController } from './webXRGenericMotionController';
-import { Scene } from '../../../scene';
-import { Tools } from '../../../Misc/tools';
+import { Scene } from '../../scene';
+import { Tools } from '../../Misc/tools';
 import { WebXRProfiledMotionController } from './webXRProfiledMotionController';
 
 /**

+ 4 - 4
src/Cameras/XR/motionController/webXROculusTouchMotionController.ts

@@ -5,10 +5,10 @@ import {
     IMotionControllerLayoutMap
 } from "./webXRAbstractController";
 import { WebXRMotionControllerManager } from './webXRMotionControllerManager';
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
-import { Scene } from '../../../scene';
-import { Mesh } from '../../../Meshes/mesh';
-import { Quaternion } from '../../../Maths/math.vector';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { Scene } from '../../scene';
+import { Mesh } from '../../Meshes/mesh';
+import { Quaternion } from '../../Maths/math.vector';
 
 /**
  * The motion controller class for oculus touch (quest, rift).

+ 8 - 8
src/Cameras/XR/motionController/webXRProfiledMotionController.ts

@@ -1,13 +1,13 @@
-import { AbstractMesh } from '../../../Meshes/abstractMesh';
+import { AbstractMesh } from '../../Meshes/abstractMesh';
 import { WebXRAbstractMotionController, IMotionControllerProfile, IMotionControllerMeshMap } from './webXRAbstractController';
-import { Scene } from '../../../scene';
-import { SceneLoader } from '../../../Loading/sceneLoader';
-import { Mesh } from '../../../Meshes/mesh';
-import { Axis, Space } from '../../../Maths/math.axis';
-import { Color3 } from '../../../Maths/math.color';
+import { Scene } from '../../scene';
+import { SceneLoader } from '../../Loading/sceneLoader';
+import { Mesh } from '../../Meshes/mesh';
+import { Axis, Space } from '../../Maths/math.axis';
+import { Color3 } from '../../Maths/math.color';
 import { WebXRControllerComponent } from './webXRControllerComponent';
-import { SphereBuilder } from '../../../Meshes/Builders/sphereBuilder';
-import { StandardMaterial } from '../../../Materials/standardMaterial';
+import { SphereBuilder } from '../../Meshes/Builders/sphereBuilder';
+import { StandardMaterial } from '../../Materials/standardMaterial';
 
 /**
  * A profiled motion controller has its profile loaded from an online repository.

+ 6 - 6
src/Cameras/XR/webXRCamera.ts

@@ -1,10 +1,10 @@
-import { Vector3, Matrix, Quaternion } from "../../Maths/math.vector";
-import { Scene } from "../../scene";
-import { Camera } from "../../Cameras/camera";
-import { FreeCamera } from "../../Cameras/freeCamera";
-import { TargetCamera } from "../../Cameras/targetCamera";
+import { Vector3, Matrix, Quaternion } from "../Maths/math.vector";
+import { Scene } from "../scene";
+import { Camera } from "../Cameras/camera";
+import { FreeCamera } from "../Cameras/freeCamera";
+import { TargetCamera } from "../Cameras/targetCamera";
 import { WebXRSessionManager } from "./webXRSessionManager";
-import { Viewport } from '../../Maths/math.viewport';
+import { Viewport } from '../Maths/math.viewport';
 
 /**
  * WebXR Camera which holds the views for the xrSession

+ 5 - 5
src/Cameras/XR/webXRController.ts

@@ -1,8 +1,8 @@
-import { Observable } from "../../Misc/observable";
-import { AbstractMesh } from "../../Meshes/abstractMesh";
-import { Quaternion, Vector3 } from '../../Maths/math.vector';
-import { Ray } from '../../Culling/ray';
-import { Scene } from '../../scene';
+import { Observable } from "../Misc/observable";
+import { AbstractMesh } from "../Meshes/abstractMesh";
+import { Quaternion, Vector3 } from '../Maths/math.vector';
+import { Ray } from '../Culling/ray';
+import { Scene } from '../scene';
 import { WebXRAbstractMotionController } from './motionController/webXRAbstractController';
 import { WebXRMotionControllerManager } from './motionController/webXRMotionControllerManager';
 

+ 3 - 3
src/Cameras/XR/webXRDefaultExperience.ts

@@ -1,13 +1,13 @@
 import { WebXRExperienceHelper } from "./webXRExperienceHelper";
-import { Scene } from '../../scene';
+import { Scene } from '../scene';
 import { WebXRInput, IWebXRInputOptions } from './webXRInput';
 import { WebXRControllerPointerSelection } from './features/WebXRControllerPointerSelection';
 import { WebXRRenderTarget } from './webXRTypes';
 import { WebXREnterExitUI, WebXREnterExitUIOptions } from './webXREnterExitUI';
-import { AbstractMesh } from '../../Meshes/abstractMesh';
+import { AbstractMesh } from '../Meshes/abstractMesh';
 import { WebXRManagedOutputCanvasOptions } from './webXRManagedOutputCanvas';
 import { WebXRMotionControllerTeleportation } from './features/WebXRControllerTeleportation';
-import { Logger } from '../../Misc/logger';
+import { Logger } from '../Misc/logger';
 
 /**
  * Options for the default xr helper

+ 3 - 3
src/Cameras/XR/webXREnterExitUI.ts

@@ -1,6 +1,6 @@
-import { Nullable } from "../../types";
-import { Observable } from "../../Misc/observable";
-import { IDisposable, Scene } from "../../scene";
+import { Nullable } from "../types";
+import { Observable } from "../Misc/observable";
+import { IDisposable, Scene } from "../scene";
 import { WebXRExperienceHelper } from "./webXRExperienceHelper";
 import { WebXRState, WebXRRenderTarget } from './webXRTypes';
 /**

+ 5 - 5
src/Cameras/XR/webXRExperienceHelper.ts

@@ -1,12 +1,12 @@
-import { Nullable } from "../../types";
-import { Observable } from "../../Misc/observable";
-import { IDisposable, Scene } from "../../scene";
-import { Camera } from "../../Cameras/camera";
+import { Nullable } from "../types";
+import { Observable } from "../Misc/observable";
+import { IDisposable, Scene } from "../scene";
+import { Camera } from "../Cameras/camera";
 import { WebXRSessionManager } from "./webXRSessionManager";
 import { WebXRCamera } from "./webXRCamera";
 import { WebXRState, WebXRRenderTarget } from './webXRTypes';
 import { WebXRFeaturesManager } from './webXRFeaturesManager';
-import { Logger } from '../../Misc/logger';
+import { Logger } from '../Misc/logger';
 
 /**
  * Base set of functionality needed to create an XR experince (WebXRSessionManager, Camera, StateManagement, etc.)

+ 1 - 1
src/Cameras/XR/webXRFeaturesManager.ts

@@ -1,5 +1,5 @@
 import { WebXRSessionManager } from './webXRSessionManager';
-import { IDisposable } from '../../scene';
+import { IDisposable } from '../scene';
 
 /**
  * Defining the interface required for a (webxr) feature

+ 3 - 3
src/Cameras/XR/webXRInput.ts

@@ -1,6 +1,6 @@
-import { Nullable } from "../../types";
-import { Observer, Observable } from "../../Misc/observable";
-import { IDisposable } from "../../scene";
+import { Nullable } from "../types";
+import { Observer, Observable } from "../Misc/observable";
+import { IDisposable } from "../scene";
 import { WebXRController } from './webXRController';
 import { WebXRSessionManager } from './webXRSessionManager';
 import { WebXRCamera } from './webXRCamera';

+ 2 - 2
src/Cameras/XR/webXRManagedOutputCanvas.ts

@@ -1,5 +1,5 @@
-import { Nullable } from "../../types";
-import { ThinEngine } from '../../Engines/thinEngine';
+import { Nullable } from "../types";
+import { ThinEngine } from '../Engines/thinEngine';
 import { WebXRRenderTarget } from "./webXRTypes";
 import { WebXRSessionManager } from './webXRSessionManager';
 

+ 6 - 6
src/Cameras/XR/webXRSessionManager.ts

@@ -1,9 +1,9 @@
-import { Logger } from "../../Misc/logger";
-import { Observable } from "../../Misc/observable";
-import { Nullable } from "../../types";
-import { IDisposable, Scene } from "../../scene";
-import { InternalTexture, InternalTextureSource } from "../../Materials/Textures/internalTexture";
-import { RenderTargetTexture } from "../../Materials/Textures/renderTargetTexture";
+import { Logger } from "../Misc/logger";
+import { Observable } from "../Misc/observable";
+import { Nullable } from "../types";
+import { IDisposable, Scene } from "../scene";
+import { InternalTexture, InternalTextureSource } from "../Materials/Textures/internalTexture";
+import { RenderTargetTexture } from "../Materials/Textures/renderTargetTexture";
 import { WebXRRenderTarget } from './webXRTypes';
 import { WebXRManagedOutputCanvas, WebXRManagedOutputCanvasOptions } from './webXRManagedOutputCanvas';
 

+ 2 - 2
src/Cameras/XR/webXRTypes.ts

@@ -1,5 +1,5 @@
-import { Nullable } from "../../types";
-import { IDisposable } from "../../scene";
+import { Nullable } from "../types";
+import { IDisposable } from "../scene";
 
 /**
  * States of the webXR experience

+ 1 - 0
src/index.ts

@@ -36,4 +36,5 @@ export * from "./sceneComponent";
 export * from "./Sprites/index";
 export * from "./States/index";
 export * from "./Misc/index";
+export * from "./XR/index";
 export * from "./types";