heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix #5307

Browse source
This commit is contained in:
syuilo 2019-08-19 02:02:10 +09:00
parent 9153434906
commit 958ec7b03f
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/client/app/common/scripts/room/room.ts
View file

@ -37,6 +37,7 @@ export class Room {
private selectedObject: THREE.Object3D = null; private selectedObject: THREE.Object3D = null;
private onChangeSelect: Function; private onChangeSelect: Function;
private isTransformMode = false; private isTransformMode = false;
private renderFrameRequestId: number;
public canvas: HTMLCanvasElement; public canvas: HTMLCanvasElement;
private get furnitures(): Furniture[] { private get furnitures(): Furniture[] {
@ -299,7 +300,8 @@ export class Room {
@autobind @autobind
private renderWithoutPostFXs() { private renderWithoutPostFXs() {
requestAnimationFrame(this.renderWithoutPostFXs); this.renderFrameRequestId =
window.requestAnimationFrame(this.renderWithoutPostFXs);
// Update animations // Update animations
const clock = this.clock.getDelta(); const clock = this.clock.getDelta();
@ -313,7 +315,8 @@ export class Room {
@autobind @autobind
private renderWithPostFXs() { private renderWithPostFXs() {
requestAnimationFrame(this.renderWithPostFXs); this.renderFrameRequestId =
window.requestAnimationFrame(this.renderWithPostFXs);
// Update animations // Update animations
const clock = this.clock.getDelta(); const clock = this.clock.getDelta();
@ -688,4 +691,10 @@ export class Room {
public findFurnitureById(id: string) { public findFurnitureById(id: string) {
return this.furnitures.find(furniture => furniture.id === id); return this.furnitures.find(furniture => furniture.id === id);
} }
@autobind
public destroy() {
// Stop render loop
window.cancelAnimationFrame(this.renderFrameRequestId);
}
} }

4
src/client/app/common/views/pages/room/room.vue
View file

@ -124,6 +124,10 @@ export default Vue.extend({
}); });
}, },
beforeDestroy() {
room.destroy();
},
methods: { methods: {
async add() { async add() {
const { canceled, result: id } = await this.$root.dialog({ const { canceled, result: id } = await this.$root.dialog({