Merge pull request #532 from elpie89/texture_folder_explicit

Texture folder explicit
BabylonJS · Jun 7, 2019 · 7bbeed6 · 7bbeed6
2 parents bbabd59 + 593c0a5
commit 7bbeed6
Show file tree

Hide file tree

Showing 9 changed files with 240 additions and 84 deletions.
diff --git a/3ds Max/Max2Babylon/ExportParameters.cs b/3ds Max/Max2Babylon/ExportParameters.cs
@@ -4,6 +4,7 @@ public class ExportParameters
     {
         public string outputPath;
         public string outputFormat;
+        public string textureFolder;
         public string scaleFactor = "1";
         public bool writeTextures = true;
         public bool overwriteTextures = true;

diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.ExportItem.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.ExportItem.cs
@@ -79,6 +79,7 @@ public bool Selected
         private bool selected = true;
         private string exportPathRelative = "";
         private string exportPathAbsolute = "";
+        private string exportTextureFolderPathRelative = "";
 
         public ExportItem(string outputFileExt) { this.outputFileExt = outputFileExt; }
 

diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.GLTFExporter.Texture.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.GLTFExporter.Texture.cs
@@ -15,7 +15,7 @@ partial class BabylonExporter
         public const string KHR_texture_transform = "KHR_texture_transform";  // Name of the extension
         private Dictionary<string, GLTFTextureInfo> glTFTextureInfoMap = new Dictionary<string, GLTFTextureInfo>();
         private Dictionary<string, GLTFImage> glTFImageMap = new Dictionary<string, GLTFImage>();
-
+        public string relativeTextureFolder = "";
         /// <summary>
         /// Export the texture using the parameters of babylonTexture except its name.
         /// Write the bitmap file
@@ -62,6 +62,21 @@ private GLTFTextureInfo ExportTexture(BabylonTexture babylonTexture, GLTF gltf)
                 () => { return TryWriteImage(gltf, babylonTexture.originalPath, babylonTexture.name); });
         }
 
+        private bool ExtensionIsValidGLTFTexture(string _extension)
+        {
+            if (_extension.StartsWith("."))
+            {
+                _extension = _extension.Replace(".", "");
+            }
+
+            if (validGltfFormats.Contains(_extension))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         private string TryWriteImage(GLTF gltf, string sourcePath, string textureName)
             {
                 if (sourcePath == null || sourcePath == "")
@@ -157,9 +172,14 @@ private GLTFTextureInfo ExportTexture(BabylonTexture babylonTexture, GLTF gltf,
                 }
                 else
                 {
+                    string textureUri = name;
+                    if (!string.IsNullOrWhiteSpace(relativeTextureFolder))
+                    {
+                        textureUri = relativeTextureFolder + "/"+ name;
+                    }
                     gltfImage = new GLTFImage
                     {
-                        uri = name
+                        uri = textureUri
                     };
                     gltfImage.index = gltf.ImagesList.Count;
                     gltf.ImagesList.Add(gltfImage);

diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.cs
@@ -144,6 +144,7 @@ public void Export(ExportParameters exportParameters)
 
             string tempOutputDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
             string outputDirectory = Path.GetDirectoryName(exportParameters.outputPath);
+            string folderOuputDirectory = exportParameters.textureFolder;
             string outputFileName = Path.GetFileName(exportParameters.outputPath);
 
             // Check directory exists
@@ -557,6 +558,7 @@ public void Export(ExportParameters exportParameters)
                         var tempFilePath = Path.Combine(tempOutputDirectory, file);
                         var outputFile = Path.Combine(outputDirectory, file);
 
+
                         IUTF8Str maxNotification = GlobalInterface.Instance.UTF8Str.Create(outputFile);
                         Loader.Global.BroadcastNotification(SystemNotificationCode.PreExport, maxNotification);
                         moveFileToOutputDirectory(tempFilePath, outputFile, exportParameters);
@@ -571,8 +573,13 @@ public void Export(ExportParameters exportParameters)
                 foreach (var filePath in filePaths)
                 {
                     var file = Path.GetFileName(filePath);
-                    var outputPath = Path.Combine(outputDirectory, file);
+                    string ext = Path.GetExtension(file);
                     var tempFilePath = Path.Combine(tempOutputDirectory, file);
+                    var outputPath = Path.Combine(outputDirectory, file);
+                    if (!string.IsNullOrWhiteSpace(exportParameters.textureFolder) && ExtensionIsValidGLTFTexture(ext))
+                    {
+                        outputPath = Path.Combine(exportParameters.textureFolder, file);
+                    }
 
                     IUTF8Str maxNotification = GlobalInterface.Instance.UTF8Str.Create(outputPath);
                     Loader.Global.BroadcastNotification(SystemNotificationCode.PreExport, maxNotification);