build

swift502 · swift502 · commit 7110be155854 · 2020-08-08T23:40:13.000+02:00
diff --git a/build/sketchbook.min.js b/build/sketchbook.min.js
diff --git a/build/types/characters/Character.d.ts b/build/types/characters/Character.d.ts
@@ -53,9 +53,6 @@ export declare class Character extends THREE.Object3D implements IWorldEntity {
     charState: ICharacterState;
     behaviour: ICharacterAI;
     world: World;
-    help1: THREE.AxesHelper;
-    help2: THREE.AxesHelper;
-    help3: THREE.AxesHelper;
     isRunningTowardsVehicle: boolean;
     targetSeat: VehicleSeat;
     private physicsEnabled;
diff --git a/build/types/core/InputManager.d.ts b/build/types/core/InputManager.d.ts
@@ -15,7 +15,7 @@ export declare class InputManager {
     boundOnKeyDown: (evt: any) => void;
     boundOnKeyUp: (evt: any) => void;
     constructor(world: World, domElement: HTMLElement);
-    update(timestep: number): void;
+    update(timestep: number, unscaledTimeStep: number): void;
     setInputReceiver(receiver: IInputReceiver): void;
     setPointerLock(enabled: boolean): void;
     onPointerlockChange(event: MouseEvent): void;
diff --git a/build/types/core/LoadingManager.d.ts b/build/types/core/LoadingManager.d.ts
@@ -1,13 +1,16 @@
-import { WelcomeScreen } from "./WelcomeScreen";
 import { World } from './World';
+import { LoadingTrackerEntry } from './LoadingTrackerEntry';
 export declare class LoadingManager {
-    printProgress: boolean;
-    welcomeScreen: WelcomeScreen;
     private gltfLoader;
     private loadingTracker;
     private world;
+    private progressBarSimulator;
+    private firstLoad;
     constructor(world: World);
     loadGLTF(path: string, onLoadingFinished: (gltf: any) => void): void;
-    startLoading(path: string): void;
-    doneLoading(path: string): void;
+    addLoadingEntry(path: string): LoadingTrackerEntry;
+    doneLoading(trackerEntry: LoadingTrackerEntry): void;
+    update(timeStep: number): void;
+    private getLoadingPercentage;
+    private isLoadingDone;
 }
diff --git a/build/types/core/LoadingTrackerEntry.d.ts b/build/types/core/LoadingTrackerEntry.d.ts
@@ -0,0 +1,6 @@
+export declare class LoadingTrackerEntry {
+    path: string;
+    progress: number;
+    finished: boolean;
+    constructor(path: string);
+}
diff --git a/build/types/core/World.d.ts b/build/types/core/World.d.ts
@@ -2,18 +2,19 @@ import * as THREE from 'three';
 import * as CANNON from 'cannon';
 import { CameraOperator } from './CameraOperator';
 import EffectComposer from '@johh/three-effectcomposer';
-import { default as CSM } from '../../lib/utils/three-csm.module.js';
+import { default as CSM } from 'three-csm';
 import { Stats } from '../../lib/utils/Stats';
 import { InputManager } from './InputManager';
 import { Character } from '../characters/Character';
 import { IWorldEntity } from '../interfaces/IWorldEntity';
 import { Sky } from '../entities/Sky';
 import { Path } from '../data/Path';
 import { LoadingManager } from './LoadingManager';
-import { WelcomeScreen } from "./WelcomeScreen";
+import { LoadingScreen } from '../ui/LoadingScreen';
 import { CannonDebugRenderer } from '../../lib/cannon/CannonDebugRenderer';
 import { Vehicle } from '../vehicles/Vehicle';
 import { Scenario } from '../data/Scenario';
+import { CustomConsole } from '../ui/CustomConsole';
 export declare class World {
     renderer: THREE.WebGLRenderer;
     camera: THREE.PerspectiveCamera;
@@ -37,16 +38,15 @@ export declare class World {
     timeScaleTarget: number;
     csm: CSM;
     loadingManager: LoadingManager;
-    welcomeScreen: WelcomeScreen;
+    loadingScreen: LoadingScreen;
+    customConsole: CustomConsole;
     cannonDebugRenderer: CannonDebugRenderer;
     scenarios: Scenario[];
     characters: Character[];
     vehicles: Vehicle[];
-    paths: {
-        [id: string]: Path;
-    };
+    paths: Path[];
     constructor();
-    update(timeStep: number): void;
+    update(timeStep: number, unscaledTimeStep: number): void;
     updatePhysics(timeStep: number): void;
     isOutOfBounds(position: CANNON.Vec3): boolean;
     outOfBoundsRespawn(body: CANNON.Body, position?: CANNON.Vec3): void;
@@ -61,6 +61,8 @@ export declare class World {
     add(object: IWorldEntity): void;
     remove(object: IWorldEntity): void;
     loadScene(gltf: any): void;
+    launchScenario(scenarioID: string): void;
+    clearEntities(): void;
     scrollTheTimeScale(scrollAmount: number): void;
     updateControls(controls: any): void;
     private getGUI;
diff --git a/build/types/data/Path.d.ts b/build/types/data/Path.d.ts
@@ -3,7 +3,8 @@ export declare class Path {
     nodes: {
         [nodeName: string]: PathNode;
     };
+    private rootNode;
+    constructor(root: THREE.Object3D);
     addNode(child: any): void;
     connectNodes(): void;
-    firstNode(): PathNode;
 }
diff --git a/build/types/data/PathNode.d.ts b/build/types/data/PathNode.d.ts
@@ -5,4 +5,5 @@ export declare class PathNode {
     path: Path;
     nextNode: PathNode;
     previousNode: PathNode;
+    constructor(child: THREE.Object3D, path: Path);
 }
diff --git a/build/types/data/Scenario.d.ts b/build/types/data/Scenario.d.ts
@@ -1,10 +1,14 @@
 import { World } from '../core/World';
 export declare class Scenario {
+    id: string;
+    name: string;
     spawnAlways: boolean;
     default: boolean;
     private rootNode;
     private spawnPoints;
-    constructor(root: THREE.Object3D);
-    findSpawnPoints(): void;
+    private invisible;
+    private world;
+    constructor(root: THREE.Object3D, world: World);
+    createLaunchLink(): void;
     launch(world: World): void;
 }
diff --git a/build/types/interfaces/ICharacterAI.d.ts b/build/types/interfaces/ICharacterAI.d.ts
@@ -1,4 +1,4 @@
-import { Character } from "../characters/Character";
+import { Character } from '../characters/Character';
 export interface ICharacterAI {
     character: Character;
     update(timeStep: number): void;
diff --git a/build/types/interfaces/IWorldEntity.d.ts b/build/types/interfaces/IWorldEntity.d.ts
@@ -1,4 +1,4 @@
-import { World } from "../core/World";
+import { World } from '../core/World';
 export interface IWorldEntity {
     addToWorld(world: World): void;
     removeFromWorld(world: World): void;
diff --git a/build/types/physics/colliders/ConvexCollider.d.ts b/build/types/physics/colliders/ConvexCollider.d.ts
@@ -1,6 +1,6 @@
 import * as CANNON from 'cannon';
 import { ICollider } from '../../interfaces/ICollider';
-import { Object3D } from "three";
+import { Object3D } from 'three';
 export declare class ConvexCollider implements ICollider {
     mesh: any;
     options: any;
diff --git a/build/types/sketchbook.d.ts b/build/types/sketchbook.d.ts
@@ -24,4 +24,4 @@ export declare let THREE: typeof THREEImport;
 export declare let CANNON: typeof CANNONImport;
 export { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
 export { LoadingManager } from './core/LoadingManager';
-export { WelcomeScreen } from './core/WelcomeScreen';
+export { LoadingScreen as WelcomeScreen } from './ui/LoadingScreen';
diff --git a/build/types/ui/CustomConsole.d.ts b/build/types/ui/CustomConsole.d.ts
@@ -0,0 +1,9 @@
+import { CustomConsoleMessage } from './CustomConsoleMessage';
+export declare class CustomConsole {
+    messages: CustomConsoleMessage[];
+    entranceAnimation: string;
+    exitAnimation: string;
+    messageDuration: number;
+    addMessage(text: string): void;
+    update(timeStep: number): void;
+}
diff --git a/build/types/ui/CustomConsoleMessage.d.ts b/build/types/ui/CustomConsoleMessage.d.ts
@@ -0,0 +1,10 @@
+import { CustomConsole } from './CustomConsole';
+export declare class CustomConsoleMessage {
+    domElement: HTMLElement;
+    private customConsole;
+    private elapsedTime;
+    private removalTriggered;
+    constructor(console: CustomConsole, domElement: HTMLElement);
+    update(timeStep: number): void;
+    private triggerRemoval;
+}
diff --git a/build/types/ui/LoadingScreen.d.ts b/build/types/ui/LoadingScreen.d.ts
@@ -0,0 +1,7 @@
+import { World } from '../core/World';
+export declare class LoadingScreen {
+    private world;
+    constructor(world: World);
+    displayStartBtn(): void;
+    hideWelcomeScreen(): void;
+}
diff --git a/build/types/ui/WelcomeScreen.d.ts b/build/types/ui/WelcomeScreen.d.ts
@@ -0,0 +1,2 @@
+export declare class WelcomeScreen {
+}
diff --git a/build/types/vehicles/VehicleDoor.d.ts b/build/types/vehicles/VehicleDoor.d.ts
@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { Vehicle } from "./Vehicle";
+import { Vehicle } from './Vehicle';
 export declare class VehicleDoor {
     vehicle: Vehicle;
     doorObject: THREE.Object3D;
diff --git a/build/types/vehicles/VehicleSeat.d.ts b/build/types/vehicles/VehicleSeat.d.ts
@@ -1,8 +1,8 @@
-import { SeatType } from "../enums/SeatType";
-import { Side } from "../enums/Side";
-import { IControllable } from "../interfaces/IControllable";
-import THREE = require("three");
-import { VehicleDoor } from "./VehicleDoor";
+import { SeatType } from '../enums/SeatType';
+import { Side } from '../enums/Side';
+import { IControllable } from '../interfaces/IControllable';
+import THREE = require('three');
+import { VehicleDoor } from './VehicleDoor';
 export declare class VehicleSeat {
     vehicle: IControllable;
     seatPoint: THREE.Object3D;

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ export declare class PathNode {`
`5`	`5`	`path: Path;`
`6`	`6`	`nextNode: PathNode;`
`7`	`7`	`previousNode: PathNode;`
	`8`	`+ constructor(child: THREE.Object3D, path: Path);`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Character } from "../characters/Character";`
	`1`	`+import { Character } from '../characters/Character';`
`2`	`2`	`export interface ICharacterAI {`
`3`	`3`	`character: Character;`
`4`	`4`	`update(timeStep: number): void;`