155 fixes to import and exporting

mikeoverbay · Oct 25, 2024 · 403d23a · 403d23a
1 parent f89df1c
commit 403d23a
Show file tree

Hide file tree

Showing 122 changed files with 45 additions and 3,275 deletions.
diff --git a/!_Tank Exporter/!_Tank Exporter.vbproj b/!_Tank Exporter/!_Tank Exporter.vbproj
@@ -27,8 +27,8 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>154</ApplicationRevision>
-    <ApplicationVersion>1.0.0.154</ApplicationVersion>
+    <ApplicationRevision>155</ApplicationRevision>
+    <ApplicationVersion>1.0.0.155</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -137,9 +137,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\cttools.dll</HintPath>
     </Reference>
-    <Reference Include="FastColoredTextBox, Version=2.16.21.0, Culture=neutral, PublicKeyToken=fb8aa12b994ef61b, processorArchitecture=MSIL">
-      <HintPath>..\packages\FCTB.2.16.21.0\lib\FastColoredTextBox.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FastColoredTextBox, Version=2.16.24.0, Culture=neutral, PublicKeyToken=fb8aa12b994ef61b, processorArchitecture=MSIL">
+      <HintPath>..\packages\FCTB.2.16.24\lib\FastColoredTextBox.dll</HintPath>
     </Reference>
     <Reference Include="FbxSDK, Version=1.0.4593.24947, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
@@ -165,13 +164,13 @@
       <HintPath>..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
     </Reference>
     <Reference Include="SharpGLTF.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6f8b67557d279fe6, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpGLTF.Core.1.0.2\lib\netstandard2.0\SharpGLTF.Core.dll</HintPath>
+      <HintPath>..\packages\SharpGLTF.Core.1.0.3\lib\netstandard2.0\SharpGLTF.Core.dll</HintPath>
     </Reference>
     <Reference Include="SharpGLTF.Runtime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6f8b67557d279fe6, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpGLTF.Runtime.1.0.2\lib\netstandard2.0\SharpGLTF.Runtime.dll</HintPath>
+      <HintPath>..\packages\SharpGLTF.Runtime.1.0.3\lib\netstandard2.0\SharpGLTF.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="SharpGLTF.Toolkit, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6f8b67557d279fe6, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpGLTF.Toolkit.1.0.2\lib\netstandard2.0\SharpGLTF.Toolkit.dll</HintPath>
+      <HintPath>..\packages\SharpGLTF.Toolkit.1.0.3\lib\netstandard2.0\SharpGLTF.Toolkit.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -192,8 +191,8 @@
     <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -222,9 +221,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\Tao.Platform.Windows.dll</HintPath>
     </Reference>
-    <Reference Include="VJson, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VJson.0.9.10\lib\netstandard2.0\VJson.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />

diff --git a/!_Tank Exporter/Forms/frmMain.vb b/!_Tank Exporter/Forms/frmMain.vb
@@ -185,13 +185,7 @@ Public Class frmMain
         Catch ex As Exception
 
         End Try
-        Try
-            For i = 1 To 10
-                packages_HD(i).Dispose()
-            Next
-        Catch ex As Exception
 
-        End Try
         '--------------------------------------------------------
         '--------------------------------------------------------
 

diff --git a/!_Tank Exporter/Modules/modPrimWriter.vb b/!_Tank Exporter/Modules/modPrimWriter.vb
@@ -6,7 +6,6 @@ Imports System.Text
 Imports SharpGLTF.Schema2
 Imports Assimp.Configs
 Imports System.Security.Cryptography
-Imports VJson
 
 Module modPrimWriter
     Public OBJECT_WAS_INSERTED As Boolean
@@ -1433,22 +1432,22 @@ no_UV2EVER:
                             v.y -= fbxgrp(parent).matrix(13)
                             v.z -= fbxgrp(parent).matrix(14)
 
-                            n.x = -comp.vertices(k).nx
+                            n.x = comp.vertices(k).nx
                             n.y = -comp.vertices(k).ny
-                            n.z = -comp.vertices(k).nz
-                            n = transform_lighting(n, fbxgrp(pnter).matrix)
+                            n.z = comp.vertices(k).nz
+                            'n = transform_lighting(n, fbxgrp(pnter).matrix)
                             'n = New vect3
 
-                            tn.x = -comp.vertices(k).tx
+                            tn.x = comp.vertices(k).tx
                             tn.y = -comp.vertices(k).ty
-                            tn.z = -comp.vertices(k).tz
-                            tn = transform_lighting(tn, fbxgrp(pnter).matrix)
+                            tn.z = comp.vertices(k).tz
+                            'tn = transform_lighting(tn, fbxgrp(pnter).matrix)
                             'tn = New vect3
 
                             bn.x = -comp.vertices(k).bnx
                             bn.y = -comp.vertices(k).bny
-                            bn.z = -comp.vertices(k).bnz
-                            bn = transform_lighting(bn, fbxgrp(pnter).matrix)
+                            bn.z = comp.vertices(k).bnz
+                            'bn = transform_lighting(bn, fbxgrp(pnter).matrix)
                         End If
 
 
@@ -1654,7 +1653,7 @@ no_UV2EVER:
                 'note: my routine uses other rotation
                 If fbxgrp(pnter).is_new_model Then
                     If ind_scale = 2 Then
-                        If frmWritePrimitive.flipWindingOrder_cb.Checked And Not id = 4 Then
+                        If frmWritePrimitive.flipWindingOrder_cb.Checked And Not id = 4 And Not id = 4 Then
                             br.Write(Convert.ToUInt16(comp.indices(j + 0) + off))
                             br.Write(Convert.ToUInt16(comp.indices(j + 1) + off))
                             br.Write(Convert.ToUInt16(comp.indices(j + 2) + off))
@@ -1668,7 +1667,7 @@ no_UV2EVER:
                         If comp.indices(j + 1) + off > cnt Then cnt = comp.indices(j + 1) + off
                         If comp.indices(j + 2) + off > cnt Then cnt = comp.indices(j + 2) + off
                     Else
-                        If frmWritePrimitive.flipWindingOrder_cb.Checked Or fbxgrp(pnter).reverse_winding And Not id = 4 Then
+                        If frmWritePrimitive.flipWindingOrder_cb.Checked Or fbxgrp(pnter).reverse_winding And Not id = 4 And Not id = 4 Then
                             br.Write(Convert.ToUInt32(comp.indices(j + 0) + off))
                             br.Write(Convert.ToUInt32(comp.indices(j + 1) + off))
                             br.Write(Convert.ToUInt32(comp.indices(j + 2) + off))
@@ -1684,7 +1683,7 @@ no_UV2EVER:
                     End If
                 Else
                     If ind_scale = 2 Then
-                        If frmWritePrimitive.flipWindingOrder_cb.Checked Or fbxgrp(pnter).reverse_winding Or id = 4 Then
+                        If frmWritePrimitive.flipWindingOrder_cb.Checked Or fbxgrp(pnter).reverse_winding Or id = 4 Or id = 1 Then
                             br.Write(Convert.ToUInt16(comp.indices(j + 1) + off))
                             br.Write(Convert.ToUInt16(comp.indices(j + 0) + off))
                             br.Write(Convert.ToUInt16(comp.indices(j + 2) + off))
@@ -1697,7 +1696,7 @@ no_UV2EVER:
                         If comp.indices(j + 1) + off > cnt Then cnt = comp.indices(j + 1) + off
                         If comp.indices(j + 2) + off > cnt Then cnt = comp.indices(j + 2) + off
                     Else
-                        If frmWritePrimitive.flipWindingOrder_cb.Checked Or fbxgrp(pnter).reverse_winding Or id = 4 Then
+                        If frmWritePrimitive.flipWindingOrder_cb.Checked Or fbxgrp(pnter).reverse_winding Or id = 4 Or id = 1 Then
                             br.Write(Convert.ToUInt32(comp.indices(j + 1) + off))
                             br.Write(Convert.ToUInt32(comp.indices(j + 0) + off))
                             br.Write(Convert.ToUInt32(comp.indices(j + 2) + off))
@@ -1709,6 +1708,7 @@ no_UV2EVER:
                         If comp.indices(j + 0) + off > cnt Then cnt = comp.indices(j + 0) + off
                         If comp.indices(j + 1) + off > cnt Then cnt = comp.indices(j + 1) + off
                         If comp.indices(j + 2) + off > cnt Then cnt = comp.indices(j + 2) + off
+
                     End If
                 End If
             Next

diff --git a/!_Tank Exporter/Modules/modTextures.vb b/!_Tank Exporter/Modules/modTextures.vb
@@ -1952,6 +1952,7 @@ skip_hd:
         Dim texID As UInt32
 
         updateEvent.Reset()
+        Thread.Sleep(100)
         texID = Ilu.iluGenImage() ' /* Generation of one image name */
         Il.ilBindImage(texID) '; /* Binding of image name */
         Dim success = Il.ilGetError

diff --git a/!_Tank Exporter/Modules/put_glTF.vb b/!_Tank Exporter/Modules/put_glTF.vb
@@ -98,8 +98,8 @@ Module put_glTF
         For item = 1 To object_count
             Dim extras As New ExtrasData()
 
-            fix_winding_order_group(item)
             check_normal_y_group(item)
+            fix_winding_order_group(item)
 
             ' Create a material and assign texture maps if available
             Dim MyMaterialBuilder As New MaterialBuilder("Material00" + item.ToString) With {.ShaderStyle = "PBRMetallicRoughness"}

diff --git a/!_Tank Exporter/My Project/AssemblyInfo.vb b/!_Tank Exporter/My Project/AssemblyInfo.vb
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.154")>
-<Assembly: AssemblyFileVersion("1.0.0.154")>
+<Assembly: AssemblyVersion("1.0.0.155")>
+<Assembly: AssemblyFileVersion("1.0.0.155")>
 <Assembly: NeutralResourcesLanguage("")>
diff --git a/!_Tank Exporter/TextureLoader.dll b/!_Tank Exporter/TextureLoader.dll
diff --git a/!_Tank Exporter/app.config b/!_Tank Exporter/app.config
@@ -126,7 +126,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/!_Tank Exporter/packages.config b/!_Tank Exporter/packages.config
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AssimpNet" version="4.1.0" targetFramework="net48" />
-  <package id="FCTB" version="2.16.21.0" targetFramework="net45" />
+  <package id="FCTB" version="2.16.24" targetFramework="net481" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
   <package id="SharpDX" version="4.2.0" targetFramework="net48" />
   <package id="SharpDX.Direct3D11" version="4.2.0" targetFramework="net48" />
   <package id="SharpDX.DXGI" version="4.2.0" targetFramework="net48" />
   <package id="SharpDX.Mathematics" version="4.2.0" targetFramework="net48" />
-  <package id="SharpGLTF.Core" version="1.0.2" targetFramework="net48" />
-  <package id="SharpGLTF.Runtime" version="1.0.2" targetFramework="net48" />
-  <package id="SharpGLTF.Toolkit" version="1.0.2" targetFramework="net48" />
+  <package id="SharpGLTF.Core" version="1.0.3" targetFramework="net481" />
+  <package id="SharpGLTF.Runtime" version="1.0.3" targetFramework="net481" />
+  <package id="SharpGLTF.Toolkit" version="1.0.3" targetFramework="net481" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Memory" version="4.5.5" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
-  <package id="System.Text.Json" version="8.0.4" targetFramework="net48" />
+  <package id="System.Text.Json" version="8.0.5" targetFramework="net481" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
-  <package id="VJson" version="0.9.10" targetFramework="net48" />
 </packages>
diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj
@@ -8554,12 +8554,6 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_44E421C5592B1314600BEABC21672932"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_D88F02B810ED4918A9E68229BD46788B"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -8719,6 +8713,12 @@
         "OwnerKey" = "8:_CB3B11DAE9A90D5EB814C84C32997A74"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_44E421C5592B1314600BEABC21672932"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -8764,7 +8764,7 @@
         "DisplayName" = "8:Release"
         "IsDebugOnly" = "11:FALSE"
         "IsReleaseOnly" = "11:TRUE"
-        "OutputFilename" = "8:..\\..\\Tank Exporter MSI\\Tank_Exporter_154.msi"
+        "OutputFilename" = "8:..\\..\\Tank Exporter MSI\\Tank_Exporter_155.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -9141,11 +9141,6 @@
             "AssemblyAsmDisplayName" = "8:VJson, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_0308082C11603F67D64FE967251CD76B"
-                    {
-                    "Name" = "8:VJson.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:VJson.dll"
             "TargetName" = "8:"
@@ -27585,11 +27580,6 @@
             "AssemblyAsmDisplayName" = "8:System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_AB3C10497F9E11A2CB4AF04DC1242B55"
-                    {
-                    "Name" = "8:System.Text.Json.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:System.Text.Json.dll"
             "TargetName" = "8:"
@@ -37056,15 +37046,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Tank Exporter"
-        "ProductCode" = "8:{1EECF189-05FC-4647-B304-F9DE78022E6B}"
-        "PackageCode" = "8:{C33A4A8D-0B31-4274-8C8D-2020B0F31666}"
+        "ProductCode" = "8:{65099831-1B0B-4ACA-99C4-83A93A29F7CC}"
+        "PackageCode" = "8:{39920699-03B9-4A49-8077-84D5A97DDF1F}"
         "UpgradeCode" = "8:{6ABAF23A-CB3D-4411-B78A-4855B5B5A0CD}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.154"
+        "ProductVersion" = "8:1.0.155"
         "Manufacturer" = "8:Coffee_"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -37616,7 +37606,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D88F02B810ED4918A9E68229BD46788B"
             {
-            "SourcePath" = "8:..\\!_Tank Exporter\\obj\\x86\\Release\\!_Tank Exporter.exe"
+            "SourcePath" = "8:"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_9BBCA850C4D847C495C4D74DD189C10E"

diff --git a/packages/FCTB.2.16.21.0/.signature.p7s b/packages/FCTB.2.16.21.0/.signature.p7s
diff --git a/packages/FCTB.2.16.21.0/FCTB.2.16.21.0.nupkg b/packages/FCTB.2.16.21.0/FCTB.2.16.21.0.nupkg
diff --git a/packages/FCTB.2.16.21.0/lib/FastColoredTextBox.dll b/packages/FCTB.2.16.21.0/lib/FastColoredTextBox.dll