Fixes

MontagueM · Aug 12, 2023 · 43e82ad · 43e82ad
1 parent 4b4b3c8
commit 43e82ad
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/Arithmic/Log.cs b/Arithmic/Log.cs
@@ -84,12 +84,11 @@ public static void Fatal(string message, [CallerMemberName] string callerMethodN
 
     private static void LogEvent(LogVerbosity verbosity, string message, string callerMethodName, string callerFile)
     {
-#if !DEBUG
+        // disable if debugging things
         if (verbosity == LogVerbosity.Debug)
         {
             return;
         }
-#endif
 
         string formattedMessage = MakeFormattedMessage(verbosity, message, callerMethodName, callerFile);
         LogEventArgs logEventArgs = new LogEventArgs { Verbosity = verbosity, Message = formattedMessage, Time = DateTime.Now };

diff --git a/Charm/ActivityMapView.xaml.cs b/Charm/ActivityMapView.xaml.cs
@@ -173,12 +173,14 @@ public async void ExportFull(ExportInfo info)
             if (item.Selected && item.Name == "Select all")
             {
                 bSelectAll = true;
+                Log.Info($"Selected all maps");
             }
             else
             {
                 if (item.Selected || bSelectAll)
                 {
                     maps.Add(FileResourcer.Get().GetSchemaTag<SMapContainer>(item.Hash));
+                    Log.Info($"Selected map: {item.Hash}");
                 }
             }
         }

diff --git a/Charm/ModelView.xaml b/Charm/ModelView.xaml
@@ -54,7 +54,7 @@
                         IsShadowMappingEnabled="False"
                         ShowCoordinateSystem="False"
                         ShowFrameRate="True"
-                        ShowTriangleCountInfo="True"
+                        ShowTriangleCountInfo="False"
                         EnableDeferredRendering="False" EnableRenderFrustum="True"
                         Title="{Binding Title}"
                         TextBrush="{StaticResource ForegroundColour75}"

diff --git a/Tiger/Schema/Model/FbxHandler.cs b/Tiger/Schema/Model/FbxHandler.cs
@@ -32,8 +32,8 @@ public FbxMesh AddMeshPartToScene(MeshPart part, int index, string meshName)
         lock (_fbxLock)
         {
             node = FbxNode.Create(_manager, mesh.GetName());
+            node.SetNodeAttribute(mesh);
         }
-        node.SetNodeAttribute(mesh);
 
         if (part.VertexNormals.Count > 0)
         {
@@ -296,7 +296,7 @@ private void AddMaterial(FbxMesh mesh, FbxNode node, int index, IMaterial materi
         FbxLayerElementMaterial materialLayer;
         lock (_fbxLock)
         {
-            fbxMaterial = FbxSurfacePhong.Create(_scene, material.FileHash);
+            fbxMaterial = FbxSurfacePhong.Create(_scene, material.FileHash.ToString());
             materialLayer = FbxLayerElementMaterial.Create(mesh, $"matlayer_{node.GetName()}_{index}");
         }
         fbxMaterial.DiffuseFactor.Set(1);

diff --git a/Tiger/Schema/Shaders/Material.cs b/Tiger/Schema/Shaders/Material.cs
@@ -73,7 +73,7 @@ public string Decompile(byte[] shaderBytecode, string? type = "ps")
                 ProcessStartInfo startInfo = new ProcessStartInfo();
                 startInfo.CreateNoWindow = false;
                 startInfo.UseShellExecute = false;
-                startInfo.FileName = "3dmigoto_shader_decomp.exe";
+                startInfo.FileName = "ThirdParty/3dmigoto_shader_decomp.exe";
                 startInfo.WindowStyle = ProcessWindowStyle.Hidden;
                 startInfo.Arguments = $"-D {binPath}";
                 using (Process exeProcess = Process.Start(startInfo))