Browse Source

Camera cir dep'

sebastien 6 năm trước cách đây
mục cha
commit
e2e4e0c198
3 tập tin đã thay đổi với 14 bổ sung14 xóa
  1. 0 7
      src/Cameras/freeCamera.ts
  2. 7 7
      src/Cameras/index.ts
  3. 7 0
      src/Cameras/universalCamera.ts

+ 0 - 7
src/Cameras/freeCamera.ts

@@ -1,22 +1,15 @@
 import { Nullable } from "types";
 import { serializeAsVector3, serialize } from "Tools/decorators";
 import { Vector3, Vector2 } from "Math/math";
-import { Node } from "node";
 import { AbstractMesh } from "Mesh/abstractMesh";
 import { Collider } from "Collisions/collider";
 import { Scene } from "scene";
 import { Engine } from "Engine/engine";
 import { TargetCamera } from "./targetCamera";
-import { UniversalCamera } from "./universalCamera";
 import { FreeCameraInputsManager } from "./freeCameraInputsManager";
 import { FreeCameraMouseInput } from "Cameras/Inputs/freeCameraMouseInput";
 import { FreeCameraKeyboardMoveInput } from "Cameras/Inputs/freeCameraKeyboardMoveInput";
 
-    Node.AddNodeConstructor("FreeCamera", (name, scene) => {
-        // Forcing to use the Universal camera
-        return () => new UniversalCamera(name, Vector3.Zero(), scene);
-    });
-
     /**
      * This represents a free type of camera. It can be usefull in First Person Shooter game for instance.
      * Please consider using the new UniversalCamera instead as it adds more functionality like the gamepad.

+ 7 - 7
src/Cameras/index.ts

@@ -1,18 +1,18 @@
+export * from "./Inputs";
+export * from "./cameraInputsManager";
+export * from "./camera";
+export * from "./targetCamera";
+export * from "./freeCamera";
+export * from "./freeCameraInputsManager";
+export * from "./touchCamera";
 export * from "./arcRotateCamera";
 export * from "./arcRotateCameraInputsManager";
-export * from "./camera";
-export * from "./cameraInputsManager";
 export * from "./deviceOrientationCamera";
 export * from "./flyCamera";
 export * from "./flyCameraInputsManager";
 export * from "./followCamera";
-export * from "./freeCamera";
-export * from "./freeCameraInputsManager";
 export * from "./gamepadCamera";
-export * from "./Inputs";
 export * from "./Stereoscopic";
-export * from "./targetCamera";
-export * from "./touchCamera";
 export * from "./universalCamera";
 export * from "./virtualJoysticksCamera";
 export * from "./VR";

+ 7 - 0
src/Cameras/universalCamera.ts

@@ -1,8 +1,15 @@
 import { TouchCamera } from "./touchCamera";
+import { Node } from "node";
 import { FreeCameraGamepadInput } from "Cameras/Inputs/freeCameraGamepadInput";
 import { Scene } from "scene";
 import { Vector3 } from "Math/math";
 import { Camera } from "./camera";
+
+Node.AddNodeConstructor("FreeCamera", (name, scene) => {
+    // Forcing to use the Universal camera
+    return () => new UniversalCamera(name, Vector3.Zero(), scene);
+});
+
     /**
      * The Universal Camera is the one to choose for first person shooter type games, and works with all the keyboard, mouse, touch and gamepads. This replaces the earlier Free Camera,
      * which still works and will still be found in many Playgrounds.