ソースを参照

No more full folder import

sebastien 6 年 前
コミット
c95b09184a

+ 9 - 3
src/Gamepads/Controllers/poseEnabledController.ts

@@ -12,9 +12,15 @@ import { Engine } from "Engines/engine";
 import { Gamepad } from "Gamepads/gamepad";
 import { ExtendedGamepadButton } from "./poseEnabledController";
 
-import { OculusTouchController, WindowsMotionController, ViveController, GearVRController, DaydreamController, GenericController } from "Gamepads/Controllers/";
-
-import { WebVRFreeCamera, TargetCamera, PoseControlled, DevicePose } from "Cameras";
+import { OculusTouchController } from "Gamepads/Controllers/oculusTouchController";
+import { WindowsMotionController } from "Gamepads/Controllers/windowsMotionController";
+import { ViveController } from "Gamepads/Controllers/viveController";
+import { GearVRController } from "Gamepads/Controllers/gearVRController";
+import { DaydreamController } from "Gamepads/Controllers/daydreamController";
+import { GenericController } from "Gamepads/Controllers/genericController";
+
+import { WebVRFreeCamera, PoseControlled, DevicePose } from "Cameras/VR/webVRCamera";
+import { TargetCamera } from "Cameras/targetCamera";
     /**
     * Defines the types of pose enabled controllers that are supported
     */

+ 4 - 1
src/Gamepads/gamepadSceneComponent.ts

@@ -6,7 +6,10 @@ import { _DepthCullingState, _StencilState, _AlphaState } from "States";
 
 import { GamepadManager } from "./gamepadManager";
 
-import { FreeCameraGamepadInput, FreeCameraInputsManager, ArcRotateCameraInputsManager, ArcRotateCameraGamepadInput } from "Cameras";
+import { FreeCameraInputsManager } from "Cameras/freeCameraInputsManager";
+import { FreeCameraGamepadInput } from "Cameras/Inputs/freeCameraGamepadInput";
+import { ArcRotateCameraInputsManager } from "Cameras/arcRotateCameraInputsManager";
+import { ArcRotateCameraGamepadInput } from "Cameras/Inputs/arcRotateCameraGamepadInput";
 
 declare module "scene" {
     export interface Scene {

+ 4 - 1
src/Helpers/sceneHelpers.ts

@@ -3,7 +3,10 @@ import { Nullable } from "types";
 import { Scene } from "scene";
 import { Vector3 } from "Maths/math";
 import { Mesh } from "Meshes/mesh";
-import { StandardMaterial, Texture, BaseTexture, PBRMaterial } from "Materials";
+import { BaseTexture } from "Materials/Textures/baseTexture";
+import { Texture } from "Materials/Textures/texture";
+import { StandardMaterial } from "Materials/standardMaterial";
+import { PBRMaterial } from "Materials/PBR/pbrMaterial";
 import { HemisphericLight } from "Lights/hemisphericLight";
 import { IEnvironmentHelperOptions, EnvironmentHelper } from "./environmentHelper";
 import { FreeCamera } from "Cameras/freeCamera";

+ 3 - 2
src/Loading/Plugins/babylonFileLoader.ts

@@ -1,6 +1,6 @@
 import { Logger } from "Misc/logger";
 import { Nullable } from "types";
-import { Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
 import { Scene } from "scene";
 import { Vector3, Color3, Color4 } from "Maths/math";
 import { Mesh } from "Meshes/mesh";
@@ -24,7 +24,8 @@ import { ActionManager } from "Actions/actionManager";
 import { IParticleSystem } from "Particles/IParticleSystem";
 import { Skeleton } from "Bones/skeleton";
 import { MorphTargetManager } from "Morph/morphTargetManager";
-import { CannonJSPlugin, OimoJSPlugin } from "Physics";
+import { CannonJSPlugin } from "Physics/Plugins/cannonJSPlugin";
+import { OimoJSPlugin } from "Physics/Plugins/oimoJSPlugin";
     var parseMaterialById = (id: string, parsedData: any, scene: Scene, rootUrl: string) => {
         for (var index = 0, cache = parsedData.materials.length; index < cache; index++) {
             var parsedMaterial = parsedData.materials[index];

+ 1 - 1
src/Materials/Textures/colorGradingTexture.ts

@@ -4,7 +4,7 @@ import { Matrix } from "Maths/math";
 import { Engine } from "Engines/engine";
 import { InternalTexture } from "Materials/Textures/internalTexture";
 import { BaseTexture } from "Materials/Textures/baseTexture";
-import { _TimeToken } from "Instrumentation";
+import { _TimeToken } from "Instrumentation/timeToken";
 import { _DepthCullingState, _StencilState, _AlphaState } from "States";
 import { Constants } from "Engines/constants";
     /**

+ 1 - 1
src/Materials/Textures/internalTexture.ts

@@ -3,7 +3,7 @@ import { Nullable, int } from "types";
 import { SphericalPolynomial } from "Maths/sphericalPolynomial";
 import { Engine, RenderTargetCreationOptions } from "Engines/engine";
 import { IInternalTextureTracker } from "Materials/Textures/internalTextureTracker";
-import { _TimeToken } from "Instrumentation";
+import { _TimeToken } from "Instrumentation/timeToken";
 import { _DepthCullingState, _StencilState, _AlphaState } from "States";
 import { Constants } from "Engines/constants";
 

+ 4 - 1
src/Physics/Plugins/cannonJSPlugin.ts

@@ -3,7 +3,10 @@ import { Logger } from "Misc/logger";
 import { Vector3, Matrix, Quaternion } from "Maths/math";
 import { VertexBuffer } from "Meshes/buffer";
 import { AbstractMesh } from "Meshes/abstractMesh";
-import { IPhysicsEnginePlugin, PhysicsImpostor, PhysicsImpostorJoint, PhysicsJoint, DistanceJointData, SpringJointData, PhysicsEngine, IPhysicsEnabledObject, IMotorEnabledJoint } from "Physics";
+import { IPhysicsEnginePlugin, PhysicsImpostorJoint } from "Physics/IPhysicsEngine";
+import { PhysicsImpostor, IPhysicsEnabledObject } from "Physics/physicsImpostor";
+import { PhysicsJoint, IMotorEnabledJoint, DistanceJointData, SpringJointData } from "Physics/physicsJoint";
+import { PhysicsEngine } from "Physics/physicsEngine";
 
     //declare var require: any;
     declare var CANNON: any;

+ 4 - 1
src/Physics/Plugins/oimoJSPlugin.ts

@@ -1,4 +1,7 @@
-import { IPhysicsEnginePlugin, PhysicsImpostor, IPhysicsEnabledObject, PhysicsEngine, PhysicsImpostorJoint, PhysicsJoint, SpringJointData, DistanceJointData, IMotorEnabledJoint } from "Physics";
+import { IPhysicsEnginePlugin, PhysicsImpostorJoint } from "Physics/IPhysicsEngine";
+import { PhysicsImpostor, IPhysicsEnabledObject } from "Physics/physicsImpostor";
+import { PhysicsJoint, IMotorEnabledJoint, DistanceJointData, SpringJointData } from "Physics/physicsJoint";
+import { PhysicsEngine } from "Physics/physicsEngine";
 import { AbstractMesh } from "Meshes/abstractMesh";
 import { Vector3, Quaternion } from "Maths/math";
 import { Nullable } from "types";

+ 1 - 1
src/PostProcesses/RenderPipeline/Pipelines/lensRenderingPipeline.ts

@@ -1,5 +1,5 @@
 
-import { Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
 import { Effect } from "Materials/effect";
 import { Texture } from "Materials/Textures/texture";
 import { DynamicTexture } from "Materials/Textures/dynamicTexture";