Merge pull request #19 from Unity-Technologies/dev

graph tool integration
"can't create new stuff" bug fix
support for multiple scenes in one bundle.
a couple other other minor bugs

Author: alffanclub

README.md

@@ -22,7 +22,7 @@ Left hand pane showing a list of all bundles in the project.  Available function
 * Bundles with variants are a darker grey and can be expanded to show the list of variants.
 * Right-click or slow-double-click to rename bundle or bundle folder.
 * If a bundle has any error, warning, or info message, an icon will appear on the right side.  Mouse over the icon for more information.
-* If a bundle has a scene in it (making it a scene bundle) and anything else explicitly included, it will be marked as having an error. This bundle will not build until fixed.
+* If a bundle has at least one scene in it (making it a scene bundle) and non-scene assets explicitly included, it will be marked as having an error. This bundle will not build until fixed.
 * Bundles with duplicated assets will be marked with a warning (more information on duplication in Asset List section below)
 * Empty bundles will be marked with an info message.  For a number of reasons, empty bundles are not very stable and can dissapear from this list at times.
 * Folders of bundles will be marked with the highest message from the contained bundles.
@@ -31,7 +31,7 @@ Left hand pane showing a list of all bundles in the project.  Available function
   * Right click on multiple bundles to either move the assets from all selected bundles that are duplicates into a new bundle, or only those that are shared within the selection.
   * You can also drag duplicate assets out of the Asset List pane into the Bundle List to explicitly include them in a bundle.  More info on this in the Asset List feature set below.
 * Right click or hit DEL to delete bundles.
-* Drag bundles around to move them into and out of folders, or merge them (if none are scene bundles).
+* Drag bundles around to move them into and out of folders, or merge them.
 * Drag assets from the Project Explorer onto bundels to add them.
 * Drag assets onto empty space to create a new bundle.
 * Right click to create new bundles or bundle folders.
@@ -55,7 +55,7 @@ Upper right hand pane providing a list of assets contained in whichever bundles
   * Note that this list of implicit includes can be incomplete.  There are known issues with materials and textures not always showing up correctly.
   * As multiple assets can share dependencies, it is common for a given asset to be implicitly included in multiple bundles.  If the tool detects this case, it will mark both the bundle and the asset in question with a warning icon.
   * To fix the duplicate-inclusion warnings, you can manually move assets into a new bundle or right click the bundle and selecting one of the "Move duplicate" options.
-* Drag assets from the Project Explorer into this view to add them to the selected bundle. This is only valid if only one bundle is selected, and it is not a scene bundle
+* Drag assets from the Project Explorer into this view to add them to the selected bundle. This is only valid if only one bundle is selected, and the asset type is compatable (scenes onto scene bundles, etc.) 
 * Drag assets (explicit or implicit) from the Asset List into the Bundle List (to add them to different bundles, or a newly created bundle).
 * Right click or hit DEL to remove assets from bundles (does not remove assets from project).
 * Select or double-click assets to reveal them in the Project Explorer.
@@ -72,6 +72,9 @@ Lower right hand pane showing details of the asset(s) selected in the Asset List
 ### Troubleshooting
 * *Can't rename or delet a specific bundle.*  This is occasionally caused when first adding this tool to an existing project.  Please force a reimport of your assets through the Unity menu system to refresh the data. 
 
+### External Tool Integration
+Other tools that generate asset bundle data can choose to integrate with the browser. Currently the primary example is the [Asset Bundle Graph Tool](https://bitbucket.org/Unity-Technologies/assetbundlegraphtool).  If integrations are detected, then a selection bar will appear near the top of the browser.  It will allow you to select the Default data source (Unity's AssetDatabase) or an integrated tool. If none are detected, the selector is not present, though you can add it by right-clicking on the tab header and selecting "Custom Sources".  
+
 # Usage - Build
 The Build tab provides basic build functionality to get you started using asset bundles.  In most profressional scenarios, users will end up needing a more advanced build setup.  All are welcome to use the build code in this tool as a starting point for writing their own once this no longer meets their needs.  Interface:
 * *Build Target* - Platform the bundles will be built for

UnityEngine.AssetBundles/Editor/AssetBundleBrowser/AssetBundleBrowserMain.cs

@@ -1,10 +1,11 @@
+using System.Collections.Generic;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 
 namespace UnityEngine.AssetBundles
 {
 
-    public class AssetBundleBrowserMain : EditorWindow
+    public class AssetBundleBrowserMain : EditorWindow, IHasCustomMenu
     {
 
         public const float kButtonWidth = 150;
@@ -13,7 +14,7 @@ enum Mode
         {
             Browser,
             Builder,
-            //Inspect,
+            Inspect,
         }
         [SerializeField]
         Mode m_Mode;
@@ -39,6 +40,19 @@ static void ShowWindow()
             window.titleContent = new GUIContent("AssetBundles");
             window.Show();
         }
+
+        [SerializeField]
+        public bool multiDataSource = false;
+        public virtual void AddItemsToMenu(GenericMenu menu)
+        {
+            //menu.AddSeparator(string.Empty);
+            menu.AddItem(new GUIContent("Custom Sources"), multiDataSource, FlipDataSource);
+        }
+        public void FlipDataSource()
+        {
+            multiDataSource = !multiDataSource;
+        }
+
         private void OnEnable()
         {
 
@@ -49,13 +63,26 @@ private void OnEnable()
             if(m_BuildTab == null)
                 m_BuildTab = new AssetBundleBuildTab();
             m_BuildTab.OnEnable(subPos, this);
+            //if (m_InspectTab == null)
+            //    m_InspectTab = new AssetBundleInspectTab();
+            //m_InspectTab.OnEnable(subPos, this);
 
             m_RefreshTexture = EditorGUIUtility.FindTexture("Refresh");
+
+
+            //determine if we are "multi source" or not...
+            multiDataSource = false;
+            List<System.Type> types = AssetBundleDataSource.ABDataSourceProviderUtility.CustomABDataSourceTypes;
+            if (types.Count > 1)
+                multiDataSource = true;
         }
 
         private Rect GetSubWindowArea()
         {
-            Rect subPos = new Rect(0, k_MenubarPadding, position.width, position.height - k_MenubarPadding);
+            float padding = k_MenubarPadding;
+            if (multiDataSource)
+                padding += k_MenubarPadding * 0.5f;
+            Rect subPos = new Rect(0, padding, position.width, position.height - padding);
             return subPos;
         }
 
@@ -66,6 +93,9 @@ private void Update()
                 case Mode.Builder:
                     //m_BuildTab.Update();
                     break;
+                case Mode.Inspect:
+                    //m_InspectTab.Update();
+                    break;
                 case Mode.Browser:
                 default:
                     m_ManageTab.Update();
@@ -82,6 +112,9 @@ private void OnGUI()
                 case Mode.Builder:
                     m_BuildTab.OnGUI(GetSubWindowArea());
                     break;
+                case Mode.Inspect:
+                    //m_InspectTab.OnGUI(GetSubWindowArea());
+                    break;
                 case Mode.Browser:
                 default:
                     m_ManageTab.OnGUI(GetSubWindowArea());
@@ -104,10 +137,70 @@ void ModeToggle()
                 GUILayout.Space(m_RefreshTexture.width + k_ToolbarPadding);
             }
             float toolbarWidth = position.width - k_ToolbarPadding * 4 - m_RefreshTexture.width;
-            string[] labels = new string[2] { "Configure", "Build" };
+            string[] labels = new string[2] { "Configure", "Build" };//, "Inspect" }; 
             m_Mode = (Mode)GUILayout.Toolbar((int)m_Mode, labels, "LargeButton", GUILayout.Width(toolbarWidth) );
             GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal(); 
+            GUILayout.EndHorizontal();
+            if(multiDataSource)
+            {
+                //GUILayout.BeginArea(r);
+                GUILayout.BeginHorizontal();
+
+                using (new EditorGUILayout.HorizontalScope(EditorStyles.toolbar))
+                {
+                    GUILayout.Label("Bundle Data Source:");
+                    GUILayout.FlexibleSpace();
+                    var c = new GUIContent(string.Format("{0} ({1})", AssetBundleModel.Model.DataSource.Name, AssetBundleModel.Model.DataSource.ProviderName), "Select Asset Bundle Set");
+                    if (GUILayout.Button(c , EditorStyles.toolbarPopup) )
+                    {
+                        GenericMenu menu = new GenericMenu();
+                        bool firstItem = true;
+
+                        foreach (var info in AssetBundleDataSource.ABDataSourceProviderUtility.CustomABDataSourceTypes)
+                        {
+                            List<AssetBundleDataSource.ABDataSource> dataSourceList = null;
+                            dataSourceList = info.GetMethod("CreateDataSources").Invoke(null, null) as List<AssetBundleDataSource.ABDataSource>;
+                        
+
+                            if (dataSourceList == null)
+                                continue;
+
+                            if (!firstItem)
+                            {
+                                menu.AddSeparator("");
+                            }
+
+                            foreach (var ds in dataSourceList)
+                            {
+                                menu.AddItem(new GUIContent(string.Format("{0} ({1})", ds.Name, ds.ProviderName)), false,
+                                    () =>
+                                    {
+                                        var thisDataSource = ds;
+                                        AssetBundleModel.Model.DataSource = thisDataSource;
+                                        m_ManageTab.ForceReloadData();
+                                    }
+                                );
+                            }
+
+                            firstItem = false;
+                        }
+
+                        menu.ShowAsContext();
+                    }
+
+                    GUILayout.FlexibleSpace();
+                    if (AssetBundleModel.Model.DataSource.IsReadOnly())
+                    {
+                        GUIStyle tbLabel = new GUIStyle(EditorStyles.toolbar);
+                        tbLabel.alignment = TextAnchor.MiddleRight;
+
+                        GUILayout.Label("Read Only", tbLabel);
+                    }
+                }
+
+                GUILayout.EndHorizontal();
+                //GUILayout.EndArea();
+            }
         }