Skip to content

Commit

Permalink
mesh import attempt; better meshpreview
Browse files Browse the repository at this point in the history
  • Loading branch information
@wavebend
wavebend committed Dec 4, 2024
1 parent 885d99b commit 8a6b8b9
Show file tree
Hide file tree
Showing 3 changed files with 168 additions and 27 deletions.
4 changes: 3 additions & 1 deletion FrostyEditor/ChangeLog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
v1.0.7 alpha5v2
v1.0.7 alpha5v3
----------------------------------
New Features:
- Added minor support for Mesh import
- Added support for Localization modding & previewing (Revamped Bioware Localization Plugin)
- Added support for Mesh previewing
- Added support for Texture modding & previewing
Expand All @@ -15,6 +16,7 @@ Bug Fixes:
- Fixed shader compilation not triggering at launch
- Fixed mod manager not exiting properly
- Added crash prevention for registry scan errors
- Added some fallback parameters for the mesh preview

Options:
- Added an option in Tools -> Options to disable shader compilation at launch, for faster launching
Expand Down
69 changes: 65 additions & 4 deletions FrostyPlugin/Viewport/RenderMesh.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ public void AssignFallbackParameters(RenderCreateState state, /*MeshRenderSectio
List<Vector4> AdditionalParams = new List<Vector4>();
List<ShaderResourceView> AdditionalTextures = new List<ShaderResourceView>();

if (ProfilesLibrary.DataVersion == (int)ProfileVersion.StarWarsBattlefrontII || ProfilesLibrary.DataVersion == (int)ProfileVersion.StarWarsSquadrons)
if (ProfilesLibrary.DataVersion == (int)ProfileVersion.StarWarsBattlefrontII || ProfilesLibrary.DataVersion == (int)ProfileVersion.StarWarsSquadrons || ProfilesLibrary.DataVersion == (int)ProfileVersion.DragonAgeTheVeilguard)
{
for (int i = 0; i < 4; i++)
AdditionalParams.Add(Vector4.Zero);
Expand All @@ -550,6 +550,29 @@ public void AssignFallbackParameters(RenderCreateState state, /*MeshRenderSectio
{
string paramName = vectorParam.ParameterName;

if (ProfilesLibrary.DataVersion == (int)ProfileVersion.DragonAgeTheVeilguard)
{
string lower = paramName.ToLower();
if (lower.Contains("tint") && lower.Contains("1"))
{
TintColorA.X = vectorParam.Value.x;
TintColorA.Y = vectorParam.Value.y;
TintColorA.Z = vectorParam.Value.z;
}
else if (lower.Contains("tint") && lower.Contains("2"))
{
TintColorB.X = vectorParam.Value.x;
TintColorB.Y = vectorParam.Value.y;
TintColorB.Z = vectorParam.Value.z;
}
else if (lower.Contains("tint") && lower.Contains("3"))
{
TintColorC.X = vectorParam.Value.x;
TintColorC.Y = vectorParam.Value.y;
TintColorC.Z = vectorParam.Value.z;
}
}

// MEA / DAI
if (ProfilesLibrary.DataVersion == (int)ProfileVersion.MassEffectAndromeda || ProfilesLibrary.DataVersion == (int)ProfileVersion.DragonAgeInquisition)
{
Expand Down Expand Up @@ -590,7 +613,7 @@ public void AssignFallbackParameters(RenderCreateState state, /*MeshRenderSectio

// MEA Only
else if (ProfilesLibrary.DataVersion == (int)ProfileVersion.MassEffectAndromeda)
{
{
if (paramName.Equals("MP_Light", StringComparison.OrdinalIgnoreCase))
{
Vector4 v = AdditionalParams[0];
Expand Down Expand Up @@ -689,8 +712,45 @@ public void AssignFallbackParameters(RenderCreateState state, /*MeshRenderSectio
string paramName = textureParam.ParameterName;
PointerRef value = textureParam.Value;

// Dragon Age The Veilguard
if (ProfilesLibrary.IsLoaded(ProfileVersion.DragonAgeTheVeilguard))
{
if (paramName.StartsWith("BaseColor")
|| paramName.Equals("Diffuse")
|| paramName.Equals("diffuseBase")
|| paramName.Equals("diff_mean"))
{
DiffuseTexture = state.TextureLibrary.LoadTextureAsset(value.External.FileGuid);
}
else if (paramName.StartsWith("Normal")
|| paramName.Equals("Norm")
|| paramName.Equals("normalBase")
|| paramName.Equals("norm_mean"))
{
NormTexture = state.TextureLibrary.LoadTextureAsset(value.External.FileGuid);
}
else if (paramName.StartsWith("ARTS_")
|| paramName.Contains("AMMS"))
{
MaskTexture = state.TextureLibrary.LoadTextureAsset(value.External.FileGuid);
}
else if (paramName.Equals("Mask"))
{
MaskTexture = state.TextureLibrary.LoadTextureAsset(value.External.FileGuid);
}
else if (paramName.Equals("Tint")
|| paramName.Equals("Tint_Mask"))
{
TintTexture = state.TextureLibrary.LoadTextureAsset(value.External.FileGuid);
}
if (shaderAsset.Filename.Contains("Skin"))
{
AdditionalParams[3] = new Vector4(1.0f, AdditionalParams[3].Y, 0, 0);
}
}

// MEA
if (ProfilesLibrary.IsLoaded(ProfileVersion.MassEffectAndromeda))
else if (ProfilesLibrary.IsLoaded(ProfileVersion.MassEffectAndromeda))
{
if (paramName.Equals("Diffuse") || paramName.Equals("BaseColor") || paramName.Equals("diff_mean")) { DiffuseTexture = state.TextureLibrary.LoadTextureAsset(value.External.FileGuid); }
else if (paramName.Equals("Norm") || paramName.Equals("Normal") || paramName.Equals("norm_mean"))
Expand Down Expand Up @@ -812,7 +872,7 @@ public void AssignFallbackParameters(RenderCreateState state, /*MeshRenderSectio
else if (ProfilesLibrary.IsLoaded(ProfileVersion.Fifa17, ProfileVersion.Fifa18,
ProfileVersion.Fifa19, ProfileVersion.Fifa20,
ProfileVersion.NeedForSpeedHeat, ProfileVersion.Fifa21,
ProfileVersion.Fifa22, ProfileVersion.NeedForSpeedUnbound, ProfileVersion.DeadSpace, ProfileVersion.DragonAgeTheVeilguard))
ProfileVersion.Fifa22, ProfileVersion.NeedForSpeedUnbound, ProfileVersion.DeadSpace))
{
paramName = paramName.ToLower();
if (paramName.StartsWith("colortexture") || paramName.StartsWith("diffuse") || paramName.Contains("basecolor"))
Expand Down Expand Up @@ -2073,6 +2133,7 @@ private void PopulateMaterialFromMeshVariation(MeshMaterial material, MeshVariat
if (idx != -1)
{
if (ProfilesLibrary.DataVersion != (int)ProfileVersion.Battlefield1 && ProfilesLibrary.DataVersion != (int)ProfileVersion.Anthem && ProfilesLibrary.DataVersion != (int)ProfileVersion.Battlefield5 && ProfilesLibrary.DataVersion != (int)ProfileVersion.Fifa20
&& ProfilesLibrary.DataVersion != (int)ProfileVersion.DragonAgeTheVeilguard
#if FROSTY_ALPHA || FROSTY_DEVELOPER
&& ProfilesLibrary.DataVersion != (int)ProfileVersion.PlantsVsZombiesBattleforNeighborville
#endif
Expand Down
Loading

0 comments on commit 8a6b8b9

Please sign in to comment.