submodule

This commit is contained in:
4sval 2022-10-25 22:13:59 +02:00
parent 70c2754bd1
commit edfa3276cf
4 changed files with 13 additions and 8 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "CUE4Parse"]
path = CUE4Parse
url = https://github.com/FabianFG/CUE4Parse
[submodule "EpicManifestParser"]
path = EpicManifestParser
url = https://github.com/FModel/EpicManifestParser

@ -1 +1 @@
Subproject commit 842f6d4b37b4ecf54d51dd93dcc19f154e33e438
Subproject commit 2eb7988f9e80c15f6828dca37ced41ccccebdc84

View File

@ -75,10 +75,10 @@ public class Renderer : IDisposable
_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 @@ public class Renderer : IDisposable
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"))

View File

@ -49,6 +49,8 @@ public class Snooper : GameWindow
{
_renderer.Cache.DisposeModels();
_renderer.Cache.ClearModels();
_renderer.Cache.DisposeTextures();
_renderer.Cache.ClearTextures();
_renderer.Settings.Reset();
_previousSpeed = 0f;
}