evert/icy3dw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connecting message

Browse Source
This commit is contained in:
Evert Prants 2022-04-16 09:59:03 +03:00
parent e3186f7f41
commit 5850596481
Signed by: evert
GPG Key ID: 1688DA83D222D0B5
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/client/game.ts
View File

@ -27,6 +27,7 @@ export class Game {
public thirdPersonCamera!: ThirdPersonCamera; public thirdPersonCamera!: ThirdPersonCamera;
public joystick!: Joystick; public joystick!: Joystick;
public chat!: Chat; public chat!: Chat;
private _loading = LoadingManagerWrapper.getInstance();
private character: CharacterPacket = {}; private character: CharacterPacket = {};
private party: string[] = []; private party: string[] = [];
@ -38,12 +39,21 @@ export class Game {
constructor(public socket: Socket) {} constructor(public socket: Socket) {}
async initialize(): Promise<void> { async initialize(): Promise<void> {
LoadingManagerWrapper.getInstance().initialize(); this._loading.initialize();
const worldManifest = await ClientWorldManifest.loadManifest(); const worldManifest = await ClientWorldManifest.loadManifest();
this.world = new ClientWorld(new ClientWorldLoader(), worldManifest); this.world = new ClientWorld(new ClientWorldLoader(), worldManifest);
const cube = await CubeMap.load('/assets/skybox/default'); const cube = await CubeMap.load('/assets/skybox/default');
const grasstex = await BaseTexture.load(
'/assets/terrain/decoration/grass01.png',
);
const flowertex = await BaseTexture.load(
'/assets/terrain/decoration/flowers02.png',
);
const flowertex2 = await BaseTexture.load(
'/assets/terrain/decoration/flowers01.png',
);
await PonyModelLoader.getInstance().loadPonyModel(); await PonyModelLoader.getInstance().loadPonyModel();
await PonyEyes.getInstance().initialize(); await PonyEyes.getInstance().initialize();
@ -84,15 +94,6 @@ export class Game {
this.renderer.scene.background = cube.texture; this.renderer.scene.background = cube.texture;
// test // test
const grasstex = await BaseTexture.load(
'/assets/terrain/decoration/grass01.png',
);
const flowertex = await BaseTexture.load(
'/assets/terrain/decoration/flowers02.png',
);
const flowertex2 = await BaseTexture.load(
'/assets/terrain/decoration/flowers01.png',
);
const grassfield = Grass.getInstance().createGrassPatch( const grassfield = Grass.getInstance().createGrassPatch(
new Vector3(10, 0, 10), new Vector3(10, 0, 10),
8, 8,
@ -147,6 +148,7 @@ export class Game {
this.renderer.scene.add(grass); this.renderer.scene.add(grass);
this.renderer.scene.add(flowers); this.renderer.scene.add(flowers);
this.renderer.scene.add(flowers2); this.renderer.scene.add(flowers2);
this._loading.isConnecting();
} }
public dispose() { public dispose() {
@ -172,6 +174,7 @@ export class Game {
bindSocket() { bindSocket() {
this.socket.on('connect', () => { this.socket.on('connect', () => {
this.dispose(); this.dispose();
this._loading.connected();
console.log('connected'); console.log('connected');
}); });

23
src/client/object/resource/loading-manager.ts
View File

@ -8,6 +8,8 @@ export class LoadingManagerWrapper {
private _status = document.createElement('span'); private _status = document.createElement('span');
private _barWrapper = document.createElement('div'); private _barWrapper = document.createElement('div');
private _bar = document.createElement('div'); private _bar = document.createElement('div');
private _assetsLoaded = false;
private _connected = false;
public static getInstance(): LoadingManagerWrapper { public static getInstance(): LoadingManagerWrapper {
if (!instance) { if (!instance) {
@ -35,9 +37,28 @@ export class LoadingManagerWrapper {
}; };
this.manager.onLoad = () => { this.manager.onLoad = () => {
this.element.classList.add('loading--complete'); this._assetsLoaded = true;
}; };
document.body.prepend(this.element); document.body.prepend(this.element);
} }
public isConnecting() {
if (this._connected) {
return;
}
this._status.innerText = 'Connecting to server';
}
public connected() {
this._connected = true;
if (!this._assetsLoaded) {
setTimeout(() => {
this.connected();
}, 1000);
return;
}
this._status.innerText = 'Connected!';
this.element.classList.add('loading--complete');
}
} }