From aedf2d33d3438bce6eecb616bb596047850bf619 Mon Sep 17 00:00:00 2001 From: liteng <930372551@qq.com> Date: Sat, 22 Sep 2018 22:15:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ShadowEditor.Web/assets/css/main.css | 2 +- ShadowEditor.Web/src/Application.js | 1 - ShadowEditor.Web/src/editor/player/Player.js | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ShadowEditor.Web/assets/css/main.css b/ShadowEditor.Web/assets/css/main.css index ece52354..e24419ee 100644 --- a/ShadowEditor.Web/assets/css/main.css +++ b/ShadowEditor.Web/assets/css/main.css @@ -562,7 +562,7 @@ table.Table .TableBody td { /* 场景编辑区 */ .viewport { - position: relative; + position: absolute; width: 100%; height: 100%; } diff --git a/ShadowEditor.Web/src/Application.js b/ShadowEditor.Web/src/Application.js index 77a18e42..efff4105 100644 --- a/ShadowEditor.Web/src/Application.js +++ b/ShadowEditor.Web/src/Application.js @@ -76,7 +76,6 @@ function Application(container, options) { xtype: 'div', style: { position: 'relative', - height: 'calc(100% - 272px)', flex: 1 }, children: [ diff --git a/ShadowEditor.Web/src/editor/player/Player.js b/ShadowEditor.Web/src/editor/player/Player.js index 893de967..0c0ba2a5 100644 --- a/ShadowEditor.Web/src/editor/player/Player.js +++ b/ShadowEditor.Web/src/editor/player/Player.js @@ -65,6 +65,7 @@ Player.prototype.start = function () { camera: this.app.editor.camera, renderer: this.app.editor.renderer, scripts: this.app.editor.scripts, + animation: this.app.editor.animation, scene: this.app.editor.scene });