Browse Source

Editor: Refactored Sidebar files.

Mr.doob 12 years ago
parent
commit
006e4b87f3

+ 3 - 4
editor/index.html

@@ -42,10 +42,9 @@
 		<script src="js/ui/Menubar.Help.js"></script>
 		<script src="js/ui/Sidebar.js"></script>
 		<script src="js/ui/Sidebar.Scene.js"></script>
-		<script src="js/ui/Sidebar.Properties.js"></script>
-		<script src="js/ui/Sidebar.Properties.Object3D.js"></script>
-		<script src="js/ui/Sidebar.Properties.Geometry.js"></script>
-		<script src="js/ui/Sidebar.Properties.Material.js"></script>
+		<script src="js/ui/Sidebar.Object3D.js"></script>
+		<script src="js/ui/Sidebar.Geometry.js"></script>
+		<script src="js/ui/Sidebar.Material.js"></script>
 		<script src="js/ui/Viewport.js"></script>
 
 		<script>

+ 1 - 1
editor/js/ui/Sidebar.Properties.Geometry.js → editor/js/ui/Sidebar.Geometry.js

@@ -1,4 +1,4 @@
-Sidebar.Properties.Geometry = function ( signals ) {
+Sidebar.Geometry = function ( signals ) {
 
 	var geometries = {
 

+ 1 - 1
editor/js/ui/Sidebar.Properties.Material.js → editor/js/ui/Sidebar.Material.js

@@ -1,4 +1,4 @@
-Sidebar.Properties.Material = function ( signals ) {
+Sidebar.Material = function ( signals ) {
 
     var materials = {
 

+ 1 - 1
editor/js/ui/Sidebar.Properties.Object3D.js → editor/js/ui/Sidebar.Object3D.js

@@ -1,4 +1,4 @@
-Sidebar.Properties.Object3D = function ( signals ) {
+Sidebar.Object3D = function ( signals ) {
 
 	var objects = {
 

+ 0 - 11
editor/js/ui/Sidebar.Properties.js

@@ -1,11 +0,0 @@
-Sidebar.Properties = function ( signals ) {
-
-	var container = new UI.Panel();
-
-	container.add( new Sidebar.Properties.Object3D( signals ) );
-	container.add( new Sidebar.Properties.Geometry( signals ) );
-	container.add( new Sidebar.Properties.Material( signals ) );
-
-	return container;
-
-}

+ 1 - 1
editor/js/ui/Sidebar.Scene.js

@@ -1,4 +1,4 @@
-Sidebar.Outliner = function ( signals ) {
+Sidebar.Scene = function ( signals ) {
 
 	var objectTypes = {
 

+ 4 - 5
editor/js/ui/Sidebar.js

@@ -5,11 +5,10 @@ var Sidebar = function ( signals ) {
 	container.setBackgroundColor( '#eee' );
 	container.setOverflow( 'auto' );
 
-	var outliner = new Sidebar.Outliner( signals );
-	container.add( outliner );
-
-	var properties = new Sidebar.Properties( signals );
-	container.add( properties );
+	container.add( new Sidebar.Scene( signals ) );
+	container.add( new Sidebar.Object3D( signals ) );
+	container.add( new Sidebar.Geometry( signals ) );
+	container.add( new Sidebar.Material( signals ) );
 
 	return container;