added new fbx exporter and other stuff..

4 年前 · 8784e5a5
--- a/ProjectSettings/FbxExportSettings.asset
+++ b/ProjectSettings/FbxExportSettings.asset
        "BakeAnimation": true,
        "showConvertToPrefabDialog": true,
        "integrationSavePath": "C:\\WORK\\Projects\\Demos\\BoatAttack",
-        "selectedDCCApp": 0,
+        "selectedDCCApp": 2,
+            "_Artist Tools Demo/Models",
+            "_Artist Tools Demo/Models",
-        "selectedFbxPath": 1,
+        "selectedFbxPath": 0,
-        "dccOptionNames": [],
-        "dccOptionPaths": [],
+        "dccOptionNames": [
+            "3ds Max 2020",
+            "Maya 2019",
+            "Maya 2020"
+        ],
+        "dccOptionPaths": [
+            "C:/Program Files/Autodesk/3ds Max 2020/3dsmax.exe",
+            "C:/Program Files/Autodesk/Maya2019/bin/maya.exe",
+            "C:/Program Files/Autodesk/Maya2020/bin/maya.exe"
+        ],
        "exportModelSettingsSerialize": {
            "exportFormat": 0,
            "animatedSkinnedMesh": false,
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
                "value": "{\"m_Value\":\"ProBuilderLog.txt\"}"
            },
            {
+                "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "editor.materialPalettePath",
+                "value": "{\"m_Value\":\"Assets/ProBuilder Data/Default Material Palette.asset\"}"
+            },
+            {
                "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "about.identifier",
                "value": "{\"m_Value\":{\"m_Major\":4,\"m_Minor\":2,\"m_Patch\":3,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}"
                "value": "{\"m_Value\":false}"
            },
            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "smoothing.showPreview",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "smoothing.showNormals",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "smoothing.showSettings",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "smoothing.showHelp",
+                "value": "{\"m_Value\":false}"
+            },
+            {
                "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "editor.rectSelectModifier",
                "value": "{\"m_Value\":2}"
            {
                "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
                "key": "ExtrudeFaces.distance",
-                "value": "{\"m_Value\":0.5}"
+                "value": "{\"m_Value\":0.7799999713897705}"
            },
            {
                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
--- a/Demo/Models/WaterCanon
+++ b/Demo/Models/WaterCanon
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!64 &6489326631699398060
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1768974945338001041}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 2491876097339079629, guid: c047f27eed499204bbabf26e7cc8fe2c, type: 3}
+--- !u!1001 &7758932780326543256
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -22.547
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.98526
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 36.582
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.62893283
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.62893283
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.62893283
+      objectReference: {fileID: 0}
+    - target: {fileID: -1504981713932161579, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+    - target: {fileID: -927199367670048503, guid: c047f27eed499204bbabf26e7cc8fe2c,
+        type: 3}
+      propertyPath: m_Name
+      value: 'WaterCanon '
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c047f27eed499204bbabf26e7cc8fe2c, type: 3}
+--- !u!1 &1768974945338001041 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: c047f27eed499204bbabf26e7cc8fe2c,
+    type: 3}
+  m_PrefabInstance: {fileID: 7758932780326543256}
+  m_PrefabAsset: {fileID: 0}
--- a/Demo/Models/WaterCanon
+++ b/Demo/Models/WaterCanon
+fileFormatVersion: 2
+guid: a121c81c812c9cb439e96e03548b9f90
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Demo/Models/workspace.mel
+++ b/Demo/Models/workspace.mel
+//Maya 2020 Project Definition
+
+workspace -fr "fluidCache" "cache/nCache/fluid";
+workspace -fr "JT_ATF" "data";
+workspace -fr "images" "images";
+workspace -fr "offlineEdit" "scenes/edits";
+workspace -fr "STEP_ATF Export" "data";
+workspace -fr "furShadowMap" "renderData/fur/furShadowMap";
+workspace -fr "SVG" "data";
+workspace -fr "scripts" "scripts";
+workspace -fr "DAE_FBX" "data";
+workspace -fr "shaders" "renderData/shaders";
+workspace -fr "NX_ATF" "data";
+workspace -fr "furFiles" "renderData/fur/furFiles";
+workspace -fr "CATIAV5_ATF Export" "data";
+workspace -fr "OBJ" "data";
+workspace -fr "PARASOLID_ATF Export" "data";
+workspace -fr "FBX export" "data";
+workspace -fr "furEqualMap" "renderData/fur/furEqualMap";
+workspace -fr "BIF" "data";
+workspace -fr "DAE_FBX export" "data";
+workspace -fr "CATIAV5_ATF" "data";
+workspace -fr "SAT_ATF Export" "data";
+workspace -fr "movie" "movies";
+workspace -fr "ASS Export" "data";
+workspace -fr "move" "data";
+workspace -fr "mayaAscii" "scenes";
+workspace -fr "autoSave" "autosave";
+workspace -fr "NX_ATF Export" "data";
+workspace -fr "sound" "sound";
+workspace -fr "mayaBinary" "scenes";
+workspace -fr "timeEditor" "Time Editor";
+workspace -fr "DWG_ATF" "data";
+workspace -fr "JT_ATF Export" "data";
+workspace -fr "iprImages" "renderData/iprImages";
+workspace -fr "FBX" "data";
+workspace -fr "renderData" "renderData";
+workspace -fr "CATIAV4_ATF" "data";
+workspace -fr "fileCache" "cache/nCache";
+workspace -fr "eps" "data";
+workspace -fr "3dPaintTextures" "sourceimages/3dPaintTextures";
+workspace -fr "mel" "scripts";
+workspace -fr "translatorData" "data";
+workspace -fr "DXF_ATF Export" "data";
+workspace -fr "particles" "cache/particles";
+workspace -fr "DXF_ATF" "data";
+workspace -fr "scene" "scenes";
+workspace -fr "SAT_ATF" "data";
+workspace -fr "PROE_ATF" "data";
+workspace -fr "WIRE_ATF Export" "data";
+workspace -fr "sourceImages" "sourceimages";
+workspace -fr "clips" "clips";
+workspace -fr "furImages" "renderData/fur/furImages";
+workspace -fr "STEP_ATF" "data";
+workspace -fr "DWG_ATF Export" "data";
+workspace -fr "depth" "renderData/depth";
+workspace -fr "sceneAssembly" "sceneAssembly";
+workspace -fr "IGES_ATF Export" "data";
+workspace -fr "PARASOLID_ATF" "data";
+workspace -fr "IGES_ATF" "data";
+workspace -fr "teClipExports" "Time Editor/Clip Exports";
+workspace -fr "ASS" "data";
+workspace -fr "audio" "sound";
+workspace -fr "Alembic" "data";
+workspace -fr "illustrator" "data";
+workspace -fr "diskCache" "data";
+workspace -fr "WIRE_ATF" "data";
+workspace -fr "templates" "assets";
+workspace -fr "OBJexport" "data";
+workspace -fr "furAttrMap" "renderData/fur/furAttrMap";
--- a/Demo/Models/workspace.mel.meta
+++ b/Demo/Models/workspace.mel.meta
+fileFormatVersion: 2
+guid: ac5be90ccd128594aaac3a2a18cdde45
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ProBuilder
+++ b/Assets/ProBuilder
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f1ca63a91b17724bbd99c8fa67e0180, type: 3}
+  m_Name: Default Material Palette
+  m_EditorClassIdentifier: 
+  array:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
--- a/Palette.asset.meta
+++ b/Palette.asset.meta
+fileFormatVersion: 2
+guid: 2633b18993c559448a866178cd54cf28
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: