update enum

This commit is contained in:
Perfare
2022-06-16 17:45:54 +08:00
committed by VaDiM
parent ded2dcd54e
commit 2fe57a1c5d
16 changed files with 527 additions and 469 deletions

View File

@ -94,29 +94,29 @@ namespace AssetStudio
{
switch (m_AudioClip.m_Type)
{
case AudioType.ACC:
case FMODSoundType.ACC:
return ".m4a";
case AudioType.AIFF:
case FMODSoundType.AIFF:
return ".aif";
case AudioType.IT:
case FMODSoundType.IT:
return ".it";
case AudioType.MOD:
case FMODSoundType.MOD:
return ".mod";
case AudioType.MPEG:
case FMODSoundType.MPEG:
return ".mp3";
case AudioType.OGGVORBIS:
case FMODSoundType.OGGVORBIS:
return ".ogg";
case AudioType.S3M:
case FMODSoundType.S3M:
return ".s3m";
case AudioType.WAV:
case FMODSoundType.WAV:
return ".wav";
case AudioType.XM:
case FMODSoundType.XM:
return ".xm";
case AudioType.XMA:
case FMODSoundType.XMA:
return ".wav";
case AudioType.VAG:
case FMODSoundType.VAG:
return ".vag";
case AudioType.AUDIOQUEUE:
case FMODSoundType.AUDIOQUEUE:
return ".fsb";
}
@ -133,7 +133,7 @@ namespace AssetStudio
return ".fsb";
case AudioCompressionFormat.MP3:
return ".fsb";
case AudioCompressionFormat.VAG:
case AudioCompressionFormat.PSMVAG:
return ".fsb";
case AudioCompressionFormat.HEVAG:
return ".fsb";
@ -159,13 +159,13 @@ namespace AssetStudio
{
switch (m_AudioClip.m_Type)
{
case AudioType.AIFF:
case AudioType.IT:
case AudioType.MOD:
case AudioType.S3M:
case AudioType.XM:
case AudioType.XMA:
case AudioType.AUDIOQUEUE:
case FMODSoundType.AIFF:
case FMODSoundType.IT:
case FMODSoundType.MOD:
case FMODSoundType.S3M:
case FMODSoundType.XM:
case FMODSoundType.XMA:
case FMODSoundType.AUDIOQUEUE:
return true;
default:
return false;

View File

@ -109,17 +109,17 @@ namespace AssetStudio
var sb = new StringBuilder();
switch (m_Passe.m_Type)
{
case PassType.kPassTypeNormal:
case PassType.Normal:
sb.Append(" Pass ");
break;
case PassType.kPassTypeUse:
case PassType.Use:
sb.Append(" UsePass ");
break;
case PassType.kPassTypeGrab:
case PassType.Grab:
sb.Append(" GrabPass ");
break;
}
if (m_Passe.m_Type == PassType.kPassTypeUse)
if (m_Passe.m_Type == PassType.Use)
{
sb.Append($"\"{m_Passe.m_UseName}\"\n");
}
@ -127,7 +127,7 @@ namespace AssetStudio
{
sb.Append("{\n");
if (m_Passe.m_Type == PassType.kPassTypeGrab)
if (m_Passe.m_Type == PassType.Grab)
{
if (!string.IsNullOrEmpty(m_Passe.m_TextureName))
{
@ -358,7 +358,7 @@ namespace AssetStudio
sb.Append(" }\n");
}
if (m_State.fogMode != FogMode.kFogUnknown ||
if (m_State.fogMode != FogMode.Unknown ||
m_State.fogColor.x.val != 0f ||
m_State.fogColor.y.val != 0f ||
m_State.fogColor.z.val != 0f ||
@ -368,21 +368,21 @@ namespace AssetStudio
m_State.fogEnd.val != 0f)
{
sb.Append(" Fog {\n");
if (m_State.fogMode != FogMode.kFogUnknown)
if (m_State.fogMode != FogMode.Unknown)
{
sb.Append(" Mode ");
switch (m_State.fogMode)
{
case FogMode.kFogDisabled:
case FogMode.Disabled:
sb.Append("Off");
break;
case FogMode.kFogLinear:
case FogMode.Linear:
sb.Append("Linear");
break;
case FogMode.kFogExp:
case FogMode.Exp:
sb.Append("Exp");
break;
case FogMode.kFogExp2:
case FogMode.Exp2:
sb.Append("Exp2");
break;
}
@ -674,37 +674,37 @@ namespace AssetStudio
sb.Append($"{m_Prop.m_Name} (\"{m_Prop.m_Description}\", ");
switch (m_Prop.m_Type)
{
case SerializedPropertyType.kColor:
case SerializedPropertyType.Color:
sb.Append("Color");
break;
case SerializedPropertyType.kVector:
case SerializedPropertyType.Vector:
sb.Append("Vector");
break;
case SerializedPropertyType.kFloat:
case SerializedPropertyType.Float:
sb.Append("Float");
break;
case SerializedPropertyType.kRange:
case SerializedPropertyType.Range:
sb.Append($"Range({m_Prop.m_DefValue[1]}, {m_Prop.m_DefValue[2]})");
break;
case SerializedPropertyType.kTexture:
case SerializedPropertyType.Texture:
switch (m_Prop.m_DefTexture.m_TexDim)
{
case TextureDimension.kTexDimAny:
case TextureDimension.Any:
sb.Append("any");
break;
case TextureDimension.kTexDim2D:
case TextureDimension.Tex2D:
sb.Append("2D");
break;
case TextureDimension.kTexDim3D:
case TextureDimension.Tex3D:
sb.Append("3D");
break;
case TextureDimension.kTexDimCUBE:
case TextureDimension.Cube:
sb.Append("Cube");
break;
case TextureDimension.kTexDim2DArray:
case TextureDimension.Tex2DArray:
sb.Append("2DArray");
break;
case TextureDimension.kTexDimCubeArray:
case TextureDimension.CubeArray:
sb.Append("CubeArray");
break;
}
@ -713,15 +713,15 @@ namespace AssetStudio
sb.Append(") = ");
switch (m_Prop.m_Type)
{
case SerializedPropertyType.kColor:
case SerializedPropertyType.kVector:
case SerializedPropertyType.Color:
case SerializedPropertyType.Vector:
sb.Append($"({m_Prop.m_DefValue[0]},{m_Prop.m_DefValue[1]},{m_Prop.m_DefValue[2]},{m_Prop.m_DefValue[3]})");
break;
case SerializedPropertyType.kFloat:
case SerializedPropertyType.kRange:
case SerializedPropertyType.Float:
case SerializedPropertyType.Range:
sb.Append(m_Prop.m_DefValue[0]);
break;
case SerializedPropertyType.kTexture:
case SerializedPropertyType.Texture:
sb.Append($"\"{m_Prop.m_DefTexture.m_DefaultName}\" {{ }}");
break;
default:
@ -735,64 +735,65 @@ namespace AssetStudio
{
switch (platform)
{
case ShaderCompilerPlatform.kShaderCompPlatformGL:
return programType == ShaderGpuProgramType.kShaderGpuProgramGLLegacy;
case ShaderCompilerPlatform.kShaderCompPlatformD3D9:
return programType == ShaderGpuProgramType.kShaderGpuProgramDX9VertexSM20
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX9VertexSM30
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM20
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM30;
case ShaderCompilerPlatform.kShaderCompPlatformXbox360:
case ShaderCompilerPlatform.kShaderCompPlatformPS3:
case ShaderCompilerPlatform.kShaderCompPlatformPSP2:
case ShaderCompilerPlatform.kShaderCompPlatformPS4:
case ShaderCompilerPlatform.kShaderCompPlatformXboxOne:
case ShaderCompilerPlatform.kShaderCompPlatformN3DS:
case ShaderCompilerPlatform.kShaderCompPlatformWiiU:
case ShaderCompilerPlatform.kShaderCompPlatformSwitch:
case ShaderCompilerPlatform.kShaderCompPlatformXboxOneD3D12:
case ShaderCompilerPlatform.kShaderCompPlatformGameCoreXboxOne:
case ShaderCompilerPlatform.kShaderCompPlatformGameCoreScarlett:
case ShaderCompilerPlatform.kShaderCompPlatformPS5:
case ShaderCompilerPlatform.kShaderCompPlatformPS5NGGC:
return programType == ShaderGpuProgramType.kShaderGpuProgramConsoleVS
|| programType == ShaderGpuProgramType.kShaderGpuProgramConsoleFS
|| programType == ShaderGpuProgramType.kShaderGpuProgramConsoleHS
|| programType == ShaderGpuProgramType.kShaderGpuProgramConsoleDS
|| programType == ShaderGpuProgramType.kShaderGpuProgramConsoleGS;
case ShaderCompilerPlatform.kShaderCompPlatformD3D11:
return programType == ShaderGpuProgramType.kShaderGpuProgramDX11VertexSM40
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11VertexSM50
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11PixelSM40
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11PixelSM50
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11GeometrySM40
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11GeometrySM50
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11HullSM50
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX11DomainSM50;
case ShaderCompilerPlatform.kShaderCompPlatformGLES20:
return programType == ShaderGpuProgramType.kShaderGpuProgramGLES;
case ShaderCompilerPlatform.kShaderCompPlatformNaCl: //Obsolete
case ShaderCompilerPlatform.GL:
return programType == ShaderGpuProgramType.GLLegacy;
case ShaderCompilerPlatform.D3D9:
return programType == ShaderGpuProgramType.DX9VertexSM20
|| programType == ShaderGpuProgramType.DX9VertexSM30
|| programType == ShaderGpuProgramType.DX9PixelSM20
|| programType == ShaderGpuProgramType.DX9PixelSM30;
case ShaderCompilerPlatform.Xbox360:
case ShaderCompilerPlatform.PS3:
case ShaderCompilerPlatform.PSP2:
case ShaderCompilerPlatform.PS4:
case ShaderCompilerPlatform.XboxOne:
case ShaderCompilerPlatform.N3DS:
case ShaderCompilerPlatform.WiiU:
case ShaderCompilerPlatform.Switch:
case ShaderCompilerPlatform.XboxOneD3D12:
case ShaderCompilerPlatform.GameCoreXboxOne:
case ShaderCompilerPlatform.GameCoreScarlett:
case ShaderCompilerPlatform.PS5:
return programType == ShaderGpuProgramType.ConsoleVS
|| programType == ShaderGpuProgramType.ConsoleFS
|| programType == ShaderGpuProgramType.ConsoleHS
|| programType == ShaderGpuProgramType.ConsoleDS
|| programType == ShaderGpuProgramType.ConsoleGS;
case ShaderCompilerPlatform.PS5NGGC:
return programType == ShaderGpuProgramType.PS5NGGC;
case ShaderCompilerPlatform.D3D11:
return programType == ShaderGpuProgramType.DX11VertexSM40
|| programType == ShaderGpuProgramType.DX11VertexSM50
|| programType == ShaderGpuProgramType.DX11PixelSM40
|| programType == ShaderGpuProgramType.DX11PixelSM50
|| programType == ShaderGpuProgramType.DX11GeometrySM40
|| programType == ShaderGpuProgramType.DX11GeometrySM50
|| programType == ShaderGpuProgramType.DX11HullSM50
|| programType == ShaderGpuProgramType.DX11DomainSM50;
case ShaderCompilerPlatform.GLES20:
return programType == ShaderGpuProgramType.GLES;
case ShaderCompilerPlatform.NaCl: //Obsolete
throw new NotSupportedException();
case ShaderCompilerPlatform.kShaderCompPlatformFlash: //Obsolete
case ShaderCompilerPlatform.Flash: //Obsolete
throw new NotSupportedException();
case ShaderCompilerPlatform.kShaderCompPlatformD3D11_9x:
return programType == ShaderGpuProgramType.kShaderGpuProgramDX10Level9Vertex
|| programType == ShaderGpuProgramType.kShaderGpuProgramDX10Level9Pixel;
case ShaderCompilerPlatform.kShaderCompPlatformGLES3Plus:
return programType == ShaderGpuProgramType.kShaderGpuProgramGLES31AEP
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLES31
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLES3;
case ShaderCompilerPlatform.kShaderCompPlatformPSM: //Unknown
case ShaderCompilerPlatform.D3D11_9x:
return programType == ShaderGpuProgramType.DX10Level9Vertex
|| programType == ShaderGpuProgramType.DX10Level9Pixel;
case ShaderCompilerPlatform.GLES3Plus:
return programType == ShaderGpuProgramType.GLES31AEP
|| programType == ShaderGpuProgramType.GLES31
|| programType == ShaderGpuProgramType.GLES3;
case ShaderCompilerPlatform.PSM: //Unknown
throw new NotSupportedException();
case ShaderCompilerPlatform.kShaderCompPlatformMetal:
return programType == ShaderGpuProgramType.kShaderGpuProgramMetalVS
|| programType == ShaderGpuProgramType.kShaderGpuProgramMetalFS;
case ShaderCompilerPlatform.kShaderCompPlatformOpenGLCore:
return programType == ShaderGpuProgramType.kShaderGpuProgramGLCore32
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLCore41
|| programType == ShaderGpuProgramType.kShaderGpuProgramGLCore43;
case ShaderCompilerPlatform.kShaderCompPlatformVulkan:
return programType == ShaderGpuProgramType.kShaderGpuProgramSPIRV;
case ShaderCompilerPlatform.Metal:
return programType == ShaderGpuProgramType.MetalVS
|| programType == ShaderGpuProgramType.MetalFS;
case ShaderCompilerPlatform.OpenGLCore:
return programType == ShaderGpuProgramType.GLCore32
|| programType == ShaderGpuProgramType.GLCore41
|| programType == ShaderGpuProgramType.GLCore43;
case ShaderCompilerPlatform.Vulkan:
return programType == ShaderGpuProgramType.SPIRV;
default:
throw new NotSupportedException();
}
@ -802,55 +803,55 @@ namespace AssetStudio
{
switch (platform)
{
case ShaderCompilerPlatform.kShaderCompPlatformGL:
case ShaderCompilerPlatform.GL:
return "openGL";
case ShaderCompilerPlatform.kShaderCompPlatformD3D9:
case ShaderCompilerPlatform.D3D9:
return "d3d9";
case ShaderCompilerPlatform.kShaderCompPlatformXbox360:
case ShaderCompilerPlatform.Xbox360:
return "xbox360";
case ShaderCompilerPlatform.kShaderCompPlatformPS3:
case ShaderCompilerPlatform.PS3:
return "ps3";
case ShaderCompilerPlatform.kShaderCompPlatformD3D11:
case ShaderCompilerPlatform.D3D11:
return "d3d11";
case ShaderCompilerPlatform.kShaderCompPlatformGLES20:
case ShaderCompilerPlatform.GLES20:
return "gles";
case ShaderCompilerPlatform.kShaderCompPlatformNaCl:
case ShaderCompilerPlatform.NaCl:
return "glesdesktop";
case ShaderCompilerPlatform.kShaderCompPlatformFlash:
case ShaderCompilerPlatform.Flash:
return "flash";
case ShaderCompilerPlatform.kShaderCompPlatformD3D11_9x:
case ShaderCompilerPlatform.D3D11_9x:
return "d3d11_9x";
case ShaderCompilerPlatform.kShaderCompPlatformGLES3Plus:
case ShaderCompilerPlatform.GLES3Plus:
return "gles3";
case ShaderCompilerPlatform.kShaderCompPlatformPSP2:
case ShaderCompilerPlatform.PSP2:
return "psp2";
case ShaderCompilerPlatform.kShaderCompPlatformPS4:
case ShaderCompilerPlatform.PS4:
return "ps4";
case ShaderCompilerPlatform.kShaderCompPlatformXboxOne:
case ShaderCompilerPlatform.XboxOne:
return "xboxone";
case ShaderCompilerPlatform.kShaderCompPlatformPSM:
case ShaderCompilerPlatform.PSM:
return "psm";
case ShaderCompilerPlatform.kShaderCompPlatformMetal:
case ShaderCompilerPlatform.Metal:
return "metal";
case ShaderCompilerPlatform.kShaderCompPlatformOpenGLCore:
case ShaderCompilerPlatform.OpenGLCore:
return "glcore";
case ShaderCompilerPlatform.kShaderCompPlatformN3DS:
case ShaderCompilerPlatform.N3DS:
return "n3ds";
case ShaderCompilerPlatform.kShaderCompPlatformWiiU:
case ShaderCompilerPlatform.WiiU:
return "wiiu";
case ShaderCompilerPlatform.kShaderCompPlatformVulkan:
case ShaderCompilerPlatform.Vulkan:
return "vulkan";
case ShaderCompilerPlatform.kShaderCompPlatformSwitch:
case ShaderCompilerPlatform.Switch:
return "switch";
case ShaderCompilerPlatform.kShaderCompPlatformXboxOneD3D12:
case ShaderCompilerPlatform.XboxOneD3D12:
return "xboxone_d3d12";
case ShaderCompilerPlatform.kShaderCompPlatformGameCoreXboxOne:
case ShaderCompilerPlatform.GameCoreXboxOne:
return "xboxone";
case ShaderCompilerPlatform.kShaderCompPlatformGameCoreScarlett:
case ShaderCompilerPlatform.GameCoreScarlett:
return "xbox_scarlett";
case ShaderCompilerPlatform.kShaderCompPlatformPS5:
case ShaderCompilerPlatform.PS5:
return "ps5";
case ShaderCompilerPlatform.kShaderCompPlatformPS5NGGC:
case ShaderCompilerPlatform.PS5NGGC:
return "ps5_nggc";
default:
return "unknown";
@ -996,36 +997,36 @@ namespace AssetStudio
{
switch (m_ProgramType)
{
case ShaderGpuProgramType.kShaderGpuProgramGLLegacy:
case ShaderGpuProgramType.kShaderGpuProgramGLES31AEP:
case ShaderGpuProgramType.kShaderGpuProgramGLES31:
case ShaderGpuProgramType.kShaderGpuProgramGLES3:
case ShaderGpuProgramType.kShaderGpuProgramGLES:
case ShaderGpuProgramType.kShaderGpuProgramGLCore32:
case ShaderGpuProgramType.kShaderGpuProgramGLCore41:
case ShaderGpuProgramType.kShaderGpuProgramGLCore43:
case ShaderGpuProgramType.GLLegacy:
case ShaderGpuProgramType.GLES31AEP:
case ShaderGpuProgramType.GLES31:
case ShaderGpuProgramType.GLES3:
case ShaderGpuProgramType.GLES:
case ShaderGpuProgramType.GLCore32:
case ShaderGpuProgramType.GLCore41:
case ShaderGpuProgramType.GLCore43:
sb.Append(Encoding.UTF8.GetString(m_ProgramCode));
break;
case ShaderGpuProgramType.kShaderGpuProgramDX9VertexSM20:
case ShaderGpuProgramType.kShaderGpuProgramDX9VertexSM30:
case ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM20:
case ShaderGpuProgramType.kShaderGpuProgramDX9PixelSM30:
case ShaderGpuProgramType.DX9VertexSM20:
case ShaderGpuProgramType.DX9VertexSM30:
case ShaderGpuProgramType.DX9PixelSM20:
case ShaderGpuProgramType.DX9PixelSM30:
{
/*var shaderBytecode = new ShaderBytecode(m_ProgramCode);
sb.Append(shaderBytecode.Disassemble());*/
sb.Append("// shader disassembly not supported on DXBC");
break;
}
case ShaderGpuProgramType.kShaderGpuProgramDX10Level9Vertex:
case ShaderGpuProgramType.kShaderGpuProgramDX10Level9Pixel:
case ShaderGpuProgramType.kShaderGpuProgramDX11VertexSM40:
case ShaderGpuProgramType.kShaderGpuProgramDX11VertexSM50:
case ShaderGpuProgramType.kShaderGpuProgramDX11PixelSM40:
case ShaderGpuProgramType.kShaderGpuProgramDX11PixelSM50:
case ShaderGpuProgramType.kShaderGpuProgramDX11GeometrySM40:
case ShaderGpuProgramType.kShaderGpuProgramDX11GeometrySM50:
case ShaderGpuProgramType.kShaderGpuProgramDX11HullSM50:
case ShaderGpuProgramType.kShaderGpuProgramDX11DomainSM50:
case ShaderGpuProgramType.DX10Level9Vertex:
case ShaderGpuProgramType.DX10Level9Pixel:
case ShaderGpuProgramType.DX11VertexSM40:
case ShaderGpuProgramType.DX11VertexSM50:
case ShaderGpuProgramType.DX11PixelSM40:
case ShaderGpuProgramType.DX11PixelSM50:
case ShaderGpuProgramType.DX11GeometrySM40:
case ShaderGpuProgramType.DX11GeometrySM50:
case ShaderGpuProgramType.DX11HullSM50:
case ShaderGpuProgramType.DX11DomainSM50:
{
/*int start = 6;
if (m_Version == 201509030) // 5.3
@ -1039,8 +1040,8 @@ namespace AssetStudio
sb.Append("// shader disassembly not supported on DXBC");
break;
}
case ShaderGpuProgramType.kShaderGpuProgramMetalVS:
case ShaderGpuProgramType.kShaderGpuProgramMetalFS:
case ShaderGpuProgramType.MetalVS:
case ShaderGpuProgramType.MetalFS:
using (var reader = new BinaryReader(new MemoryStream(m_ProgramCode)))
{
var fourCC = reader.ReadUInt32();
@ -1054,7 +1055,7 @@ namespace AssetStudio
sb.Append(Encoding.UTF8.GetString(buff));
}
break;
case ShaderGpuProgramType.kShaderGpuProgramSPIRV:
case ShaderGpuProgramType.SPIRV:
try
{
sb.Append(SpirVShaderConverter.Convert(m_ProgramCode));
@ -1064,11 +1065,11 @@ namespace AssetStudio
sb.Append($"// disassembly error {e.Message}\n");
}
break;
case ShaderGpuProgramType.kShaderGpuProgramConsoleVS:
case ShaderGpuProgramType.kShaderGpuProgramConsoleFS:
case ShaderGpuProgramType.kShaderGpuProgramConsoleHS:
case ShaderGpuProgramType.kShaderGpuProgramConsoleDS:
case ShaderGpuProgramType.kShaderGpuProgramConsoleGS:
case ShaderGpuProgramType.ConsoleVS:
case ShaderGpuProgramType.ConsoleFS:
case ShaderGpuProgramType.ConsoleHS:
case ShaderGpuProgramType.ConsoleDS:
case ShaderGpuProgramType.ConsoleGS:
sb.Append(Encoding.UTF8.GetString(m_ProgramCode));
break;
default:

View File

@ -58,23 +58,23 @@ namespace AssetStudio
//RotateAndFlip
switch (settingsRaw.packingRotation)
{
case SpritePackingRotation.kSPRFlipHorizontal:
case SpritePackingRotation.FlipHorizontal:
spriteImage.Mutate(x => x.Flip(FlipMode.Horizontal));
break;
case SpritePackingRotation.kSPRFlipVertical:
case SpritePackingRotation.FlipVertical:
spriteImage.Mutate(x => x.Flip(FlipMode.Vertical));
break;
case SpritePackingRotation.kSPRRotate180:
case SpritePackingRotation.Rotate180:
spriteImage.Mutate(x => x.Rotate(180));
break;
case SpritePackingRotation.kSPRRotate90:
case SpritePackingRotation.Rotate90:
spriteImage.Mutate(x => x.Rotate(270));
break;
}
}
//Tight
if (settingsRaw.packingMode == SpritePackingMode.kSPMTight)
if (settingsRaw.packingMode == SpritePackingMode.Tight)
{
try
{