submodule

4sval · Oct 25, 2022 · edfa327 · edfa327
1 parent 70c2754
commit edfa327
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "CUE4Parse"]
 	path = CUE4Parse
 	url = https://github.com/FabianFG/CUE4Parse
+[submodule "EpicManifestParser"]
+	path = EpicManifestParser
+	url = https://github.com/FModel/EpicManifestParser
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/Views/Snooper/Renderer.cs b/FModel/Views/Snooper/Renderer.cs
@@ -75,10 +75,10 @@ public void Render(Camera cam)
         _shader.SetUniform("uProjection", projMatrix);
         _shader.SetUniform("viewPos", cam.Position);
 
-        _shader.SetUniform("material.diffuseMap", 0);
-        _shader.SetUniform("material.normalMap", 1);
-        _shader.SetUniform("material.specularMap", 2);
-        _shader.SetUniform("material.emissionMap", 3);
+        // _shader.SetUniform("material.diffuseMap", 0);
+        // _shader.SetUniform("material.normalMap", 1);
+        // _shader.SetUniform("material.specularMap", 2);
+        // _shader.SetUniform("material.emissionMap", 3);
 
         _shader.SetUniform("light.position", cam.Position);
         _shader.SetUniform("light.diffuse", _diffuseLight);
@@ -186,13 +186,13 @@ private Camera LoadWorld(CancellationToken cancellationToken, UWorld original)
 
                         if (textureDataIdx.TryGetValue(out FPackageIndex diffuse, "Diffuse") &&
                             diffuse.Load() is UTexture2D diffuseTexture)
-                            model.Sections[j].Material.Parameters.Textures["Diffuse"] = diffuseTexture;
+                            model.Sections[j].Material.Parameters.Textures[CMaterialParams2.Diffuse[j]] = diffuseTexture;
                         if (textureDataIdx.TryGetValue(out FPackageIndex normal, "Normal") &&
                             normal.Load() is UTexture2D normalTexture)
-                            model.Sections[j].Material.Parameters.Textures["Normals"] = normalTexture;
+                            model.Sections[j].Material.Parameters.Textures[CMaterialParams2.Normals[j]] = normalTexture;
                         if (textureDataIdx.TryGetValue(out FPackageIndex specular, "Specular") &&
                             specular.Load() is UTexture2D specularTexture)
-                            model.Sections[j].Material.Parameters.Textures["SpecularMasks"] = specularTexture;
+                            model.Sections[j].Material.Parameters.Textures[CMaterialParams2.SpecularMasks[j]] = specularTexture;
                     }
                 }
                 if (staticMeshComp.TryGetValue(out FPackageIndex[] overrideMaterials, "OverrideMaterials"))

diff --git a/FModel/Views/Snooper/Snooper.cs b/FModel/Views/Snooper/Snooper.cs
@@ -49,6 +49,8 @@ private unsafe void WindowShouldClose(bool value, bool clear)
         {
             _renderer.Cache.DisposeModels();
             _renderer.Cache.ClearModels();
+            _renderer.Cache.DisposeTextures();
+            _renderer.Cache.ClearTextures();
             _renderer.Settings.Reset();
             _previousSpeed = 0f;
         }