Skip to content

Commit

Permalink
Adding more default textures + fixing case inconsistencies (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
zrksyd authored Mar 29, 2022
1 parent 6b3b0c4 commit 4c9b9d8
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 5 deletions.
12 changes: 10 additions & 2 deletions CrossMod/CrossMod/Rendering/Resources/DefaultTextures.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,21 @@ public class DefaultTextures
public Texture2D DefaultWhite { get; } = new Texture2D();
public Texture2D DefaultNormal { get; } = new Texture2D();
public Texture2D DefaultBlack { get; } = new Texture2D();
public Texture2D DefaultDiffuse2 { get; } = new Texture2D();
public Texture2D DefaultGray { get; } = new Texture2D();
public Texture2D DefaultMetallicBG { get; } = new Texture2D();
public Texture2D DefaultSpecular { get; } = new Texture2D();
public Texture3D ColorGradingLut { get; } = new Texture3D();


/// <summary>
/// /common/shader/sfxpbs/fighter/default_params or
/// /common/shader/sfxpbs/fighter/default_params or
/// </summary>
public Texture2D DefaultParamsFighter { get; } = new Texture2D();
public Texture2D DefaultParams2 { get; } = new Texture2D();
public Texture2D DefaultParams3 { get; } = new Texture2D();
public Texture2D DefaultParamsR000G025B100 { get; } = new Texture2D();
public Texture2D DefaultParamsR100G025B100 { get; } = new Texture2D();

/// <summary>
/// Similar to <see cref="DefaultParamsFighter"/> but specular is black.
Expand Down Expand Up @@ -53,7 +61,7 @@ private DefaultTextures()
LoadBitmap(UvPattern, "DefaultTextures/UVPattern.png");

LoadBitmap(DefaultWhite, "DefaultTextures/default_white.png");
LoadBitmap(DefaultParamsFighter, "DefaultTextures/default_Params.tif");
LoadBitmap(DefaultParamsFighter, "DefaultTextures/default_params.tif");
LoadBitmap(DefaultPrm, "DefaultTextures/default_prm.tif");
LoadBitmap(DefaultNormal, "DefaultTextures/default_normal.tif");
LoadBitmap(DefaultBlack, "DefaultTextures/default_black.png");
Expand Down
12 changes: 12 additions & 0 deletions CrossMod/CrossMod/Rendering/TextureAssignment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,21 @@ public static class TextureAssignment
{ "#replace_cubemap", DefaultTextures.Instance.Value.SpecularPbr },
{ "/common/shader/sfxpbs/default_normal", DefaultTextures.Instance.Value.DefaultNormal },
{ "/common/shader/sfxpbs/default_params", DefaultTextures.Instance.Value.DefaultParamsFighter },
{ "/common/shader/sfxpbs/default_params2", DefaultTextures.Instance.Value.DefaultParams2 },
{ "/common/shader/sfxpbs/default_params3", DefaultTextures.Instance.Value.DefaultParams3 },
{ "/common/shader/sfxpbs/default_params_r000_g025_b100", DefaultTextures.Instance.Value.DefaultParamsR000G025B100 },
{ "/common/shader/sfxpbs/default_params_r100_g025_b100", DefaultTextures.Instance.Value.DefaultParamsR100G025B100 },
{ "/common/shader/sfxpbs/default_black", DefaultTextures.Instance.Value.DefaultBlack },
{ "/common/shader/sfxpbs/default_white", DefaultTextures.Instance.Value.DefaultWhite },
{ "/common/shader/sfxpbs/default_color", DefaultTextures.Instance.Value.DefaultWhite },
{ "/common/shader/sfxpbs/default_color", DefaultTextures.Instance.Value.DefaultWhite },
{ "/common/shader/sfxpbs/default_color2", DefaultTextures.Instance.Value.DefaultWhite },
{ "/common/shader/sfxpbs/default_color3", DefaultTextures.Instance.Value.DefaultWhite },
{ "/common/shader/sfxpbs/default_color4", DefaultTextures.Instance.Value.DefaultWhite },
{ "/common/shader/sfxpbs/default_diffuse2", DefaultTextures.Instance.Value.DefaultDiffuse2 },
{ "/common/shader/sfxpbs/default_gray", DefaultTextures.Instance.Value.DefaultGray },
{ "/common/shader/sfxpbs/default_metallicbg", DefaultTextures.Instance.Value.DefaultMetallicBG },
{ "/common/shader/sfxpbs/default_specular", DefaultTextures.Instance.Value.DefaultSpecular },
{ "/common/shader/sfxpbs/fighter/default_params", DefaultTextures.Instance.Value.DefaultParamsFighter },
{ "/common/shader/sfxpbs/fighter/default_normal", DefaultTextures.Instance.Value.DefaultNormal }
};
Expand Down
27 changes: 24 additions & 3 deletions CrossMod/CrossModGui/CrossModGui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -321,16 +321,37 @@
<None Update="DefaultTextures\default_black.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_gray.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_cube_black.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_metallicbg.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_normal.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_Params.tif">
<None Update="DefaultTextures\default_params.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_params2.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_params3.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_params_r000_g025_b100.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_params_r100_g025_b100.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_specular.tif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\default_White.png">
<None Update="DefaultTextures\default_white.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="DefaultTextures\UVPattern.png">
Expand Down Expand Up @@ -359,4 +380,4 @@
</PostBuildEvent>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>
</Project>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4c9b9d8

Please sign in to comment.