merge

Author: inwoods

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Copyright (c) 2017 Unity Technologies. All rights reserved.
 //
 // Licensed under the ##LICENSENAME##.
@@ -88,7 +88,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
                 // find common ancestor root & filePath;
                 string[] filePaths = new string[gosToExport.Length];
                 if (path==null)
-                    path = Path.Combine (Application.dataPath, "Objects");
+                    path = FbxExporters.EditorTools.ExportSettings.instance.convertToModelSavePath;
 
                 for(int n = 0; n < gosToExport.Length; n++){
                     var filename = ModelExporter.ConvertToValidFilename (gosToExport [n].name + ".fbx");
@@ -310,4 +310,4 @@ private static void CopyComponents(GameObject from, GameObject to){
             }
         }
     }
-}
+}

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -8,30 +8,82 @@ namespace FbxExporters.EditorTools {
 
     [CustomEditor(typeof(ExportSettings))]
     public class ExportSettingsEditor : UnityEditor.Editor {
+        Vector2 scrollPos = Vector2.zero;
+        const float LabelWidth = 225;
+        const float SelectableLabelMinWidth = 200;
+        const float BrowseButtonWidth = 55;
+
         public override void OnInspectorGUI() {
             ExportSettings exportSettings = (ExportSettings)target;
 
             // Increasing the label width so that none of the text gets cut off
-            EditorGUIUtility.labelWidth = 300;
+            EditorGUIUtility.labelWidth = LabelWidth;
+
+            scrollPos = GUILayout.BeginScrollView (scrollPos);
 
             exportSettings.weldVertices = EditorGUILayout.Toggle ("Weld Vertices:", exportSettings.weldVertices);
             exportSettings.embedTextures = EditorGUILayout.Toggle ("Embed Textures:", exportSettings.embedTextures);
             exportSettings.mayaCompatibleNames = EditorGUILayout.Toggle (
-                new GUIContent("Convert to Maya Compatible Naming:",
+                new GUIContent ("Convert to Maya Compatible Naming:",
                     "In Maya some symbols such as spaces and accents get replaced when importing an FBX " +
                     "(e.g. \"foo bar\" becomes \"fooFBXASC032bar\"). " +
                     "On export, convert the names of GameObjects so they are Maya compatible." +
-                    (exportSettings.mayaCompatibleNames? "" : 
+                    (exportSettings.mayaCompatibleNames ? "" : 
                         "\n\nWARNING: Disabling this feature may result in lost material connections," +
-                        " and unexpected character replacements in Maya.")
+                    " and unexpected character replacements in Maya.")
                 ),
                 exportSettings.mayaCompatibleNames);
 
+            GUILayout.BeginHorizontal ();
+            GUILayout.Label (new GUIContent (
+                "Model Prefab Path:",
+                "Relative path for saving Model Prefabs."));
+
+            EditorGUILayout.SelectableLabel(GetRelativePath(exportSettings.convertToModelSavePath, Application.dataPath),
+                EditorStyles.textField, GUILayout.MinWidth(SelectableLabelMinWidth), GUILayout.Height(EditorGUIUtility.singleLineHeight));
+
+            if (GUILayout.Button ("Browse", EditorStyles.miniButton, GUILayout.Width (BrowseButtonWidth))) {
+                string path = EditorUtility.OpenFolderPanel (
+                    "Select Model Prefabs Path", Application.dataPath, null
+                );
+                // Make sure something is selected, and that it is in the Asset folder
+                if (!string.IsNullOrEmpty (path) && path.StartsWith (Application.dataPath)) {
+                    exportSettings.convertToModelSavePath = path;
+                } else {
+                    Debug.LogWarning ("Please select a location in Assets/");
+                }
+            }
+
+            GUILayout.EndHorizontal ();
+            GUILayout.FlexibleSpace ();
+            GUILayout.EndScrollView ();
+
             if (GUI.changed) {
                 EditorUtility.SetDirty (exportSettings);
                 exportSettings.Save ();
             }
         }
+
+        private string GetRelativePath(string filePath, string folder){
+            Uri pathUri;
+            try{
+                pathUri = new Uri (filePath);
+            }
+            catch(UriFormatException){
+                return filePath;
+            }
+            if (!folder.EndsWith (Path.DirectorySeparatorChar.ToString ())) {
+                folder += Path.DirectorySeparatorChar;
+            }
+            Uri folderUri = new Uri (folder);
+            string relativePath = Uri.UnescapeDataString (
+                                      folderUri.MakeRelativeUri (pathUri).ToString ().Replace ('/', Path.DirectorySeparatorChar)
+                                  );
+            if (!relativePath.StartsWith ("Assets")) {
+                relativePath = string.Format("Assets{0}{1}", Path.DirectorySeparatorChar, relativePath);
+            }
+            return relativePath;
+        }
     }
 
     [FilePath("ProjectSettings/FbxExportSettings.asset",FilePathAttribute.Location.ProjectFolder)]
@@ -40,6 +92,12 @@ public class ExportSettings : FbxExporters.EditorTools.ScriptableSingleton<Expor
         public bool weldVertices = true;
         public bool embedTextures = false;
         public bool mayaCompatibleNames = true;
+        public string convertToModelSavePath;
+
+        void OnEnable()
+        {
+            convertToModelSavePath = Path.Combine (Application.dataPath, "Objects");
+        }
 
         [MenuItem("Edit/Project Settings/Fbx Export", priority = 300)]
         static void ShowManager()

README.md

@@ -8,25 +8,34 @@ See LICENSE.md file in the project root for full license information.
 Requirements
 ------------
 
-* [FBX SDK C# Bindings v0.0.4a or higher](https://github.com/Unity-Technologies/FbxSharp)
+* [FBX SDK C# Bindings](https://github.com/Unity-Technologies/FbxSharp)
 
 Packaging
 ---------
 
 **On OSX and Linux**
 
+Get the source the first time.
 ```
 # clone the source
 git clone https://github.com/Unity-Technologies/FbxExporters.git
+cd FbxExporters
+```
 
-export PROJECT_PATH=~/Development/FbxExporters
-export UNITY3D_PATH=/Applications/Unity\ 2017.1.0f3/Unity.app/Contents/MacOS/Unity
-export PACKAGE_NAME=FbxExporters
-export PACKAGE_VERSION=0.0.5a
-export FBXSDK_PACKAGE_PATH=~/Development/FbxSharpBuild/FbxSdk_0.0.4a.unitypackage
-
-"${UNITY3D_PATH}" -projectPath "${PROJECT_PATH}" -importPackage ${FBXSDK_PACKAGE_PATH} -quit
-"${UNITY3D_PATH}" -batchmode -projectPath "${PROJECT_PATH}" -exportPackage Assets/FbxExporters Assets/FbxSdk  ${PROJECT_PATH}/${PACKAGE_NAME}_${PACKAGE_VERSION}.unitypackage -quit
+Update the source and package:
+```
+git pull
+PROJECT_PATH=`pwd`
+FBXSDK_PACKAGE_PATH=`ls -t ../FbxSharpBuild/FbxSdk_*.unitypackage | head -1`
+PACKAGE_VERSION=`echo "${FBXSDK_PACKAGE_PATH}" | sed -e 's/.*\([0-9]\{1,\}\.[0-9]*\.[0-9]*[a-z]*\).*/\1/'`
+
+if test `uname -s` = 'Darwin' ; then
+  UNITY_EDITOR_PATH=/Applications/Unity/Unity.app/Contents/MacOS/Unity
+else
+  UNITY_EDITOR_PATH=/opt/Unity/Editor/Unity/Unity
+fi
+"${UNITY_EDITOR_PATH}" -projectPath "${PROJECT_PATH}" -importPackage "${FBXSDK_PACKAGE_PATH}" -quit
+"${UNITY_EDITOR_PATH}" -batchmode -projectPath "${PROJECT_PATH}" -exportPackage Assets/FbxExporters Assets/FbxSdk  "${PROJECT_PATH}/FbxExporters_${PACKAGE_VERSION}.unitypackage" -quit
 ```
 
 **On Windows**