ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Some null-check cleanup.

Browse source
This commit is contained in:
Ottermandias 2025-02-27 05:38:42 +01:00
parent 514b0e7f30
commit 776a93dc73
2 changed files with 39 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Penumbra/Interop/ResourceTree/ResolveContext.PathResolution.cs
View file

@ -248,7 +248,7 @@ internal partial record ResolveContext
if (faceId < 201) if (faceId < 201)
faceId -= tribe switch faceId -= tribe switch
{ {
0xB when modelType == 4 => 100, 0xB when modelType is 4 => 100,
0xE | 0xF => 100, 0xE | 0xF => 100,
_ => 0, _ => 0,
}; };
@ -297,7 +297,7 @@ internal partial record ResolveContext
private Utf8GamePath ResolveHumanSkeletonParameterPath(uint partialSkeletonIndex) private Utf8GamePath ResolveHumanSkeletonParameterPath(uint partialSkeletonIndex)
{ {
var (raceCode, slot, set) = ResolveHumanSkeletonData(partialSkeletonIndex); var (raceCode, slot, set) = ResolveHumanSkeletonData(partialSkeletonIndex);
if (set == 0) if (set.Id is 0)
return Utf8GamePath.Empty; return Utf8GamePath.Empty;
var path = GamePaths.Skeleton.Skp.Path(raceCode, slot, set); var path = GamePaths.Skeleton.Skp.Path(raceCode, slot, set);
@ -325,7 +325,7 @@ internal partial record ResolveContext
private Utf8GamePath ResolveHumanPhysicsModulePath(uint partialSkeletonIndex) private Utf8GamePath ResolveHumanPhysicsModulePath(uint partialSkeletonIndex)
{ {
var (raceCode, slot, set) = ResolveHumanSkeletonData(partialSkeletonIndex); var (raceCode, slot, set) = ResolveHumanSkeletonData(partialSkeletonIndex);
if (set == 0) if (set.Id is 0)
return Utf8GamePath.Empty; return Utf8GamePath.Empty;
var path = GamePaths.Skeleton.Phyb.Path(raceCode, slot, set); var path = GamePaths.Skeleton.Phyb.Path(raceCode, slot, set);
@ -341,7 +341,7 @@ internal partial record ResolveContext
private unsafe Utf8GamePath ResolveMaterialAnimationPath(ResourceHandle* imc) private unsafe Utf8GamePath ResolveMaterialAnimationPath(ResourceHandle* imc)
{ {
var animation = ResolveImcData(imc).MaterialAnimationId; var animation = ResolveImcData(imc).MaterialAnimationId;
if (animation == 0) if (animation is 0)
return Utf8GamePath.Empty; return Utf8GamePath.Empty;
var path = CharacterBase->ResolveMaterialPapPathAsByteString(SlotIndex, animation); var path = CharacterBase->ResolveMaterialPapPathAsByteString(SlotIndex, animation);
@ -351,7 +351,7 @@ internal partial record ResolveContext
private unsafe Utf8GamePath ResolveDecalPath(ResourceHandle* imc) private unsafe Utf8GamePath ResolveDecalPath(ResourceHandle* imc)
{ {
var decal = ResolveImcData(imc).DecalId; var decal = ResolveImcData(imc).DecalId;
if (decal == 0) if (decal is 0)
return Utf8GamePath.Empty; return Utf8GamePath.Empty;
var path = GamePaths.Equipment.Decal.Path(decal); var path = GamePaths.Equipment.Decal.Path(decal);

81
Penumbra/Interop/ResourceTree/ResolveContext.cs
View file

@ -52,7 +52,7 @@ internal unsafe partial record ResolveContext(
private ResourceNode? CreateNodeFromShpk(ShaderPackageResourceHandle* resourceHandle, CiByteString gamePath) private ResourceNode? CreateNodeFromShpk(ShaderPackageResourceHandle* resourceHandle, CiByteString gamePath)
{ {
if (resourceHandle == null) if (resourceHandle is null)
return null; return null;
if (gamePath.IsEmpty) if (gamePath.IsEmpty)
return null; return null;
@ -65,7 +65,7 @@ internal unsafe partial record ResolveContext(
[SkipLocalsInit] [SkipLocalsInit]
private ResourceNode? CreateNodeFromTex(TextureResourceHandle* resourceHandle, CiByteString gamePath, bool dx11) private ResourceNode? CreateNodeFromTex(TextureResourceHandle* resourceHandle, CiByteString gamePath, bool dx11)
{ {
if (resourceHandle == null) if (resourceHandle is null)
return null; return null;
Utf8GamePath path; Utf8GamePath path;
@ -105,7 +105,7 @@ internal unsafe partial record ResolveContext(
private ResourceNode GetOrCreateNode(ResourceType type, nint objectAddress, ResourceHandle* resourceHandle, private ResourceNode GetOrCreateNode(ResourceType type, nint objectAddress, ResourceHandle* resourceHandle,
Utf8GamePath gamePath) Utf8GamePath gamePath)
{ {
if (resourceHandle == null) if (resourceHandle is null)
throw new ArgumentNullException(nameof(resourceHandle)); throw new ArgumentNullException(nameof(resourceHandle));
if (Global.Nodes.TryGetValue((gamePath, (nint)resourceHandle), out var cached)) if (Global.Nodes.TryGetValue((gamePath, (nint)resourceHandle), out var cached))
@ -117,7 +117,7 @@ internal unsafe partial record ResolveContext(
private ResourceNode CreateNode(ResourceType type, nint objectAddress, ResourceHandle* resourceHandle, private ResourceNode CreateNode(ResourceType type, nint objectAddress, ResourceHandle* resourceHandle,
Utf8GamePath gamePath, bool autoAdd = true) Utf8GamePath gamePath, bool autoAdd = true)
{ {
if (resourceHandle == null) if (resourceHandle is null)
throw new ArgumentNullException(nameof(resourceHandle)); throw new ArgumentNullException(nameof(resourceHandle));
var fileName = (ReadOnlySpan<byte>)resourceHandle->FileName.AsSpan(); var fileName = (ReadOnlySpan<byte>)resourceHandle->FileName.AsSpan();
@ -141,7 +141,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromEid(ResourceHandle* eid) public ResourceNode? CreateNodeFromEid(ResourceHandle* eid)
{ {
if (eid == null) if (eid is null)
return null; return null;
if (!Utf8GamePath.FromByteString(CharacterBase->ResolveEidPathAsByteString(), out var path)) if (!Utf8GamePath.FromByteString(CharacterBase->ResolveEidPathAsByteString(), out var path))
@ -152,7 +152,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromImc(ResourceHandle* imc) public ResourceNode? CreateNodeFromImc(ResourceHandle* imc)
{ {
if (imc == null) if (imc is null)
return null; return null;
if (!Utf8GamePath.FromByteString(CharacterBase->ResolveImcPathAsByteString(SlotIndex), out var path)) if (!Utf8GamePath.FromByteString(CharacterBase->ResolveImcPathAsByteString(SlotIndex), out var path))
@ -163,7 +163,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromPbd(ResourceHandle* pbd) public ResourceNode? CreateNodeFromPbd(ResourceHandle* pbd)
{ {
if (pbd == null) if (pbd is null)
return null; return null;
return GetOrCreateNode(ResourceType.Pbd, 0, pbd, PreBoneDeformerReplacer.PreBoneDeformerPath); return GetOrCreateNode(ResourceType.Pbd, 0, pbd, PreBoneDeformerReplacer.PreBoneDeformerPath);
@ -171,7 +171,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromTex(TextureResourceHandle* tex, string gamePath) public ResourceNode? CreateNodeFromTex(TextureResourceHandle* tex, string gamePath)
{ {
if (tex == null) if (tex is null)
return null; return null;
if (!Utf8GamePath.FromString(gamePath, out var path)) if (!Utf8GamePath.FromString(gamePath, out var path))
@ -182,7 +182,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromTex(TextureResourceHandle* tex, Utf8GamePath gamePath) public ResourceNode? CreateNodeFromTex(TextureResourceHandle* tex, Utf8GamePath gamePath)
{ {
if (tex == null) if (tex is null)
return null; return null;
return GetOrCreateNode(ResourceType.Tex, (nint)tex->Texture, &tex->ResourceHandle, gamePath); return GetOrCreateNode(ResourceType.Tex, (nint)tex->Texture, &tex->ResourceHandle, gamePath);
@ -190,7 +190,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromModel(Model* mdl, ResourceHandle* imc, TextureResourceHandle* decalHandle, ResourceHandle* mpapHandle) public ResourceNode? CreateNodeFromModel(Model* mdl, ResourceHandle* imc, TextureResourceHandle* decalHandle, ResourceHandle* mpapHandle)
{ {
if (mdl == null || mdl->ModelResourceHandle == null) if (mdl is null || mdl->ModelResourceHandle is null)
return null; return null;
var mdlResource = mdl->ModelResourceHandle; var mdlResource = mdl->ModelResourceHandle;
@ -205,12 +205,12 @@ internal unsafe partial record ResolveContext(
for (var i = 0; i < mdl->MaterialCount; i++) for (var i = 0; i < mdl->MaterialCount; i++)
{ {
var mtrl = mdl->Materials[i]; var mtrl = mdl->Materials[i];
if (mtrl == null) if (mtrl is null)
continue; continue;
var mtrlFileName = mdlResource->GetMaterialFileNameBySlot((uint)i); var mtrlFileName = mdlResource->GetMaterialFileNameBySlot((uint)i);
var mtrlNode = CreateNodeFromMaterial(mtrl, ResolveMaterialPath(path, imc, mtrlFileName)); var mtrlNode = CreateNodeFromMaterial(mtrl, ResolveMaterialPath(path, imc, mtrlFileName));
if (mtrlNode != null) if (mtrlNode is not null)
{ {
if (Global.WithUiData) if (Global.WithUiData)
mtrlNode.FallbackName = $"Material #{i}"; mtrlNode.FallbackName = $"Material #{i}";
@ -218,12 +218,10 @@ internal unsafe partial record ResolveContext(
} }
} }
var decalNode = CreateNodeFromDecal(decalHandle, imc); if (CreateNodeFromDecal(decalHandle, imc) is { } decalNode)
if (null != decalNode)
node.Children.Add(decalNode); node.Children.Add(decalNode);
var mpapNode = CreateNodeFromMaterialPap(mpapHandle, imc); if (CreateNodeFromMaterialPap(mpapHandle, imc) is { } mpapNode)
if (null != mpapNode)
node.Children.Add(mpapNode); node.Children.Add(mpapNode);
Global.Nodes.Add((path, (nint)mdl->ModelResourceHandle), node); Global.Nodes.Add((path, (nint)mdl->ModelResourceHandle), node);
@ -233,7 +231,7 @@ internal unsafe partial record ResolveContext(
private ResourceNode? CreateNodeFromMaterial(Material* mtrl, Utf8GamePath path) private ResourceNode? CreateNodeFromMaterial(Material* mtrl, Utf8GamePath path)
{ {
if (mtrl == null || mtrl->MaterialResourceHandle == null) if (mtrl is null || mtrl->MaterialResourceHandle is null)
return null; return null;
var resource = mtrl->MaterialResourceHandle; var resource = mtrl->MaterialResourceHandle;
@ -242,15 +240,15 @@ internal unsafe partial record ResolveContext(
var node = CreateNode(ResourceType.Mtrl, (nint)mtrl, &resource->ResourceHandle, path, false); var node = CreateNode(ResourceType.Mtrl, (nint)mtrl, &resource->ResourceHandle, path, false);
var shpkNode = CreateNodeFromShpk(resource->ShaderPackageResourceHandle, new CiByteString(resource->ShpkName)); var shpkNode = CreateNodeFromShpk(resource->ShaderPackageResourceHandle, new CiByteString(resource->ShpkName));
if (shpkNode != null) if (shpkNode is not null)
{ {
if (Global.WithUiData) if (Global.WithUiData)
shpkNode.Name = "Shader Package"; shpkNode.Name = "Shader Package";
node.Children.Add(shpkNode); node.Children.Add(shpkNode);
} }
var shpkNames = Global.WithUiData && shpkNode != null ? Global.TreeBuildCache.ReadShaderPackageNames(shpkNode.FullPath) : null; var shpkNames = Global.WithUiData && shpkNode is not null ? Global.TreeBuildCache.ReadShaderPackageNames(shpkNode.FullPath) : null;
var shpk = Global.WithUiData && shpkNode != null ? (ShaderPackage*)shpkNode.ObjectAddress : null; var shpk = Global.WithUiData && shpkNode is not null ? (ShaderPackage*)shpkNode.ObjectAddress : null;
var alreadyProcessedSamplerIds = new HashSet<uint>(); var alreadyProcessedSamplerIds = new HashSet<uint>();
for (var i = 0; i < resource->TextureCount; i++) for (var i = 0; i < resource->TextureCount; i++)
@ -263,7 +261,7 @@ internal unsafe partial record ResolveContext(
if (Global.WithUiData) if (Global.WithUiData)
{ {
string? name = null; string? name = null;
if (shpk != null) if (shpk is not null)
{ {
var index = GetTextureIndex(mtrl, resource->Textures[i].Flags, alreadyProcessedSamplerIds); var index = GetTextureIndex(mtrl, resource->Textures[i].Flags, alreadyProcessedSamplerIds);
var samplerId = index != 0x001F var samplerId = index != 0x001F
@ -319,7 +317,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromDecal(TextureResourceHandle* decalHandle, ResourceHandle* imc) public ResourceNode? CreateNodeFromDecal(TextureResourceHandle* decalHandle, ResourceHandle* imc)
{ {
if (decalHandle == null) if (decalHandle is null)
return null; return null;
var path = ResolveDecalPath(imc); var path = ResolveDecalPath(imc);
@ -335,7 +333,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromMaterialPap(ResourceHandle* mpapHandle, ResourceHandle* imc) public ResourceNode? CreateNodeFromMaterialPap(ResourceHandle* mpapHandle, ResourceHandle* imc)
{ {
if (mpapHandle == null) if (mpapHandle is null)
return null; return null;
var path = ResolveMaterialAnimationPath(imc); var path = ResolveMaterialAnimationPath(imc);
@ -354,7 +352,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromMaterialSklb(SkeletonResourceHandle* sklbHandle) public ResourceNode? CreateNodeFromMaterialSklb(SkeletonResourceHandle* sklbHandle)
{ {
if (sklbHandle == null) if (sklbHandle is null)
return null; return null;
if (!Utf8GamePath.FromString(GamePaths.Skeleton.Sklb.MaterialAnimationSkeletonPath, out var path)) if (!Utf8GamePath.FromString(GamePaths.Skeleton.Sklb.MaterialAnimationSkeletonPath, out var path))
@ -371,7 +369,7 @@ internal unsafe partial record ResolveContext(
public ResourceNode? CreateNodeFromPartialSkeleton(PartialSkeleton* sklb, ResourceHandle* phybHandle, uint partialSkeletonIndex) public ResourceNode? CreateNodeFromPartialSkeleton(PartialSkeleton* sklb, ResourceHandle* phybHandle, uint partialSkeletonIndex)
{ {
if (sklb == null || sklb->SkeletonResourceHandle == null) if (sklb is null || sklb->SkeletonResourceHandle is null)
return null; return null;
var path = ResolveSkeletonPath(partialSkeletonIndex); var path = ResolveSkeletonPath(partialSkeletonIndex);
@ -379,12 +377,10 @@ internal unsafe partial record ResolveContext(
if (Global.Nodes.TryGetValue((path, (nint)sklb->SkeletonResourceHandle), out var cached)) if (Global.Nodes.TryGetValue((path, (nint)sklb->SkeletonResourceHandle), out var cached))
return cached; return cached;
var node = CreateNode(ResourceType.Sklb, (nint)sklb, (ResourceHandle*)sklb->SkeletonResourceHandle, path, false); var node = CreateNode(ResourceType.Sklb, (nint)sklb, (ResourceHandle*)sklb->SkeletonResourceHandle, path, false);
var skpNode = CreateParameterNodeFromPartialSkeleton(sklb, partialSkeletonIndex); if (CreateParameterNodeFromPartialSkeleton(sklb, partialSkeletonIndex) is { } skpNode)
if (skpNode != null)
node.Children.Add(skpNode); node.Children.Add(skpNode);
var phybNode = CreateNodeFromPhyb(phybHandle, partialSkeletonIndex); if (CreateNodeFromPhyb(phybHandle, partialSkeletonIndex) is { } phybNode)
if (phybNode != null)
node.Children.Add(phybNode); node.Children.Add(phybNode);
Global.Nodes.Add((path, (nint)sklb->SkeletonResourceHandle), node); Global.Nodes.Add((path, (nint)sklb->SkeletonResourceHandle), node);
@ -393,7 +389,7 @@ internal unsafe partial record ResolveContext(
private ResourceNode? CreateParameterNodeFromPartialSkeleton(PartialSkeleton* sklb, uint partialSkeletonIndex) private ResourceNode? CreateParameterNodeFromPartialSkeleton(PartialSkeleton* sklb, uint partialSkeletonIndex)
{ {
if (sklb == null || sklb->SkeletonParameterResourceHandle == null) if (sklb is null || sklb->SkeletonParameterResourceHandle is null)
return null; return null;
var path = ResolveSkeletonParameterPath(partialSkeletonIndex); var path = ResolveSkeletonParameterPath(partialSkeletonIndex);
@ -411,7 +407,7 @@ internal unsafe partial record ResolveContext(
private ResourceNode? CreateNodeFromPhyb(ResourceHandle* phybHandle, uint partialSkeletonIndex) private ResourceNode? CreateNodeFromPhyb(ResourceHandle* phybHandle, uint partialSkeletonIndex)
{ {
if (phybHandle == null) if (phybHandle is null)
return null; return null;
var path = ResolvePhysicsModulePath(partialSkeletonIndex); var path = ResolvePhysicsModulePath(partialSkeletonIndex);
@ -431,7 +427,9 @@ internal unsafe partial record ResolveContext(
{ {
var path = gamePath.Path.Split((byte)'/'); var path = gamePath.Path.Split((byte)'/');
// Weapons intentionally left out. // Weapons intentionally left out.
var isEquipment = path.Count >= 2 && path[0].Span.SequenceEqual("chara"u8) && (path[1].Span.SequenceEqual("accessory"u8) || path[1].Span.SequenceEqual("equipment"u8)); var isEquipment = path.Count >= 2
&& path[0].Span.SequenceEqual("chara"u8)
&& (path[1].Span.SequenceEqual("accessory"u8) || path[1].Span.SequenceEqual("equipment"u8));
if (isEquipment) if (isEquipment)
foreach (var item in Global.Identifier.Identify(Equipment.Set, 0, Equipment.Variant, Slot.ToSlot())) foreach (var item in Global.Identifier.Identify(Equipment.Set, 0, Equipment.Variant, Slot.ToSlot()))
{ {
@ -447,7 +445,7 @@ internal unsafe partial record ResolveContext(
} }
var dataFromPath = GuessUiDataFromPath(gamePath); var dataFromPath = GuessUiDataFromPath(gamePath);
if (dataFromPath.Name != null) if (dataFromPath.Name is not null)
return dataFromPath; return dataFromPath;
return isEquipment return isEquipment
@ -462,24 +460,13 @@ internal unsafe partial record ResolveContext(
var name = obj.Key; var name = obj.Key;
if (obj.Value is IdentifiedCustomization) if (obj.Value is IdentifiedCustomization)
name = name[14..].Trim(); name = name[14..].Trim();
if (name != "Unknown") if (name is not "Unknown")
return new ResourceNode.UiData(name, obj.Value.GetIcon().ToFlag()); return new ResourceNode.UiData(name, obj.Value.GetIcon().ToFlag());
} }
return new ResourceNode.UiData(null, ChangedItemIconFlag.Unknown); return new ResourceNode.UiData(null, ChangedItemIconFlag.Unknown);
} }
private static string? SafeGet(ReadOnlySpan<string> array, Index index)
{
var i = index.GetOffset(array.Length);
return i >= 0 && i < array.Length ? array[i] : null;
}
private static ulong GetResourceHandleLength(ResourceHandle* handle) private static ulong GetResourceHandleLength(ResourceHandle* handle)
{ => handle is null ? 0ul : handle->GetLength();
if (handle == null)
return 0;
return handle->GetLength();
}
} }