首页 发现 帮助
登录
javascript
/
three.js
镜像自地址 https://github.com/tazdij/three.js.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

Editor: fixed scene export being broken on initial page load.

That was a bit tricky - because Viewport was created before Sidebar.Outliner, cameraChanged signal wasn't effectively setting activeCamera in Outliner (which is how it is passed to SceneExporter).

Changing order of these UI element creations though started to (correctly) highlight Viewport, and as this is controlled via pseudo CSS :focus class, it can't be easily overridden from JavaScript. We should really start to use CSS.
alteredq 13 年之前
父节点
3abdb8b3a5
当前提交
fe902e553f
共有 2 个文件被更改，包括 14 次插入 和 10 次删除
合并视图 显示文件统计
  1. 12 10
      editor/index.html
  2. 2 0
      editor/js/ui/Viewport.js

+ 12 - 10
editor/index.html
查看文件 

@@ -15,6 +15,7 @@
 
 				border-top: 1px solid #ccc;
 
 				border-top: 1px solid #ccc;
 
 			}
 
 			}
 
 
 
+			.hideFocus:focus { outline: 0 }
 
 		</style>
 
 		</style>
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
@@ -82,6 +83,17 @@
 
 
 
 			//
 
 			//
 
 
 
+			var menubar = new Menubar( signals );
 
+			menubar.setWidth( '100%' );
 
+			menubar.setHeight( '32px' );
 
+			document.body.appendChild( menubar.dom );
 
+
 
+			var sidebar = new Sidebar( signals );
 
+			sidebar.setLeft( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
+			sidebar.setTop( '32px' );
 
+			sidebar.setHeight( '-webkit-calc(100% - 32px)', '-moz-calc(100% - 32px)', 'calc(100% - 32px)' );
 
+			document.body.appendChild( sidebar.dom );
 
+
 
 			var viewport = new Viewport( signals );
 
 			var viewport = new Viewport( signals );
 
 			viewport.setTop( '32px' );
 
 			viewport.setTop( '32px' );
 
 			viewport.setWidth( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
 			viewport.setWidth( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
@@ -93,16 +105,6 @@
 
 
 
 			viewport.dom.focus();
 
 			viewport.dom.focus();
 
 
 
-			var menubar = new Menubar( signals );
 
-			menubar.setWidth( '100%' );
 
-			menubar.setHeight( '32px' );
 
-			document.body.appendChild( menubar.dom );
 
-
 
-			var sidebar = new Sidebar( signals );
 
-			sidebar.setLeft( '-webkit-calc(100% - 300px)', '-moz-calc(100% - 300px)', 'calc(100% - 300px)' );
 
-			sidebar.setTop( '32px' );
 
-			sidebar.setHeight( '-webkit-calc(100% - 32px)', '-moz-calc(100% - 32px)', 'calc(100% - 32px)' );
 
-			document.body.appendChild( sidebar.dom );
 
 
 
 			document.addEventListener( 'drop', function ( event ) {
 
 			document.addEventListener( 'drop', function ( event ) {

+ 2 - 0
editor/js/ui/Viewport.js
查看文件 

@@ -499,6 +499,8 @@ var Viewport = function ( signals ) {
 
 	container.dom.tabIndex = 1;
 
 	container.dom.tabIndex = 1;
 
 	container.dom.addEventListener( 'keydown', onKeyDown, false );
 
 	container.dom.addEventListener( 'keydown', onKeyDown, false );
 
 
 
+	container.dom.className = "hideFocus";
 
+
 
 	//
 
 	//
 
 
 
 	function updateMaterials( root ) {
 
 	function updateMaterials( root ) {