Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-22 20:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #198 from M-1-RLG/master

Browse source 
CMB: Update Materials/Fix Material Reading
This commit is contained in:
KillzXGaming 2020-03-10 20:47:31 -04:00 committed by GitHub
commit fadcd2e412
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
File_Format_Library/FileFormats/Grezzo/CMB.cs
View file

@ -1741,11 +1741,21 @@ namespace FirstPlugin
public TextureMap[] TextureMaps { get; set; } public TextureMap[] TextureMaps { get; set; }
public TextureMatrix[] TextureMaticies { get; set; } public TextureMatrix[] TextureMaticies { get; set; }
public ushort LightSetIndex { get; set; } public uint TotalUsedTextures { get; set; }
public ushort FogIndex { get; set; } public uint TotalUsedTextureCoords { get; set; }
public List<TextureCombiner> TextureCombiners { get; set; } public List<TextureCombiner> TextureCombiners { get; set; }
public STColor8 EmissionColor { get; set; }
public STColor8 AmbientColor { get; set; }
public STColor8 Diffuse { get; set; }
public STColor8 Specular0 { get; set; }
public STColor8 Specular1 { get; set; }
public STColor8[] ConstantColors { get; set; } public STColor8[] ConstantColors { get; set; }
public bool AlphaTestEnable { get; set; } public bool AlphaTestEnable { get; set; }
@ -1780,8 +1790,8 @@ namespace FirstPlugin
public float BufferColorB { get; set; } public float BufferColorB { get; set; }
public float BufferColorA { get; set; } public float BufferColorA { get; set; }
public short BumpMapIndex { get; set; } public TextureUnit BumpMapIndex { get; set; }
public ushort BumpMapMode { get; set; } public BumpMode BumpMapMode { get; set; }
public short IsBumpRenormalize { get; set; } public short IsBumpRenormalize { get; set; }
public LayerConfig LayerConfig { get; set; } public LayerConfig LayerConfig { get; set; }
@ -1856,10 +1866,10 @@ namespace FirstPlugin
matParams.TextureCoords[i].Rotation = TextureMaticies[i].Rotate; matParams.TextureCoords[i].Rotation = TextureMaticies[i].Rotate;
} }
matParams.DiffuseColor = new SPICA.Math3D.RGBA(255,255,255,255); matParams.DiffuseColor = ConvertRGBA(Diffuse);
matParams.Specular0Color = new SPICA.Math3D.RGBA(0, 0, 0, 255); matParams.Specular0Color = ConvertRGBA(Specular0);
matParams.Specular1Color = new SPICA.Math3D.RGBA(0, 0, 0, 255); matParams.Specular1Color = ConvertRGBA(Specular1);
matParams.EmissionColor = new SPICA.Math3D.RGBA(0, 0, 0, 255); matParams.EmissionColor = ConvertRGBA(EmissionColor);
matParams.Constant0Color = ConvertRGBA(ConstantColors[0]); matParams.Constant0Color = ConvertRGBA(ConstantColors[0]);
matParams.Constant1Color = ConvertRGBA(ConstantColors[1]); matParams.Constant1Color = ConvertRGBA(ConstantColors[1]);
matParams.Constant2Color = ConvertRGBA(ConstantColors[2]); matParams.Constant2Color = ConvertRGBA(ConstantColors[2]);
@ -2096,42 +2106,41 @@ namespace FirstPlugin
public struct LightTable public struct LightTable
{ {
public bool reflectanceRSamplerIsAbs; public bool reflectanceRSamplerIsAbs;
public sbyte reflectanceRSamplerIndex;
public LUTInput reflectanceRSamplerInput; public LUTInput reflectanceRSamplerInput;
public uint reflectanceRSamplerScale; public float reflectanceRSamplerScale;
public bool reflectanceGSamplerIsAbs; public bool reflectanceGSamplerIsAbs;
public sbyte reflectanceGSamplerIndex;
public LUTInput reflectanceGSamplerInput; public LUTInput reflectanceGSamplerInput;
public uint reflectanceGSamplerScale; public float reflectanceGSamplerScale;
public bool reflectanceBSamplerIsAbs; public bool reflectanceBSamplerIsAbs;
public sbyte reflectanceBSamplerIndex;
public LUTInput reflectanceBSamplerInput; public LUTInput reflectanceBSamplerInput;
public uint reflectanceBSamplerScale; public float reflectanceBSamplerScale;
public bool reflectance0SamplerIsAbs; public bool reflectance0SamplerIsAbs;
public sbyte reflectance0SamplerIndex;
public LUTInput reflectance0SamplerInput; public LUTInput reflectance0SamplerInput;
public uint reflectance0SamplerScale; public float reflectance0SamplerScale;
public bool reflectance1SamplerIsAbs; public bool reflectance1SamplerIsAbs;
public sbyte reflectance1SamplerIndex;
public LUTInput reflectance1SamplerInput; public LUTInput reflectance1SamplerInput;
public uint reflectance1SamplerScale; public float reflectance1SamplerScale;
public bool fresnelSamplerIsAbs; public bool fresnelSamplerIsAbs;
public sbyte fresnelSamplerIndex;
public LUTInput fresnelSamplerInput; public LUTInput fresnelSamplerInput;
public uint fresnelSamplerScale; public float fresnelSamplerScale;
} }
public uint TotalUsedTextures { get; set; }
public uint TotalUsedTextureCoords { get; set; }
public void Read(FileReader reader, Header header, MaterialChunk materialChunkParent) public void Read(FileReader reader, Header header, MaterialChunk materialChunkParent)
{ {
int materialSize = 0x15C;
if (header.Version >= CMBVersion.MM3DS)
materialSize = 0x16C;
CMBHeader = header; CMBHeader = header;
TextureMaps = new TextureMap[3]; TextureMaps = new TextureMap[3];
TextureMaticies = new TextureMatrix[3]; TextureMaticies = new TextureMatrix[3];
TextureCombiners = new List<TextureCombiner>(); TextureCombiners = new List<TextureCombiner>();
@ -2140,6 +2149,8 @@ namespace FirstPlugin
IsFragmentLightingEnabled = reader.ReadBoolean(); IsFragmentLightingEnabled = reader.ReadBoolean();
IsVertexLightingEnabled = reader.ReadBoolean(); IsVertexLightingEnabled = reader.ReadBoolean();
IsHemiSphereLightingEnabled = reader.ReadBoolean(); IsHemiSphereLightingEnabled = reader.ReadBoolean();
//Tip: IsHemiSphereOcclusionEnabled cannot be enabled unless "IsHemiSphereOcclusionEnabled" is enabled first
IsHemiSphereOcclusionEnabled = reader.ReadBoolean(); IsHemiSphereOcclusionEnabled = reader.ReadBoolean();
CullMode = reader.ReadEnum<CullMode>(true); //byte CullMode = reader.ReadEnum<CullMode>(true); //byte
@ -2167,26 +2178,23 @@ namespace FirstPlugin
TextureMaps[j].borderColorA = reader.ReadByte(); TextureMaps[j].borderColorA = reader.ReadByte();
} }
LightSetIndex = reader.ReadUInt16();
FogIndex = reader.ReadUInt16();
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
{ {
TextureMaticies[j] = new TextureMatrix(); TextureMaticies[j] = new TextureMatrix();
TextureMaticies[j].Scale = reader.ReadVec2SY();
TextureMaticies[j].Rotate = reader.ReadSingle();
TextureMaticies[j].Translate = reader.ReadVec2SY();
TextureMaticies[j].MatrixMode = reader.ReadByte(); TextureMaticies[j].MatrixMode = reader.ReadByte();
TextureMaticies[j].ReferenceCamera = reader.ReadByte(); TextureMaticies[j].ReferenceCamera = reader.ReadByte();
TextureMaticies[j].MappingMethod = reader.ReadByte(); TextureMaticies[j].MappingMethod = reader.ReadByte();
TextureMaticies[j].CoordinateIndex = reader.ReadByte(); TextureMaticies[j].CoordinateIndex = reader.ReadByte();
TextureMaticies[j].Scale = reader.ReadVec2SY();
TextureMaticies[j].Rotate = reader.ReadSingle();
TextureMaticies[j].Translate = reader.ReadVec2SY();
} }
long dataPos = reader.Position; EmissionColor = STColor8.FromBytes(reader.ReadBytes(4));
data = reader.ReadBytes(materialSize - (int)(dataPos - pos)); AmbientColor = STColor8.FromBytes(reader.ReadBytes(4));
reader.SeekBegin(dataPos); Diffuse = STColor8.FromBytes(reader.ReadBytes(4));
Specular0 = STColor8.FromBytes(reader.ReadBytes(4));
uint unkColor0 = reader.ReadUInt32(); Specular1 = STColor8.FromBytes(reader.ReadBytes(4));
ConstantColors = new STColor8[6]; ConstantColors = new STColor8[6];
ConstantColors[0] = STColor8.FromBytes(reader.ReadBytes(4)); ConstantColors[0] = STColor8.FromBytes(reader.ReadBytes(4));
@ -2201,8 +2209,8 @@ namespace FirstPlugin
BufferColorB = reader.ReadSingle(); BufferColorB = reader.ReadSingle();
BufferColorA = reader.ReadSingle(); BufferColorA = reader.ReadSingle();
BumpMapIndex = reader.ReadInt16(); BumpMapIndex = (TextureUnit)reader.ReadUInt16();
BumpMapMode = reader.ReadUInt16(); BumpMapMode = (BumpMode)reader.ReadUInt16();
IsBumpRenormalize = reader.ReadInt16(); IsBumpRenormalize = reader.ReadInt16();
reader.ReadInt16(); //padding reader.ReadInt16(); //padding
LayerConfig = (LayerConfig)reader.ReadUInt16(); LayerConfig = (LayerConfig)reader.ReadUInt16();
@ -2217,31 +2225,38 @@ namespace FirstPlugin
// Fragment lighting table. // Fragment lighting table.
LUTTable.reflectanceRSamplerIsAbs = reader.ReadBoolean(); LUTTable.reflectanceRSamplerIsAbs = reader.ReadBoolean();
LUTTable.reflectanceRSamplerIndex = reader.ReadSByte();
LUTTable.reflectanceRSamplerInput = (LUTInput)reader.ReadUInt16(); LUTTable.reflectanceRSamplerInput = (LUTInput)reader.ReadUInt16();
LUTTable.reflectanceRSamplerScale = reader.ReadUInt32(); LUTTable.reflectanceRSamplerScale = reader.ReadSingle();
LUTTable.reflectanceGSamplerIsAbs = reader.ReadBoolean(); LUTTable.reflectanceGSamplerIsAbs = reader.ReadBoolean();
LUTTable.reflectanceGSamplerIndex = reader.ReadSByte();
LUTTable.reflectanceGSamplerInput = (LUTInput)reader.ReadUInt16(); LUTTable.reflectanceGSamplerInput = (LUTInput)reader.ReadUInt16();
LUTTable.reflectanceGSamplerScale = reader.ReadUInt32(); LUTTable.reflectanceGSamplerScale = reader.ReadSingle();
LUTTable.reflectanceBSamplerIsAbs = reader.ReadBoolean(); LUTTable.reflectanceBSamplerIsAbs = reader.ReadBoolean();
LUTTable.reflectanceBSamplerIndex = reader.ReadSByte();
LUTTable.reflectanceBSamplerInput = (LUTInput)reader.ReadUInt16(); LUTTable.reflectanceBSamplerInput = (LUTInput)reader.ReadUInt16();
LUTTable.reflectanceBSamplerScale = reader.ReadUInt32(); LUTTable.reflectanceBSamplerScale = reader.ReadSingle();
LUTTable.reflectance0SamplerIsAbs = reader.ReadBoolean(); LUTTable.reflectance0SamplerIsAbs = reader.ReadBoolean();
LUTTable.reflectance0SamplerIndex = reader.ReadSByte();
LUTTable.reflectance0SamplerInput = (LUTInput)reader.ReadUInt16(); LUTTable.reflectance0SamplerInput = (LUTInput)reader.ReadUInt16();
LUTTable.reflectance0SamplerScale = reader.ReadUInt32(); LUTTable.reflectance0SamplerScale = reader.ReadSingle();
LUTTable.reflectance1SamplerIsAbs = reader.ReadBoolean(); LUTTable.reflectance1SamplerIsAbs = reader.ReadBoolean();
LUTTable.reflectance1SamplerIndex = reader.ReadSByte();
LUTTable.reflectance1SamplerInput = (LUTInput)reader.ReadUInt16(); LUTTable.reflectance1SamplerInput = (LUTInput)reader.ReadUInt16();
LUTTable.reflectance1SamplerScale = reader.ReadUInt32(); LUTTable.reflectance1SamplerScale = reader.ReadSingle();
LUTTable.fresnelSamplerIsAbs = reader.ReadBoolean(); LUTTable.fresnelSamplerIsAbs = reader.ReadBoolean();
LUTTable.fresnelSamplerIndex = reader.ReadSByte();
LUTTable.fresnelSamplerInput = (LUTInput)reader.ReadUInt16(); LUTTable.fresnelSamplerInput = (LUTInput)reader.ReadUInt16();
LUTTable.fresnelSamplerScale = reader.ReadUInt32(); LUTTable.fresnelSamplerScale = reader.ReadSingle();
reader.SeekBegin(pos + 0x120); reader.SeekBegin(pos + 0x120);
uint textureCombinerTableCount = reader.ReadUInt32(); uint textureCombinerTableCount = reader.ReadUInt32();
var skip = reader.Position;
int textureCombinerTableIdx = (int)pos + 0x124; int textureCombinerTableIdx = (int)pos + 0x124;
for (int i = 0; i < textureCombinerTableCount; i++) for (int i = 0; i < textureCombinerTableCount; i++)
{ {
@ -2274,7 +2289,9 @@ namespace FirstPlugin
textureCombinerTableIdx += 0x2; textureCombinerTableIdx += 0x2;
} }
reader.ReadUInt16(); //padding //Skip TexEnvStages indices. (always 0x6)
reader.SeekBegin(skip + 0x0C);
AlphaTestEnable = reader.ReadBoolean(); AlphaTestEnable = reader.ReadBoolean();
AlphaTestReference = reader.ReadByte() / 0xFF; AlphaTestReference = reader.ReadByte() / 0xFF;
AlphaTestFunction = (AlphaFunction)reader.ReadUInt16(); AlphaTestFunction = (AlphaFunction)reader.ReadUInt16();
@ -2298,11 +2315,11 @@ namespace FirstPlugin
BlendingFactorSrcAlpha = (BlendingFactor)reader.ReadUInt16(); BlendingFactorSrcAlpha = (BlendingFactor)reader.ReadUInt16();
BlendingFactorDestAlpha = (BlendingFactor)reader.ReadUInt16(); BlendingFactorDestAlpha = (BlendingFactor)reader.ReadUInt16();
BlendingEquationAlpha = (BlendEquationMode)reader.ReadUInt16(); BlendingEquationAlpha = (BlendEquationMode)reader.ReadUInt32();
BlendingFactorSrcRGB = (BlendingFactor)reader.ReadUInt16(); BlendingFactorSrcRGB = (BlendingFactor)reader.ReadUInt16();
BlendingFactorDestRGB = (BlendingFactor)reader.ReadUInt16(); BlendingFactorDestRGB = (BlendingFactor)reader.ReadUInt16();
BlendingEquationRGB = (BlendEquationMode)reader.ReadUInt16(); BlendingEquationRGB = (BlendEquationMode)reader.ReadUInt32();
BlendColorR = reader.ReadSingle(); BlendColorR = reader.ReadSingle();
BlendColorG = reader.ReadSingle(); BlendColorG = reader.ReadSingle();
@ -2321,7 +2338,8 @@ namespace FirstPlugin
ushort FailOP = reader.ReadUInt16(); ushort FailOP = reader.ReadUInt16();
ushort ZFailOP = reader.ReadUInt16(); ushort ZFailOP = reader.ReadUInt16();
ushort ZPassOP = reader.ReadUInt16(); ushort ZPassOP = reader.ReadUInt16();
float unk6 = reader.ReadSingle(); ushort unk6 = reader.ReadUInt16();
ushort unk7 = reader.ReadUInt16();
} }
} }
@ -2355,9 +2373,6 @@ namespace FirstPlugin
writer.Write(TextureMaps[j].borderColorA); writer.Write(TextureMaps[j].borderColorA);
} }
writer.Write(LightSetIndex);
writer.Write(FogIndex);
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
{ {
writer.Write(TextureMaticies[j].Scale); writer.Write(TextureMaticies[j].Scale);

7
File_Format_Library/FileFormats/Grezzo/CMB_Enums.cs
View file

@ -154,4 +154,11 @@ namespace Grezzo.CmbEnums
IncrementWrap = 34055, IncrementWrap = 34055,
DecrementWrap = 34055 DecrementWrap = 34055
} }
public enum BumpMode
{
NotUsed = 25288,
AsBump = 25289,
AsTangent = 25290//Doesn't exist in OoT3D
}
} }