From a1a1d82b991fc8cd58b2cdfb89bae3002393e552 Mon Sep 17 00:00:00 2001 From: Josef Wienerroither Date: Thu, 31 Oct 2024 14:52:29 +0100 Subject: [PATCH] Bugfix Collection: fix wrong UTF8 encoding, 3ds Max binary copied to output folder and other issues (#1126) * fix log window not scrolling to the bottom (#1117) * fix draco texture indexing problem (#1111) * fix alpha weight problem (#1122) * fix installer crashes to desktop when network is not available (#1124) * disable copying of UiViewmodel.dll to output folder * convert UTF8-BOM encoding to UTF8 NOTE: this fixes failing babylon menu creation in the 3ds Max 2025 build * convert tabs to spaces * fix another tab left --- .../Max2Babylon/2025/Max2Babylon2025.csproj | 1 + .../2025/Scripts/CreateBabylonMenus.ms | 2 +- 3ds Max/Max2Babylon/BabylonLoadAnimations.cs | 2 +- 3ds Max/Max2Babylon/Descriptor.cs | 2 +- .../Exporter/BabylonExporter.Animation.cs | 2 +- .../BabylonExporter.CustomAttributes.cs | 2 +- .../Exporter/BabylonExporter.Light.cs | 2 +- .../Exporter/BabylonExporter.Logger.cs | 2 +- .../Exporter/BabylonExporter.Material.cs | 2 +- .../Exporter/BabylonExporter.Mesh.cs | 2 +- .../BabylonExporter.ShadowGenerator.cs | 2 +- .../Exporter/BabylonExporter.Texture.cs | 5 +- .../BabylonExporter.WorldModifiers.cs | 2 +- .../Max2Babylon/Exporter/BabylonExporter.cs | 2 +- .../Forms/ExporterForm.Designer.cs | 280 +++++++++--------- 3ds Max/Max2Babylon/GlobalUtility.cs | 2 +- 3ds Max/Max2Babylon/Tools/LayerUtilities.cs | 2 +- 3ds Max/Max2Babylon/Tools/Tools.cs | 2 +- .../BabylonJS_Installer/Downloader.cs | 13 +- .../BabylonJS_Installer/MainForm.cs | 2 +- .../BabylonJS_Installer/SoftwareChecker.cs | 55 ++-- .../Utilities/Draco/GLTFPipelineUtilities.cs | 2 +- 22 files changed, 205 insertions(+), 183 deletions(-) diff --git a/3ds Max/Max2Babylon/2025/Max2Babylon2025.csproj b/3ds Max/Max2Babylon/2025/Max2Babylon2025.csproj index 3c13484f..68a0da27 100644 --- a/3ds Max/Max2Babylon/2025/Max2Babylon2025.csproj +++ b/3ds Max/Max2Babylon/2025/Max2Babylon2025.csproj @@ -127,6 +127,7 @@ False Refs\UiViewModels.dll + False diff --git a/3ds Max/Max2Babylon/2025/Scripts/CreateBabylonMenus.ms b/3ds Max/Max2Babylon/2025/Scripts/CreateBabylonMenus.ms index 6a131836..df0a97f6 100644 --- a/3ds Max/Max2Babylon/2025/Scripts/CreateBabylonMenus.ms +++ b/3ds Max/Max2Babylon/2025/Scripts/CreateBabylonMenus.ms @@ -1,4 +1,4 @@ -( +( function createBabylonMenuCB = ( local actionTableId=47368 diff --git a/3ds Max/Max2Babylon/BabylonLoadAnimations.cs b/3ds Max/Max2Babylon/BabylonLoadAnimations.cs index d5ba688d..47023889 100644 --- a/3ds Max/Max2Babylon/BabylonLoadAnimations.cs +++ b/3ds Max/Max2Babylon/BabylonLoadAnimations.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Windows.Forms; using Autodesk.Max; diff --git a/3ds Max/Max2Babylon/Descriptor.cs b/3ds Max/Max2Babylon/Descriptor.cs index 0adff43a..71ffa80e 100644 --- a/3ds Max/Max2Babylon/Descriptor.cs +++ b/3ds Max/Max2Babylon/Descriptor.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; namespace Max2Babylon { diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Animation.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Animation.cs index b4e7f321..0754c486 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Animation.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Animation.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; using BabylonExport.Entities; using System; using System.Collections.Generic; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.CustomAttributes.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.CustomAttributes.cs index 2b4d2bd2..9f558d25 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.CustomAttributes.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.CustomAttributes.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; using BabylonExport.Entities; using System; using System.Collections.Generic; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Light.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Light.cs index 739e2865..1f6132c6 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Light.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Light.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using Autodesk.Max; using BabylonExport.Entities; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Logger.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Logger.cs index e9adbc39..88bc4a1d 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Logger.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Logger.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; using System; using System.Drawing; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Material.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Material.cs index b28f5b7f..8088f42a 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Material.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Material.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Collections.Generic; using Autodesk.Max; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Mesh.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Mesh.cs index a2bc4602..ff89373a 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Mesh.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Mesh.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; using BabylonExport.Entities; using System; using System.Collections.Generic; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.ShadowGenerator.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.ShadowGenerator.cs index 31217e31..54db1b95 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.ShadowGenerator.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.ShadowGenerator.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Autodesk.Max; using BabylonExport.Entities; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Texture.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Texture.cs index 35cc049e..e960e88f 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.Texture.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.Texture.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using Autodesk.Max; @@ -409,6 +409,9 @@ private BabylonTexture ExportBaseColorAlphaTexture(ITexmap baseColorTexMap, ITex name = nameText, // used to keep trace of the base + apha merge sources baseColorPath = baseColorSourcePath, + + // GLTF export relies on this property + originalPath = baseColorSourcePath, alphaPath = alphaSourcePath }; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.WorldModifiers.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.WorldModifiers.cs index 2d5870bd..921ff6eb 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.WorldModifiers.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.WorldModifiers.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using Autodesk.Max; using BabylonExport.Entities; diff --git a/3ds Max/Max2Babylon/Exporter/BabylonExporter.cs b/3ds Max/Max2Babylon/Exporter/BabylonExporter.cs index c7bdffdb..b98a53d8 100644 --- a/3ds Max/Max2Babylon/Exporter/BabylonExporter.cs +++ b/3ds Max/Max2Babylon/Exporter/BabylonExporter.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; using Babylon2GLTF; using BabylonExport.Entities; using Newtonsoft.Json; diff --git a/3ds Max/Max2Babylon/Forms/ExporterForm.Designer.cs b/3ds Max/Max2Babylon/Forms/ExporterForm.Designer.cs index 0872284e..55a8a0d4 100644 --- a/3ds Max/Max2Babylon/Forms/ExporterForm.Designer.cs +++ b/3ds Max/Max2Babylon/Forms/ExporterForm.Designer.cs @@ -95,9 +95,9 @@ private void InitializeComponent() this.chkTryReuseTexture = new System.Windows.Forms.CheckBox(); this.advancedTabPage = new System.Windows.Forms.TabPage(); this.dracoGroupBox = new System.Windows.Forms.GroupBox(); + this.dracoUserControl = new Utilities.DracoUserControl(); this.logTabPage = new System.Windows.Forms.TabPage(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.dracoUserControl = new Utilities.DracoUserControl(); this.exporterTabControl.SuspendLayout(); this.exportOptionsTabPage.SuspendLayout(); this.exportOptionsScrollPanel.SuspendLayout(); @@ -112,10 +112,10 @@ private void InitializeComponent() this.butExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.butExport.Enabled = false; this.butExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.butExport.Location = new System.Drawing.Point(259, 542); + this.butExport.Location = new System.Drawing.Point(259, 587); this.butExport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.butExport.Name = "butExport"; - this.butExport.Size = new System.Drawing.Size(80, 21); + this.butExport.Size = new System.Drawing.Size(80, 23); this.butExport.TabIndex = 100; this.butExport.Text = "Export"; this.butExport.UseVisualStyleBackColor = true; @@ -125,10 +125,10 @@ private void InitializeComponent() // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(25, 34); + this.label1.Location = new System.Drawing.Point(25, 37); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(71, 12); + this.label1.Size = new System.Drawing.Size(63, 13); this.label1.TabIndex = 1; this.label1.Text = "Model path:"; // @@ -136,11 +136,11 @@ private void InitializeComponent() // this.txtModelPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtModelPath.Location = new System.Drawing.Point(97, 31); + this.txtModelPath.Location = new System.Drawing.Point(97, 34); this.txtModelPath.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtModelPath.Multiline = false; this.txtModelPath.Name = "txtModelPath"; - this.txtModelPath.Size = new System.Drawing.Size(598, 20); + this.txtModelPath.Size = new System.Drawing.Size(598, 21); this.txtModelPath.TabIndex = 2; this.txtModelPath.Text = ""; this.txtModelPath.TextChanged += new System.EventHandler(this.txtFilename_TextChanged); @@ -150,10 +150,10 @@ private void InitializeComponent() // this.butModelBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.butModelBrowse.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.butModelBrowse.Location = new System.Drawing.Point(702, 31); + this.butModelBrowse.Location = new System.Drawing.Point(702, 34); this.butModelBrowse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.butModelBrowse.Name = "butModelBrowse"; - this.butModelBrowse.Size = new System.Drawing.Size(20, 20); + this.butModelBrowse.Size = new System.Drawing.Size(20, 22); this.butModelBrowse.TabIndex = 3; this.butModelBrowse.Text = "¡­"; this.butModelBrowse.UseVisualStyleBackColor = true; @@ -170,21 +170,19 @@ private void InitializeComponent() // this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.progressBar.Location = new System.Drawing.Point(6, 542); + this.progressBar.Location = new System.Drawing.Point(6, 587); this.progressBar.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.progressBar.Name = "progressBar"; - this.progressBar.Size = new System.Drawing.Size(245, 21); + this.progressBar.Size = new System.Drawing.Size(245, 23); this.progressBar.TabIndex = 104; // // logTreeView // - this.logTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.logTreeView.Location = new System.Drawing.Point(4, 5); + this.logTreeView.Dock = System.Windows.Forms.DockStyle.Fill; + this.logTreeView.Location = new System.Drawing.Point(3, 3); this.logTreeView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.logTreeView.Name = "logTreeView"; - this.logTreeView.Size = new System.Drawing.Size(917, 459); + this.logTreeView.Size = new System.Drawing.Size(911, 454); this.logTreeView.TabIndex = 103; this.logTreeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ExporterForm_KeyDown); // @@ -193,10 +191,10 @@ private void InitializeComponent() this.butCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.butCancel.Enabled = false; this.butCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.butCancel.Location = new System.Drawing.Point(750, 542); + this.butCancel.Location = new System.Drawing.Point(750, 587); this.butCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.butCancel.Name = "butCancel"; - this.butCancel.Size = new System.Drawing.Size(80, 21); + this.butCancel.Size = new System.Drawing.Size(80, 23); this.butCancel.TabIndex = 105; this.butCancel.Text = "Cancel"; this.butCancel.UseVisualStyleBackColor = true; @@ -207,10 +205,10 @@ private void InitializeComponent() // this.chkManifest.AutoSize = true; this.chkManifest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkManifest.Location = new System.Drawing.Point(316, 145); + this.chkManifest.Location = new System.Drawing.Point(316, 157); this.chkManifest.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkManifest.Name = "chkManifest"; - this.chkManifest.Size = new System.Drawing.Size(129, 16); + this.chkManifest.Size = new System.Drawing.Size(113, 17); this.chkManifest.TabIndex = 14; this.chkManifest.Text = "Generate .manifest"; this.chkManifest.UseVisualStyleBackColor = true; @@ -219,10 +217,10 @@ private void InitializeComponent() // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(2, 85); + this.label2.Location = new System.Drawing.Point(2, 92); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.Size = new System.Drawing.Size(46, 13); this.label2.TabIndex = 10; this.label2.Text = "Options:"; // @@ -232,10 +230,10 @@ private void InitializeComponent() this.chkWriteTextures.Checked = true; this.chkWriteTextures.CheckState = System.Windows.Forms.CheckState.Checked; this.chkWriteTextures.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkWriteTextures.Location = new System.Drawing.Point(14, 166); + this.chkWriteTextures.Location = new System.Drawing.Point(14, 180); this.chkWriteTextures.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkWriteTextures.Name = "chkWriteTextures"; - this.chkWriteTextures.Size = new System.Drawing.Size(105, 16); + this.chkWriteTextures.Size = new System.Drawing.Size(93, 17); this.chkWriteTextures.TabIndex = 11; this.chkWriteTextures.Text = "Write Textures"; this.chkWriteTextures.UseVisualStyleBackColor = true; @@ -245,9 +243,9 @@ private void InitializeComponent() // this.chkExportAnimationsOnly.AutoSize = true; this.chkExportAnimationsOnly.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkExportAnimationsOnly.Location = new System.Drawing.Point(316, 188); + this.chkExportAnimationsOnly.Location = new System.Drawing.Point(316, 204); this.chkExportAnimationsOnly.Name = "chkExportAnimationsOnly"; - this.chkExportAnimationsOnly.Size = new System.Drawing.Size(153, 16); + this.chkExportAnimationsOnly.Size = new System.Drawing.Size(132, 17); this.chkExportAnimationsOnly.TabIndex = 43; this.chkExportAnimationsOnly.Text = "Export Animations Only"; this.chkExportAnimationsOnly.UseVisualStyleBackColor = true; @@ -258,9 +256,9 @@ private void InitializeComponent() this.chkExportTextures.Checked = true; this.chkExportTextures.CheckState = System.Windows.Forms.CheckState.Checked; this.chkExportTextures.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkExportTextures.Location = new System.Drawing.Point(162, 104); + this.chkExportTextures.Location = new System.Drawing.Point(162, 113); this.chkExportTextures.Name = "chkExportTextures"; - this.chkExportTextures.Size = new System.Drawing.Size(111, 16); + this.chkExportTextures.Size = new System.Drawing.Size(98, 17); this.chkExportTextures.TabIndex = 42; this.chkExportTextures.Text = "Export Textures"; this.chkExportTextures.UseVisualStyleBackColor = true; @@ -271,9 +269,9 @@ private void InitializeComponent() this.chkExportAnimations.Checked = true; this.chkExportAnimations.CheckState = System.Windows.Forms.CheckState.Checked; this.chkExportAnimations.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkExportAnimations.Location = new System.Drawing.Point(316, 104); + this.chkExportAnimations.Location = new System.Drawing.Point(316, 113); this.chkExportAnimations.Name = "chkExportAnimations"; - this.chkExportAnimations.Size = new System.Drawing.Size(123, 16); + this.chkExportAnimations.Size = new System.Drawing.Size(108, 17); this.chkExportAnimations.TabIndex = 42; this.chkExportAnimations.Text = "Export Animations"; this.chkExportAnimations.UseVisualStyleBackColor = true; @@ -282,10 +280,10 @@ private void InitializeComponent() // this.lblBakeAnimation.AutoSize = true; this.lblBakeAnimation.Enabled = false; - this.lblBakeAnimation.Location = new System.Drawing.Point(159, 231); + this.lblBakeAnimation.Location = new System.Drawing.Point(159, 250); this.lblBakeAnimation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblBakeAnimation.Name = "lblBakeAnimation"; - this.lblBakeAnimation.Size = new System.Drawing.Size(149, 12); + this.lblBakeAnimation.Size = new System.Drawing.Size(125, 13); this.lblBakeAnimation.TabIndex = 40; this.lblBakeAnimation.Text = "Bake animations options:"; // @@ -297,10 +295,10 @@ private void InitializeComponent() "Do not bake animations", "Bake all animations", "Selective bake"}); - this.cmbBakeAnimationOptions.Location = new System.Drawing.Point(310, 229); + this.cmbBakeAnimationOptions.Location = new System.Drawing.Point(310, 248); this.cmbBakeAnimationOptions.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cmbBakeAnimationOptions.Name = "cmbBakeAnimationOptions"; - this.cmbBakeAnimationOptions.Size = new System.Drawing.Size(178, 20); + this.cmbBakeAnimationOptions.Size = new System.Drawing.Size(178, 21); this.cmbBakeAnimationOptions.TabIndex = 41; // // chkApplyPreprocessToScene @@ -308,10 +306,10 @@ private void InitializeComponent() this.chkApplyPreprocessToScene.AutoSize = true; this.chkApplyPreprocessToScene.Enabled = false; this.chkApplyPreprocessToScene.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkApplyPreprocessToScene.Location = new System.Drawing.Point(14, 266); + this.chkApplyPreprocessToScene.Location = new System.Drawing.Point(14, 288); this.chkApplyPreprocessToScene.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkApplyPreprocessToScene.Name = "chkApplyPreprocessToScene"; - this.chkApplyPreprocessToScene.Size = new System.Drawing.Size(171, 16); + this.chkApplyPreprocessToScene.Size = new System.Drawing.Size(156, 17); this.chkApplyPreprocessToScene.TabIndex = 39; this.chkApplyPreprocessToScene.Text = "Apply Preprocess To Scene"; this.chkApplyPreprocessToScene.UseVisualStyleBackColor = true; @@ -321,10 +319,10 @@ private void InitializeComponent() this.chkMrgContainersAndXref.AutoSize = true; this.chkMrgContainersAndXref.Enabled = false; this.chkMrgContainersAndXref.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkMrgContainersAndXref.Location = new System.Drawing.Point(14, 247); + this.chkMrgContainersAndXref.Location = new System.Drawing.Point(14, 268); this.chkMrgContainersAndXref.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkMrgContainersAndXref.Name = "chkMrgContainersAndXref"; - this.chkMrgContainersAndXref.Size = new System.Drawing.Size(171, 16); + this.chkMrgContainersAndXref.Size = new System.Drawing.Size(156, 17); this.chkMrgContainersAndXref.TabIndex = 37; this.chkMrgContainersAndXref.Text = "Merge Containers And XRef"; this.chkMrgContainersAndXref.UseVisualStyleBackColor = true; @@ -333,10 +331,10 @@ private void InitializeComponent() // this.chkUsePreExportProces.AutoSize = true; this.chkUsePreExportProces.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkUsePreExportProces.Location = new System.Drawing.Point(14, 231); + this.chkUsePreExportProces.Location = new System.Drawing.Point(14, 250); this.chkUsePreExportProces.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkUsePreExportProces.Name = "chkUsePreExportProces"; - this.chkUsePreExportProces.Size = new System.Drawing.Size(153, 16); + this.chkUsePreExportProces.Size = new System.Drawing.Size(136, 17); this.chkUsePreExportProces.TabIndex = 36; this.chkUsePreExportProces.Text = "Use PreExport Process:"; this.chkUsePreExportProces.UseVisualStyleBackColor = true; @@ -346,10 +344,10 @@ private void InitializeComponent() // this.chkFlatten.AutoSize = true; this.chkFlatten.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkFlatten.Location = new System.Drawing.Point(14, 209); + this.chkFlatten.Location = new System.Drawing.Point(14, 226); this.chkFlatten.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkFlatten.Name = "chkFlatten"; - this.chkFlatten.Size = new System.Drawing.Size(135, 16); + this.chkFlatten.Size = new System.Drawing.Size(112, 17); this.chkFlatten.TabIndex = 35; this.chkFlatten.Text = "Flatten Hierarchies"; this.chkFlatten.UseVisualStyleBackColor = true; @@ -357,29 +355,29 @@ private void InitializeComponent() // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(14, 370); + this.label5.Location = new System.Drawing.Point(14, 401); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(71, 12); + this.label5.Size = new System.Drawing.Size(66, 13); this.label5.TabIndex = 29; this.label5.Text = "Environment"; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(2, 296); + this.label8.Location = new System.Drawing.Point(2, 321); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(131, 12); + this.label8.Size = new System.Drawing.Size(113, 13); this.label8.TabIndex = 33; this.label8.Text = "Morph Target Options:"; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(7, 336); + this.label7.Location = new System.Drawing.Point(7, 364); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(125, 12); + this.label7.Size = new System.Drawing.Size(112, 13); this.label7.TabIndex = 33; this.label7.Text = "Babylon PBR Options:"; // @@ -387,21 +385,21 @@ private void InitializeComponent() // this.txtEnvironmentName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtEnvironmentName.Location = new System.Drawing.Point(90, 368); + this.txtEnvironmentName.Location = new System.Drawing.Point(90, 399); this.txtEnvironmentName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtEnvironmentName.Multiline = false; this.txtEnvironmentName.Name = "txtEnvironmentName"; - this.txtEnvironmentName.Size = new System.Drawing.Size(589, 19); + this.txtEnvironmentName.Size = new System.Drawing.Size(589, 20); this.txtEnvironmentName.TabIndex = 30; this.txtEnvironmentName.Text = ""; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(7, 387); + this.label6.Location = new System.Drawing.Point(7, 419); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(83, 12); + this.label6.Size = new System.Drawing.Size(76, 13); this.label6.TabIndex = 29; this.label6.Text = "GLTF Options:"; // @@ -409,10 +407,10 @@ private void InitializeComponent() // this.chkFullPBR.AutoSize = true; this.chkFullPBR.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkFullPBR.Location = new System.Drawing.Point(14, 353); + this.chkFullPBR.Location = new System.Drawing.Point(14, 382); this.chkFullPBR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkFullPBR.Name = "chkFullPBR"; - this.chkFullPBR.Size = new System.Drawing.Size(93, 16); + this.chkFullPBR.Size = new System.Drawing.Size(87, 17); this.chkFullPBR.TabIndex = 28; this.chkFullPBR.Text = "Use Full PBR"; this.chkFullPBR.UseVisualStyleBackColor = true; @@ -422,10 +420,10 @@ private void InitializeComponent() this.btnEnvBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnEnvBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnEnvBrowse.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnEnvBrowse.Location = new System.Drawing.Point(682, 367); + this.btnEnvBrowse.Location = new System.Drawing.Point(682, 398); this.btnEnvBrowse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnEnvBrowse.Name = "btnEnvBrowse"; - this.btnEnvBrowse.Size = new System.Drawing.Size(20, 20); + this.btnEnvBrowse.Size = new System.Drawing.Size(20, 22); this.btnEnvBrowse.TabIndex = 31; this.btnEnvBrowse.Text = "¡­"; this.btnEnvBrowse.UseVisualStyleBackColor = true; @@ -435,10 +433,10 @@ private void InitializeComponent() // this.chkNoAutoLight.AutoSize = true; this.chkNoAutoLight.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkNoAutoLight.Location = new System.Drawing.Point(457, 103); + this.chkNoAutoLight.Location = new System.Drawing.Point(457, 112); this.chkNoAutoLight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkNoAutoLight.Name = "chkNoAutoLight"; - this.chkNoAutoLight.Size = new System.Drawing.Size(129, 16); + this.chkNoAutoLight.Size = new System.Drawing.Size(114, 17); this.chkNoAutoLight.TabIndex = 27; this.chkNoAutoLight.Text = "No Automatic Light"; this.chkNoAutoLight.UseVisualStyleBackColor = true; @@ -446,10 +444,10 @@ private void InitializeComponent() // textureLabel // this.textureLabel.AutoSize = true; - this.textureLabel.Location = new System.Drawing.Point(7, 64); + this.textureLabel.Location = new System.Drawing.Point(7, 69); this.textureLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.textureLabel.Name = "textureLabel"; - this.textureLabel.Size = new System.Drawing.Size(89, 12); + this.textureLabel.Size = new System.Drawing.Size(76, 13); this.textureLabel.TabIndex = 24; this.textureLabel.Text = "Textures Path:"; // @@ -457,11 +455,11 @@ private void InitializeComponent() // this.txtTexturesPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtTexturesPath.Location = new System.Drawing.Point(97, 61); + this.txtTexturesPath.Location = new System.Drawing.Point(97, 66); this.txtTexturesPath.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtTexturesPath.Multiline = false; this.txtTexturesPath.Name = "txtTexturesPath"; - this.txtTexturesPath.Size = new System.Drawing.Size(598, 20); + this.txtTexturesPath.Size = new System.Drawing.Size(598, 21); this.txtTexturesPath.TabIndex = 25; this.txtTexturesPath.Text = ""; // @@ -469,10 +467,10 @@ private void InitializeComponent() // this.btnTxtBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTxtBrowse.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnTxtBrowse.Location = new System.Drawing.Point(702, 61); + this.btnTxtBrowse.Location = new System.Drawing.Point(702, 66); this.btnTxtBrowse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnTxtBrowse.Name = "btnTxtBrowse"; - this.btnTxtBrowse.Size = new System.Drawing.Size(20, 20); + this.btnTxtBrowse.Size = new System.Drawing.Size(20, 22); this.btnTxtBrowse.TabIndex = 26; this.btnTxtBrowse.Text = "¡­"; this.btnTxtBrowse.UseVisualStyleBackColor = true; @@ -484,10 +482,10 @@ private void InitializeComponent() this.chkExportMaterials.Checked = true; this.chkExportMaterials.CheckState = System.Windows.Forms.CheckState.Checked; this.chkExportMaterials.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkExportMaterials.Location = new System.Drawing.Point(14, 104); + this.chkExportMaterials.Location = new System.Drawing.Point(14, 113); this.chkExportMaterials.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkExportMaterials.Name = "chkExportMaterials"; - this.chkExportMaterials.Size = new System.Drawing.Size(117, 16); + this.chkExportMaterials.Size = new System.Drawing.Size(99, 17); this.chkExportMaterials.TabIndex = 23; this.chkExportMaterials.Text = "Export Materials"; this.chkExportMaterials.UseVisualStyleBackColor = true; @@ -496,10 +494,10 @@ private void InitializeComponent() // this.chkKHRMaterialsUnlit.AutoSize = true; this.chkKHRMaterialsUnlit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkKHRMaterialsUnlit.Location = new System.Drawing.Point(316, 402); + this.chkKHRMaterialsUnlit.Location = new System.Drawing.Point(316, 436); this.chkKHRMaterialsUnlit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkKHRMaterialsUnlit.Name = "chkKHRMaterialsUnlit"; - this.chkKHRMaterialsUnlit.Size = new System.Drawing.Size(135, 16); + this.chkKHRMaterialsUnlit.Size = new System.Drawing.Size(119, 17); this.chkKHRMaterialsUnlit.TabIndex = 22; this.chkKHRMaterialsUnlit.Text = "KHR_materials_unlit"; this.chkKHRMaterialsUnlit.UseVisualStyleBackColor = true; @@ -508,10 +506,10 @@ private void InitializeComponent() // this.chkKHRTextureTransform.AutoSize = true; this.chkKHRTextureTransform.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkKHRTextureTransform.Location = new System.Drawing.Point(162, 402); + this.chkKHRTextureTransform.Location = new System.Drawing.Point(162, 436); this.chkKHRTextureTransform.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkKHRTextureTransform.Name = "chkKHRTextureTransform"; - this.chkKHRTextureTransform.Size = new System.Drawing.Size(147, 16); + this.chkKHRTextureTransform.Size = new System.Drawing.Size(134, 17); this.chkKHRTextureTransform.TabIndex = 21; this.chkKHRTextureTransform.Text = "KHR_texture_transform"; this.chkKHRTextureTransform.UseVisualStyleBackColor = true; @@ -520,10 +518,10 @@ private void InitializeComponent() // this.chkKHRLightsPunctual.AutoSize = true; this.chkKHRLightsPunctual.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkKHRLightsPunctual.Location = new System.Drawing.Point(14, 402); + this.chkKHRLightsPunctual.Location = new System.Drawing.Point(14, 436); this.chkKHRLightsPunctual.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkKHRLightsPunctual.Name = "chkKHRLightsPunctual"; - this.chkKHRLightsPunctual.Size = new System.Drawing.Size(135, 16); + this.chkKHRLightsPunctual.Size = new System.Drawing.Size(124, 17); this.chkKHRLightsPunctual.TabIndex = 20; this.chkKHRLightsPunctual.Text = "KHR_lights_punctual"; this.chkKHRLightsPunctual.UseVisualStyleBackColor = true; @@ -534,10 +532,10 @@ private void InitializeComponent() this.chkOverwriteTextures.Checked = true; this.chkOverwriteTextures.CheckState = System.Windows.Forms.CheckState.Checked; this.chkOverwriteTextures.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkOverwriteTextures.Location = new System.Drawing.Point(162, 166); + this.chkOverwriteTextures.Location = new System.Drawing.Point(162, 180); this.chkOverwriteTextures.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkOverwriteTextures.Name = "chkOverwriteTextures"; - this.chkOverwriteTextures.Size = new System.Drawing.Size(129, 16); + this.chkOverwriteTextures.Size = new System.Drawing.Size(113, 17); this.chkOverwriteTextures.TabIndex = 19; this.chkOverwriteTextures.Text = "Overwrite Textures"; this.chkOverwriteTextures.UseVisualStyleBackColor = true; @@ -546,9 +544,9 @@ private void InitializeComponent() // this.chkDoNotOptimizeAnimations.AutoSize = true; this.chkDoNotOptimizeAnimations.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkDoNotOptimizeAnimations.Location = new System.Drawing.Point(162, 209); + this.chkDoNotOptimizeAnimations.Location = new System.Drawing.Point(162, 226); this.chkDoNotOptimizeAnimations.Name = "chkDoNotOptimizeAnimations"; - this.chkDoNotOptimizeAnimations.Size = new System.Drawing.Size(177, 16); + this.chkDoNotOptimizeAnimations.Size = new System.Drawing.Size(155, 17); this.chkDoNotOptimizeAnimations.TabIndex = 18; this.chkDoNotOptimizeAnimations.Text = "Do Not Optimize Animations"; this.chkDoNotOptimizeAnimations.UseVisualStyleBackColor = true; @@ -558,9 +556,9 @@ private void InitializeComponent() // this.chkAnimgroupExportNonAnimated.AutoSize = true; this.chkAnimgroupExportNonAnimated.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkAnimgroupExportNonAnimated.Location = new System.Drawing.Point(14, 188); + this.chkAnimgroupExportNonAnimated.Location = new System.Drawing.Point(14, 204); this.chkAnimgroupExportNonAnimated.Name = "chkAnimgroupExportNonAnimated"; - this.chkAnimgroupExportNonAnimated.Size = new System.Drawing.Size(291, 16); + this.chkAnimgroupExportNonAnimated.Size = new System.Drawing.Size(250, 17); this.chkAnimgroupExportNonAnimated.TabIndex = 18; this.chkAnimgroupExportNonAnimated.Text = "(Animation Group) Export Non-Animated Objects"; this.chkAnimgroupExportNonAnimated.UseVisualStyleBackColor = true; @@ -570,10 +568,10 @@ private void InitializeComponent() // this.chkDracoCompression.AutoSize = true; this.chkDracoCompression.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkDracoCompression.Location = new System.Drawing.Point(162, 145); + this.chkDracoCompression.Location = new System.Drawing.Point(162, 157); this.chkDracoCompression.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkDracoCompression.Name = "chkDracoCompression"; - this.chkDracoCompression.Size = new System.Drawing.Size(147, 16); + this.chkDracoCompression.Size = new System.Drawing.Size(137, 17); this.chkDracoCompression.TabIndex = 18; this.chkDracoCompression.Text = "Use Draco compression"; this.chkDracoCompression.UseVisualStyleBackColor = true; @@ -586,10 +584,10 @@ private void InitializeComponent() this.chkMergeAO.Checked = true; this.chkMergeAO.CheckState = System.Windows.Forms.CheckState.Checked; this.chkMergeAO.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkMergeAO.Location = new System.Drawing.Point(316, 166); + this.chkMergeAO.Location = new System.Drawing.Point(316, 180); this.chkMergeAO.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkMergeAO.Name = "chkMergeAO"; - this.chkMergeAO.Size = new System.Drawing.Size(93, 16); + this.chkMergeAO.Size = new System.Drawing.Size(95, 17); this.chkMergeAO.TabIndex = 17; this.chkMergeAO.Text = "Merge AO map"; this.chkMergeAO.UseVisualStyleBackColor = true; @@ -597,10 +595,10 @@ private void InitializeComponent() // // txtQuality // - this.txtQuality.Location = new System.Drawing.Point(702, 122); + this.txtQuality.Location = new System.Drawing.Point(702, 132); this.txtQuality.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtQuality.Name = "txtQuality"; - this.txtQuality.Size = new System.Drawing.Size(43, 21); + this.txtQuality.Size = new System.Drawing.Size(43, 20); this.txtQuality.TabIndex = 9; this.txtQuality.Text = "100"; this.txtQuality.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -609,10 +607,10 @@ private void InitializeComponent() // labelQuality // this.labelQuality.AutoSize = true; - this.labelQuality.Location = new System.Drawing.Point(601, 126); + this.labelQuality.Location = new System.Drawing.Point(601, 136); this.labelQuality.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelQuality.Name = "labelQuality"; - this.labelQuality.Size = new System.Drawing.Size(101, 12); + this.labelQuality.Size = new System.Drawing.Size(79, 13); this.labelQuality.TabIndex = 8; this.labelQuality.Text = "Texture quality:"; // @@ -622,9 +620,9 @@ private void InitializeComponent() this.chkExportMorphNormals.Checked = true; this.chkExportMorphNormals.CheckState = System.Windows.Forms.CheckState.Checked; this.chkExportMorphNormals.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkExportMorphNormals.Location = new System.Drawing.Point(162, 311); + this.chkExportMorphNormals.Location = new System.Drawing.Point(162, 337); this.chkExportMorphNormals.Name = "chkExportMorphNormals"; - this.chkExportMorphNormals.Size = new System.Drawing.Size(141, 16); + this.chkExportMorphNormals.Size = new System.Drawing.Size(125, 17); this.chkExportMorphNormals.TabIndex = 16; this.chkExportMorphNormals.Text = "Export morph normals"; this.chkExportMorphNormals.UseVisualStyleBackColor = true; @@ -634,9 +632,9 @@ private void InitializeComponent() // this.chkExportMorphTangents.AutoSize = true; this.chkExportMorphTangents.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkExportMorphTangents.Location = new System.Drawing.Point(14, 311); + this.chkExportMorphTangents.Location = new System.Drawing.Point(14, 337); this.chkExportMorphTangents.Name = "chkExportMorphTangents"; - this.chkExportMorphTangents.Size = new System.Drawing.Size(147, 16); + this.chkExportMorphTangents.Size = new System.Drawing.Size(130, 17); this.chkExportMorphTangents.TabIndex = 16; this.chkExportMorphTangents.Text = "Export morph tangents"; this.chkExportMorphTangents.UseVisualStyleBackColor = true; @@ -648,10 +646,10 @@ private void InitializeComponent() this.chkExportTangents.Checked = true; this.chkExportTangents.CheckState = System.Windows.Forms.CheckState.Checked; this.chkExportTangents.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkExportTangents.Location = new System.Drawing.Point(316, 124); + this.chkExportTangents.Location = new System.Drawing.Point(316, 134); this.chkExportTangents.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkExportTangents.Name = "chkExportTangents"; - this.chkExportTangents.Size = new System.Drawing.Size(111, 16); + this.chkExportTangents.Size = new System.Drawing.Size(98, 17); this.chkExportTangents.TabIndex = 16; this.chkExportTangents.Text = "Export tangents"; this.chkExportTangents.UseVisualStyleBackColor = true; @@ -660,19 +658,19 @@ private void InitializeComponent() // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(613, 103); + this.label4.Location = new System.Drawing.Point(613, 112); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(83, 12); + this.label4.Size = new System.Drawing.Size(67, 13); this.label4.TabIndex = 6; this.label4.Text = "Scale factor:"; // // txtScaleFactor // - this.txtScaleFactor.Location = new System.Drawing.Point(702, 99); + this.txtScaleFactor.Location = new System.Drawing.Point(702, 107); this.txtScaleFactor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtScaleFactor.Name = "txtScaleFactor"; - this.txtScaleFactor.Size = new System.Drawing.Size(42, 21); + this.txtScaleFactor.Size = new System.Drawing.Size(42, 20); this.txtScaleFactor.TabIndex = 7; this.txtScaleFactor.Text = "1"; this.txtScaleFactor.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -681,10 +679,10 @@ private void InitializeComponent() // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(7, 7); + this.label3.Location = new System.Drawing.Point(7, 8); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(89, 12); + this.label3.Size = new System.Drawing.Size(74, 13); this.label3.TabIndex = 4; this.label3.Text = "Output format:"; // @@ -699,7 +697,7 @@ private void InitializeComponent() this.comboOutputFormat.Location = new System.Drawing.Point(97, 3); this.comboOutputFormat.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.comboOutputFormat.Name = "comboOutputFormat"; - this.comboOutputFormat.Size = new System.Drawing.Size(121, 20); + this.comboOutputFormat.Size = new System.Drawing.Size(121, 21); this.comboOutputFormat.TabIndex = 5; this.comboOutputFormat.SelectedIndexChanged += new System.EventHandler(this.comboOutputFormat_SelectedIndexChanged); this.comboOutputFormat.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ExporterForm_KeyDown); @@ -708,10 +706,10 @@ private void InitializeComponent() // this.chkOnlySelected.AutoSize = true; this.chkOnlySelected.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkOnlySelected.Location = new System.Drawing.Point(162, 124); + this.chkOnlySelected.Location = new System.Drawing.Point(162, 134); this.chkOnlySelected.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkOnlySelected.Name = "chkOnlySelected"; - this.chkOnlySelected.Size = new System.Drawing.Size(141, 16); + this.chkOnlySelected.Size = new System.Drawing.Size(119, 17); this.chkOnlySelected.TabIndex = 13; this.chkOnlySelected.Text = "Export only selected"; this.chkOnlySelected.UseVisualStyleBackColor = true; @@ -721,10 +719,10 @@ private void InitializeComponent() // this.chkAutoSave.AutoSize = true; this.chkAutoSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkAutoSave.Location = new System.Drawing.Point(14, 145); + this.chkAutoSave.Location = new System.Drawing.Point(14, 157); this.chkAutoSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkAutoSave.Name = "chkAutoSave"; - this.chkAutoSave.Size = new System.Drawing.Size(123, 16); + this.chkAutoSave.Size = new System.Drawing.Size(108, 17); this.chkAutoSave.TabIndex = 15; this.chkAutoSave.Text = "Save 3ds Max file"; this.chkAutoSave.UseVisualStyleBackColor = true; @@ -734,10 +732,10 @@ private void InitializeComponent() // this.chkHidden.AutoSize = true; this.chkHidden.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkHidden.Location = new System.Drawing.Point(14, 124); + this.chkHidden.Location = new System.Drawing.Point(14, 134); this.chkHidden.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkHidden.Name = "chkHidden"; - this.chkHidden.Size = new System.Drawing.Size(147, 16); + this.chkHidden.Size = new System.Drawing.Size(126, 17); this.chkHidden.TabIndex = 12; this.chkHidden.Text = "Export hidden objects"; this.chkHidden.UseVisualStyleBackColor = true; @@ -748,10 +746,10 @@ private void InitializeComponent() this.butExportAndRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.butExportAndRun.Enabled = false; this.butExportAndRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.butExportAndRun.Location = new System.Drawing.Point(347, 542); + this.butExportAndRun.Location = new System.Drawing.Point(347, 587); this.butExportAndRun.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.butExportAndRun.Name = "butExportAndRun"; - this.butExportAndRun.Size = new System.Drawing.Size(95, 21); + this.butExportAndRun.Size = new System.Drawing.Size(95, 23); this.butExportAndRun.TabIndex = 102; this.butExportAndRun.Text = "Export && Run"; this.butExportAndRun.UseVisualStyleBackColor = true; @@ -762,10 +760,10 @@ private void InitializeComponent() // this.butClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.butClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.butClose.Location = new System.Drawing.Point(838, 542); + this.butClose.Location = new System.Drawing.Point(838, 587); this.butClose.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.butClose.Name = "butClose"; - this.butClose.Size = new System.Drawing.Size(80, 21); + this.butClose.Size = new System.Drawing.Size(80, 23); this.butClose.TabIndex = 106; this.butClose.Text = "Close"; this.butClose.UseVisualStyleBackColor = true; @@ -780,10 +778,10 @@ private void InitializeComponent() // this.butMultiExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.butMultiExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.butMultiExport.Location = new System.Drawing.Point(544, 542); + this.butMultiExport.Location = new System.Drawing.Point(544, 587); this.butMultiExport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.butMultiExport.Name = "butMultiExport"; - this.butMultiExport.Size = new System.Drawing.Size(198, 21); + this.butMultiExport.Size = new System.Drawing.Size(198, 23); this.butMultiExport.TabIndex = 109; this.butMultiExport.Text = "Multi-File Export | Shift-click to edit"; this.butMultiExport.UseVisualStyleBackColor = true; @@ -793,10 +791,10 @@ private void InitializeComponent() // this.saveOptionBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.saveOptionBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.saveOptionBtn.Location = new System.Drawing.Point(450, 542); + this.saveOptionBtn.Location = new System.Drawing.Point(450, 587); this.saveOptionBtn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.saveOptionBtn.Name = "saveOptionBtn"; - this.saveOptionBtn.Size = new System.Drawing.Size(86, 21); + this.saveOptionBtn.Size = new System.Drawing.Size(86, 23); this.saveOptionBtn.TabIndex = 110; this.saveOptionBtn.Text = "Save Options"; this.saveOptionBtn.UseVisualStyleBackColor = true; @@ -812,10 +810,10 @@ private void InitializeComponent() // this.butCopyToClipboard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.butCopyToClipboard.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.butCopyToClipboard.Location = new System.Drawing.Point(4, -1045); + this.butCopyToClipboard.Location = new System.Drawing.Point(4, -1510); this.butCopyToClipboard.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.butCopyToClipboard.Name = "butCopyToClipboard"; - this.butCopyToClipboard.Size = new System.Drawing.Size(111, 21); + this.butCopyToClipboard.Size = new System.Drawing.Size(111, 23); this.butCopyToClipboard.TabIndex = 105; this.butCopyToClipboard.Text = "Copy To Clipboard"; this.butCopyToClipboard.UseVisualStyleBackColor = true; @@ -830,10 +828,10 @@ private void InitializeComponent() this.exporterTabControl.Controls.Add(this.exportOptionsTabPage); this.exporterTabControl.Controls.Add(this.advancedTabPage); this.exporterTabControl.Controls.Add(this.logTabPage); - this.exporterTabControl.Location = new System.Drawing.Point(2, 82); + this.exporterTabControl.Location = new System.Drawing.Point(2, 89); this.exporterTabControl.Name = "exporterTabControl"; this.exporterTabControl.SelectedIndex = 0; - this.exporterTabControl.Size = new System.Drawing.Size(925, 449); + this.exporterTabControl.Size = new System.Drawing.Size(925, 486); this.exporterTabControl.TabIndex = 112; // // exportOptionsTabPage @@ -842,7 +840,7 @@ private void InitializeComponent() this.exportOptionsTabPage.Location = new System.Drawing.Point(4, 22); this.exportOptionsTabPage.Name = "exportOptionsTabPage"; this.exportOptionsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.exportOptionsTabPage.Size = new System.Drawing.Size(917, 423); + this.exportOptionsTabPage.Size = new System.Drawing.Size(917, 460); this.exportOptionsTabPage.TabIndex = 0; this.exportOptionsTabPage.Text = "Options"; this.exportOptionsTabPage.UseVisualStyleBackColor = true; @@ -903,17 +901,17 @@ private void InitializeComponent() this.exportOptionsScrollPanel.Margin = new System.Windows.Forms.Padding(0); this.exportOptionsScrollPanel.Name = "exportOptionsScrollPanel"; this.exportOptionsScrollPanel.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.exportOptionsScrollPanel.Size = new System.Drawing.Size(911, 421); + this.exportOptionsScrollPanel.Size = new System.Drawing.Size(911, 456); this.exportOptionsScrollPanel.TabIndex = 44; // // chkUseClone // this.chkUseClone.AutoSize = true; this.chkUseClone.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkUseClone.Location = new System.Drawing.Point(457, 145); + this.chkUseClone.Location = new System.Drawing.Point(457, 157); this.chkUseClone.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkUseClone.Name = "chkUseClone"; - this.chkUseClone.Size = new System.Drawing.Size(165, 16); + this.chkUseClone.Size = new System.Drawing.Size(140, 17); this.chkUseClone.TabIndex = 45; this.chkUseClone.Text = "Use clone (experimental)"; this.chkUseClone.UseVisualStyleBackColor = true; @@ -922,10 +920,10 @@ private void InitializeComponent() // this.chkTryReuseTexture.AutoSize = true; this.chkTryReuseTexture.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkTryReuseTexture.Location = new System.Drawing.Point(457, 124); + this.chkTryReuseTexture.Location = new System.Drawing.Point(457, 134); this.chkTryReuseTexture.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.chkTryReuseTexture.Name = "chkTryReuseTexture"; - this.chkTryReuseTexture.Size = new System.Drawing.Size(123, 16); + this.chkTryReuseTexture.Size = new System.Drawing.Size(103, 17); this.chkTryReuseTexture.TabIndex = 44; this.chkTryReuseTexture.Text = "Try reuse texture"; this.chkTryReuseTexture.UseVisualStyleBackColor = true; @@ -936,7 +934,7 @@ private void InitializeComponent() this.advancedTabPage.Location = new System.Drawing.Point(4, 22); this.advancedTabPage.Margin = new System.Windows.Forms.Padding(2); this.advancedTabPage.Name = "advancedTabPage"; - this.advancedTabPage.Size = new System.Drawing.Size(917, 423); + this.advancedTabPage.Size = new System.Drawing.Size(917, 460); this.advancedTabPage.TabIndex = 2; this.advancedTabPage.Text = "Advanced"; this.advancedTabPage.UseVisualStyleBackColor = true; @@ -944,15 +942,25 @@ private void InitializeComponent() // dracoGroupBox // this.dracoGroupBox.Controls.Add(this.dracoUserControl); - this.dracoGroupBox.Location = new System.Drawing.Point(10, 9); + this.dracoGroupBox.Location = new System.Drawing.Point(10, 10); this.dracoGroupBox.Margin = new System.Windows.Forms.Padding(2); this.dracoGroupBox.Name = "dracoGroupBox"; this.dracoGroupBox.Padding = new System.Windows.Forms.Padding(2); - this.dracoGroupBox.Size = new System.Drawing.Size(375, 338); + this.dracoGroupBox.Size = new System.Drawing.Size(375, 366); this.dracoGroupBox.TabIndex = 0; this.dracoGroupBox.TabStop = false; this.dracoGroupBox.Text = "Draco settings"; // + // dracoUserControl + // + this.dracoUserControl.AutoSize = true; + this.dracoUserControl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.dracoUserControl.Location = new System.Drawing.Point(4, 16); + this.dracoUserControl.Margin = new System.Windows.Forms.Padding(1); + this.dracoUserControl.Name = "dracoUserControl"; + this.dracoUserControl.Size = new System.Drawing.Size(373, 382); + this.dracoUserControl.TabIndex = 0; + // // logTabPage // this.logTabPage.Controls.Add(this.logTreeView); @@ -960,7 +968,7 @@ private void InitializeComponent() this.logTabPage.Location = new System.Drawing.Point(4, 22); this.logTabPage.Name = "logTabPage"; this.logTabPage.Padding = new System.Windows.Forms.Padding(3); - this.logTabPage.Size = new System.Drawing.Size(917, 423); + this.logTabPage.Size = new System.Drawing.Size(917, 460); this.logTabPage.TabIndex = 1; this.logTabPage.Text = "Log"; this.logTabPage.UseVisualStyleBackColor = true; @@ -970,25 +978,15 @@ private void InitializeComponent() this.pictureBox1.Image = global::Max2Babylon.Properties.Resources.MaxExporter; this.pictureBox1.Location = new System.Drawing.Point(6, 3); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(513, 74); + this.pictureBox1.Size = new System.Drawing.Size(513, 80); this.pictureBox1.TabIndex = 113; this.pictureBox1.TabStop = false; // - // dracoUserControl - // - this.dracoUserControl.AutoSize = true; - this.dracoUserControl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.dracoUserControl.Location = new System.Drawing.Point(4, 15); - this.dracoUserControl.Margin = new System.Windows.Forms.Padding(1); - this.dracoUserControl.Name = "dracoUserControl"; - this.dracoUserControl.Size = new System.Drawing.Size(373, 327); - this.dracoUserControl.TabIndex = 0; - // // ExporterForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(926, 574); + this.ClientSize = new System.Drawing.Size(926, 622); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.exporterTabControl); this.Controls.Add(this.saveOptionBtn); @@ -999,7 +997,7 @@ private void InitializeComponent() this.Controls.Add(this.progressBar); this.Controls.Add(this.butExport); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.MinimumSize = new System.Drawing.Size(842, 350); + this.MinimumSize = new System.Drawing.Size(842, 376); this.Name = "ExporterForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Babylon.js - Export scene to babylon or glTF format"; diff --git a/3ds Max/Max2Babylon/GlobalUtility.cs b/3ds Max/Max2Babylon/GlobalUtility.cs index 5079bba3..77fb08ae 100644 --- a/3ds Max/Max2Babylon/GlobalUtility.cs +++ b/3ds Max/Max2Babylon/GlobalUtility.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; using Autodesk.Max.Plugins; #if MAX2025 || MAX2026 diff --git a/3ds Max/Max2Babylon/Tools/LayerUtilities.cs b/3ds Max/Max2Babylon/Tools/LayerUtilities.cs index d17ccbb5..00d5f3ed 100644 --- a/3ds Max/Max2Babylon/Tools/LayerUtilities.cs +++ b/3ds Max/Max2Babylon/Tools/LayerUtilities.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/3ds Max/Max2Babylon/Tools/Tools.cs b/3ds Max/Max2Babylon/Tools/Tools.cs index 9d8086a3..26acf64e 100644 --- a/3ds Max/Max2Babylon/Tools/Tools.cs +++ b/3ds Max/Max2Babylon/Tools/Tools.cs @@ -1,4 +1,4 @@ -using Autodesk.Max; +using Autodesk.Max; using Max2Babylon.Extensions; using SharpDX; using System; diff --git a/BabylonJS_Installer/BabylonJS_Installer/Downloader.cs b/BabylonJS_Installer/BabylonJS_Installer/Downloader.cs index 3f912aa9..edcd3eaf 100644 --- a/BabylonJS_Installer/BabylonJS_Installer/Downloader.cs +++ b/BabylonJS_Installer/BabylonJS_Installer/Downloader.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.IO.Compression; using System.Net; @@ -205,8 +205,15 @@ public async Task GetJSONBodyRequest(string requestURI) { HttpClient client = new HttpClient(); client.DefaultRequestHeaders.Add("User-Agent", "BJS_Installer"); - HttpResponseMessage response = await client.GetAsync(requestURI); - return await response.Content.ReadAsStringAsync(); + try + { + HttpResponseMessage response = await client.GetAsync(requestURI); + return await response.Content.ReadAsStringAsync(); + } + catch(Exception ex) + { + return string.Empty; + } } public string GetURLGitHubAPI() diff --git a/BabylonJS_Installer/BabylonJS_Installer/MainForm.cs b/BabylonJS_Installer/BabylonJS_Installer/MainForm.cs index 5e40538f..bad1a505 100644 --- a/BabylonJS_Installer/BabylonJS_Installer/MainForm.cs +++ b/BabylonJS_Installer/BabylonJS_Installer/MainForm.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; diff --git a/BabylonJS_Installer/BabylonJS_Installer/SoftwareChecker.cs b/BabylonJS_Installer/BabylonJS_Installer/SoftwareChecker.cs index cd64de7f..2d77fea1 100644 --- a/BabylonJS_Installer/BabylonJS_Installer/SoftwareChecker.cs +++ b/BabylonJS_Installer/BabylonJS_Installer/SoftwareChecker.cs @@ -1,4 +1,4 @@ -using Microsoft.Win32; +using Microsoft.Win32; using System; using System.Collections.Generic; using System.Globalization; @@ -190,6 +190,11 @@ public void setLatestVersionDate() Task jsonRequest = Task.Run(async () => { return await downloader.GetJSONBodyRequest(downloader.GetURLGitHubAPI()); }); //TO DO Find a better way to parse JSON aswell string json = jsonRequest.Result; + if(string.IsNullOrEmpty(json) ) { + this.latestVersionDate = DateTime.Now.ToLongTimeString(); + return; + } + string created_at = json.Substring(json.IndexOf("\"created_at\":")); created_at = created_at.Remove(created_at.IndexOf("\",")); this.latestVersionDate = created_at.Remove(0, "\"created_at\":\"".Length); @@ -229,33 +234,41 @@ public void checkNewInstallerVersion() string assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(); - System.Net.WebClient wc = new System.Net.WebClient(); - string versionFile = wc.DownloadString(url_versionFile); - int avFrom = versionFile.IndexOf("") + "".Length; - int avTo = versionFile.LastIndexOf(""); - String serverVersion = versionFile.Substring(avFrom, avTo - avFrom); + try + { + System.Net.WebClient wc = new System.Net.WebClient(); + string versionFile = wc.DownloadString(url_versionFile); + int avFrom = versionFile.IndexOf("") + "".Length; + int avTo = versionFile.LastIndexOf(""); + String serverVersion = versionFile.Substring(avFrom, avTo - avFrom); - String[] currVersion = assemblyVersion.Split('.'); - String[] servVersion = serverVersion.Split('.'); + String[] currVersion = assemblyVersion.Split('.'); + String[] servVersion = serverVersion.Split('.'); - this.form.log("Current app version : " + currVersion[0] + '.' + currVersion[1] + '.' + currVersion[2]); - this.form.log("Server last version : " + servVersion[0] + '.' + servVersion[1] + '.' + servVersion[2]); + this.form.log("Current app version : " + currVersion[0] + '.' + currVersion[1] + '.' + currVersion[2]); + this.form.log("Server last version : " + servVersion[0] + '.' + servVersion[1] + '.' + servVersion[2]); - bool isUpToDate = true; - if (int.Parse(servVersion[0]) > int.Parse(currVersion[0])) isUpToDate = false; - else if (int.Parse(servVersion[0]) == int.Parse(currVersion[0])) - { - if (int.Parse(servVersion[1]) > int.Parse(currVersion[1])) isUpToDate = false; - else if (int.Parse(servVersion[1]) == int.Parse(currVersion[1])) + bool isUpToDate = true; + if (int.Parse(servVersion[0]) > int.Parse(currVersion[0])) isUpToDate = false; + else if (int.Parse(servVersion[0]) == int.Parse(currVersion[0])) { - if (int.Parse(servVersion[2]) > int.Parse(currVersion[2])) isUpToDate = false; + if (int.Parse(servVersion[1]) > int.Parse(currVersion[1])) isUpToDate = false; + else if (int.Parse(servVersion[1]) == int.Parse(currVersion[1])) + { + if (int.Parse(servVersion[2]) > int.Parse(currVersion[2])) isUpToDate = false; + } } - } - if (isUpToDate) this.form.log("Application up to date !\n\n"); - else + if (isUpToDate) this.form.log("Application up to date !\n\n"); + else + { + this.form.warn("A new version is available here : https://github.com/BabylonJS/Exporters/releases \n\n"); + this.form.goTab("Logs"); + } + } + catch( Exception ex ) { - this.form.warn("A new version is available here : https://github.com/BabylonJS/Exporters/releases \n\n"); + this.form.error($"Error : failed to check for new installer version\n{ex.Message}\n"); this.form.goTab("Logs"); } } diff --git a/SharedProjects/Utilities/Draco/GLTFPipelineUtilities.cs b/SharedProjects/Utilities/Draco/GLTFPipelineUtilities.cs index f73d6c8b..bc9f76dc 100644 --- a/SharedProjects/Utilities/Draco/GLTFPipelineUtilities.cs +++ b/SharedProjects/Utilities/Draco/GLTFPipelineUtilities.cs @@ -52,7 +52,7 @@ public static void DoDracoCompression(ILoggingProvider logger, bool generateBina else { string outputGltfFile = Path.ChangeExtension(outputFile, "gltf"); - arg = $"/C gltf-pipeline -i {outputGltfFile} -o {outputGltfFile} -d -s"; + arg = $"/C gltf-pipeline -i {outputGltfFile} -o {outputGltfFile} -d -s --keepUnusedElements"; } gltfPipeline.StartInfo.FileName = "cmd.exe";