ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-02-21 06:57:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename Sclera to Limbal

Browse source
This commit is contained in:
Ottermandias 2024-07-16 23:42:39 +02:00
parent 51c7fc83dd
commit 25491adbe3
4 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Glamourer/GameData/CustomizeParameterData.cs
View file

@ -12,9 +12,9 @@ public struct CustomizeParameterData
public Vector3 HairSpecular; public Vector3 HairSpecular;
public Vector3 HairHighlight; public Vector3 HairHighlight;
public Vector3 LeftEye; public Vector3 LeftEye;
public float LeftScleraIntensity; public float LeftLimbalIntensity;
public Vector3 RightEye; public Vector3 RightEye;
public float RightScleraIntensity; public float RightLimbalIntensity;
public Vector3 FeatureColor; public Vector3 FeatureColor;
public float FacePaintUvMultiplier; public float FacePaintUvMultiplier;
public float FacePaintUvOffset; public float FacePaintUvOffset;
@ -35,9 +35,9 @@ public struct CustomizeParameterData
CustomizeParameterFlag.HairSpecular => new CustomizeParameterValue(HairSpecular), CustomizeParameterFlag.HairSpecular => new CustomizeParameterValue(HairSpecular),
CustomizeParameterFlag.HairHighlight => new CustomizeParameterValue(HairHighlight), CustomizeParameterFlag.HairHighlight => new CustomizeParameterValue(HairHighlight),
CustomizeParameterFlag.LeftEye => new CustomizeParameterValue(LeftEye), CustomizeParameterFlag.LeftEye => new CustomizeParameterValue(LeftEye),
CustomizeParameterFlag.LeftScleraIntensity => new CustomizeParameterValue(LeftScleraIntensity), CustomizeParameterFlag.LeftLimbalIntensity => new CustomizeParameterValue(LeftLimbalIntensity),
CustomizeParameterFlag.RightEye => new CustomizeParameterValue(RightEye), CustomizeParameterFlag.RightEye => new CustomizeParameterValue(RightEye),
CustomizeParameterFlag.RightScleraIntensity => new CustomizeParameterValue(RightScleraIntensity), CustomizeParameterFlag.RightLimbalIntensity => new CustomizeParameterValue(RightLimbalIntensity),
CustomizeParameterFlag.FeatureColor => new CustomizeParameterValue(FeatureColor), CustomizeParameterFlag.FeatureColor => new CustomizeParameterValue(FeatureColor),
CustomizeParameterFlag.DecalColor => new CustomizeParameterValue(DecalColor), CustomizeParameterFlag.DecalColor => new CustomizeParameterValue(DecalColor),
CustomizeParameterFlag.FacePaintUvMultiplier => new CustomizeParameterValue(FacePaintUvMultiplier), CustomizeParameterFlag.FacePaintUvMultiplier => new CustomizeParameterValue(FacePaintUvMultiplier),
@ -61,9 +61,9 @@ public struct CustomizeParameterData
CustomizeParameterFlag.HairSpecular => SetIfDifferent(ref HairSpecular, value.InternalTriple), CustomizeParameterFlag.HairSpecular => SetIfDifferent(ref HairSpecular, value.InternalTriple),
CustomizeParameterFlag.HairHighlight => SetIfDifferent(ref HairHighlight, value.InternalTriple), CustomizeParameterFlag.HairHighlight => SetIfDifferent(ref HairHighlight, value.InternalTriple),
CustomizeParameterFlag.LeftEye => SetIfDifferent(ref LeftEye, value.InternalTriple), CustomizeParameterFlag.LeftEye => SetIfDifferent(ref LeftEye, value.InternalTriple),
CustomizeParameterFlag.LeftScleraIntensity => SetIfDifferent(ref LeftScleraIntensity, value.Single), CustomizeParameterFlag.LeftLimbalIntensity => SetIfDifferent(ref LeftLimbalIntensity, value.Single),
CustomizeParameterFlag.RightEye => SetIfDifferent(ref RightEye, value.InternalTriple), CustomizeParameterFlag.RightEye => SetIfDifferent(ref RightEye, value.InternalTriple),
CustomizeParameterFlag.RightScleraIntensity => SetIfDifferent(ref RightScleraIntensity, value.Single), CustomizeParameterFlag.RightLimbalIntensity => SetIfDifferent(ref RightLimbalIntensity, value.Single),
CustomizeParameterFlag.FeatureColor => SetIfDifferent(ref FeatureColor, value.InternalTriple), CustomizeParameterFlag.FeatureColor => SetIfDifferent(ref FeatureColor, value.InternalTriple),
CustomizeParameterFlag.DecalColor => SetIfDifferent(ref DecalColor, value.InternalQuadruple), CustomizeParameterFlag.DecalColor => SetIfDifferent(ref DecalColor, value.InternalQuadruple),
CustomizeParameterFlag.FacePaintUvMultiplier => SetIfDifferent(ref FacePaintUvMultiplier, value.Single), CustomizeParameterFlag.FacePaintUvMultiplier => SetIfDifferent(ref FacePaintUvMultiplier, value.Single),
@ -83,20 +83,20 @@ public struct CustomizeParameterData
_ => new CustomizeParameterValue(SkinDiffuse, MuscleTone).XivQuadruple, _ => new CustomizeParameterValue(SkinDiffuse, MuscleTone).XivQuadruple,
}; };
parameters.LeftColor = (flags & (CustomizeParameterFlag.LeftEye | CustomizeParameterFlag.LeftScleraIntensity)) switch parameters.LeftColor = (flags & (CustomizeParameterFlag.LeftEye | CustomizeParameterFlag.LeftLimbalIntensity)) switch
{ {
0 => parameters.LeftColor, 0 => parameters.LeftColor,
CustomizeParameterFlag.LeftEye => new CustomizeParameterValue(LeftEye, parameters.LeftColor.W).XivQuadruple, CustomizeParameterFlag.LeftEye => new CustomizeParameterValue(LeftEye, parameters.LeftColor.W).XivQuadruple,
CustomizeParameterFlag.LeftScleraIntensity => parameters.LeftColor with { W = LeftScleraIntensity }, CustomizeParameterFlag.LeftLimbalIntensity => parameters.LeftColor with { W = LeftLimbalIntensity },
_ => new CustomizeParameterValue(LeftEye, LeftScleraIntensity).XivQuadruple, _ => new CustomizeParameterValue(LeftEye, LeftLimbalIntensity).XivQuadruple,
}; };
parameters.RightColor = (flags & (CustomizeParameterFlag.RightEye | CustomizeParameterFlag.RightScleraIntensity)) switch parameters.RightColor = (flags & (CustomizeParameterFlag.RightEye | CustomizeParameterFlag.RightLimbalIntensity)) switch
{ {
0 => parameters.RightColor, 0 => parameters.RightColor,
CustomizeParameterFlag.RightEye => new CustomizeParameterValue(RightEye, parameters.RightColor.W).XivQuadruple, CustomizeParameterFlag.RightEye => new CustomizeParameterValue(RightEye, parameters.RightColor.W).XivQuadruple,
CustomizeParameterFlag.RightScleraIntensity => parameters.RightColor with { W = RightScleraIntensity }, CustomizeParameterFlag.RightLimbalIntensity => parameters.RightColor with { W = RightLimbalIntensity },
_ => new CustomizeParameterValue(RightEye, RightScleraIntensity).XivQuadruple, _ => new CustomizeParameterValue(RightEye, RightLimbalIntensity).XivQuadruple,
}; };
if (flags.HasFlag(CustomizeParameterFlag.SkinSpecular)) if (flags.HasFlag(CustomizeParameterFlag.SkinSpecular))
@ -165,11 +165,11 @@ public struct CustomizeParameterData
case CustomizeParameterFlag.FacePaintUvOffset: case CustomizeParameterFlag.FacePaintUvOffset:
GetUvOffsetWrite(ref parameters) = FacePaintUvOffset; GetUvOffsetWrite(ref parameters) = FacePaintUvOffset;
break; break;
case CustomizeParameterFlag.LeftScleraIntensity: case CustomizeParameterFlag.LeftLimbalIntensity:
parameters.LeftColor.W = LeftScleraIntensity; parameters.LeftColor.W = LeftLimbalIntensity;
break; break;
case CustomizeParameterFlag.RightScleraIntensity: case CustomizeParameterFlag.RightLimbalIntensity:
parameters.RightColor.W = RightScleraIntensity; parameters.RightColor.W = RightLimbalIntensity;
break; break;
} }
} }
@ -187,9 +187,9 @@ public struct CustomizeParameterData
HairSpecular = new CustomizeParameterValue(parameter.HairFresnelValue0).InternalTriple, HairSpecular = new CustomizeParameterValue(parameter.HairFresnelValue0).InternalTriple,
HairHighlight = new CustomizeParameterValue(parameter.MeshColor).InternalTriple, HairHighlight = new CustomizeParameterValue(parameter.MeshColor).InternalTriple,
LeftEye = new CustomizeParameterValue(parameter.LeftColor).InternalTriple, LeftEye = new CustomizeParameterValue(parameter.LeftColor).InternalTriple,
LeftScleraIntensity = new CustomizeParameterValue(parameter.LeftColor.W).Single, LeftLimbalIntensity = new CustomizeParameterValue(parameter.LeftColor.W).Single,
RightEye = new CustomizeParameterValue(parameter.RightColor).InternalTriple, RightEye = new CustomizeParameterValue(parameter.RightColor).InternalTriple,
RightScleraIntensity = new CustomizeParameterValue(parameter.RightColor.W).Single, RightLimbalIntensity = new CustomizeParameterValue(parameter.RightColor.W).Single,
FeatureColor = new CustomizeParameterValue(parameter.OptionColor).InternalTriple, FeatureColor = new CustomizeParameterValue(parameter.OptionColor).InternalTriple,
DecalColor = FromParameter(decal), DecalColor = FromParameter(decal),
}; };

12
Glamourer/GameData/CustomizeParameterFlag.cs
View file

@ -16,8 +16,8 @@ public enum CustomizeParameterFlag : ushort
FacePaintUvMultiplier = 0x0400, FacePaintUvMultiplier = 0x0400,
FacePaintUvOffset = 0x0800, FacePaintUvOffset = 0x0800,
DecalColor = 0x1000, DecalColor = 0x1000,
LeftScleraIntensity = 0x2000, LeftLimbalIntensity = 0x2000,
RightScleraIntensity = 0x4000, RightLimbalIntensity = 0x4000,
} }
public static class CustomizeParameterExtensions public static class CustomizeParameterExtensions
@ -31,8 +31,8 @@ public static class CustomizeParameterExtensions
public const CustomizeParameterFlag RgbaQuadruples = CustomizeParameterFlag.DecalColor | CustomizeParameterFlag.LipDiffuse; public const CustomizeParameterFlag RgbaQuadruples = CustomizeParameterFlag.DecalColor | CustomizeParameterFlag.LipDiffuse;
public const CustomizeParameterFlag Percentages = CustomizeParameterFlag.MuscleTone public const CustomizeParameterFlag Percentages = CustomizeParameterFlag.MuscleTone
| CustomizeParameterFlag.LeftScleraIntensity | CustomizeParameterFlag.LeftLimbalIntensity
| CustomizeParameterFlag.RightScleraIntensity; | CustomizeParameterFlag.RightLimbalIntensity;
public const CustomizeParameterFlag Values = CustomizeParameterFlag.FacePaintUvOffset | CustomizeParameterFlag.FacePaintUvMultiplier; public const CustomizeParameterFlag Values = CustomizeParameterFlag.FacePaintUvOffset | CustomizeParameterFlag.FacePaintUvMultiplier;
@ -67,8 +67,8 @@ public static class CustomizeParameterExtensions
CustomizeParameterFlag.FacePaintUvMultiplier => "Multiplier for Face Paint", CustomizeParameterFlag.FacePaintUvMultiplier => "Multiplier for Face Paint",
CustomizeParameterFlag.FacePaintUvOffset => "Offset of Face Paint", CustomizeParameterFlag.FacePaintUvOffset => "Offset of Face Paint",
CustomizeParameterFlag.DecalColor => "Face Paint Color", CustomizeParameterFlag.DecalColor => "Face Paint Color",
CustomizeParameterFlag.LeftScleraIntensity => "Left Sclera Intensity", CustomizeParameterFlag.LeftLimbalIntensity => "Left Limbal Ring Intensity",
CustomizeParameterFlag.RightScleraIntensity => "Right Sclera Intensity", CustomizeParameterFlag.RightLimbalIntensity => "Right Limbal Ring Intensity",
_ => string.Empty, _ => string.Empty,
}; };
} }

4
Glamourer/Gui/Tabs/DebugTab/AdvancedCustomizationDrawer.cs
View file

@ -117,11 +117,11 @@ public unsafe class AdvancedCustomizationDrawer(ObjectManager objects) : IGameDa
24 => "LeftEye.R"u8, 24 => "LeftEye.R"u8,
25 => "LeftEye.G"u8, 25 => "LeftEye.G"u8,
26 => "LeftEye.B"u8, 26 => "LeftEye.B"u8,
27 => "LeftSclera"u8, 27 => "LeftLimbal"u8,
28 => "RightEye.R"u8, 28 => "RightEye.R"u8,
29 => "RightEye.G"u8, 29 => "RightEye.G"u8,
30 => "RightEye.B"u8, 30 => "RightEye.B"u8,
31 => "RightSclera"u8, 31 => "RightLimbal"u8,
32 => "Feature.R"u8, 32 => "Feature.R"u8,
33 => "Feature.G"u8, 33 => "Feature.G"u8,
34 => "Feature.B"u8, 34 => "Feature.B"u8,

16
Glamourer/State/StateIndex.cs
View file

@ -110,9 +110,9 @@ public readonly record struct StateIndex(int Value) : IEqualityOperators<StateIn
CustomizeParameterFlag.HairSpecular => new StateIndex(ParamHairSpecular), CustomizeParameterFlag.HairSpecular => new StateIndex(ParamHairSpecular),
CustomizeParameterFlag.HairHighlight => new StateIndex(ParamHairHighlight), CustomizeParameterFlag.HairHighlight => new StateIndex(ParamHairHighlight),
CustomizeParameterFlag.LeftEye => new StateIndex(ParamLeftEye), CustomizeParameterFlag.LeftEye => new StateIndex(ParamLeftEye),
CustomizeParameterFlag.LeftScleraIntensity => new StateIndex(ParamLeftScleraIntensity), CustomizeParameterFlag.LeftLimbalIntensity => new StateIndex(ParamLeftLimbalIntensity),
CustomizeParameterFlag.RightEye => new StateIndex(ParamRightEye), CustomizeParameterFlag.RightEye => new StateIndex(ParamRightEye),
CustomizeParameterFlag.RightScleraIntensity => new StateIndex(ParamRightScleraIntensity), CustomizeParameterFlag.RightLimbalIntensity => new StateIndex(ParamRightLimbalIntensity),
CustomizeParameterFlag.FeatureColor => new StateIndex(ParamFeatureColor), CustomizeParameterFlag.FeatureColor => new StateIndex(ParamFeatureColor),
CustomizeParameterFlag.FacePaintUvMultiplier => new StateIndex(ParamFacePaintUvMultiplier), CustomizeParameterFlag.FacePaintUvMultiplier => new StateIndex(ParamFacePaintUvMultiplier),
CustomizeParameterFlag.FacePaintUvOffset => new StateIndex(ParamFacePaintUvOffset), CustomizeParameterFlag.FacePaintUvOffset => new StateIndex(ParamFacePaintUvOffset),
@ -201,10 +201,10 @@ public readonly record struct StateIndex(int Value) : IEqualityOperators<StateIn
public const int ParamHairSpecular = ParamHairDiffuse + 1; public const int ParamHairSpecular = ParamHairDiffuse + 1;
public const int ParamHairHighlight = ParamHairSpecular + 1; public const int ParamHairHighlight = ParamHairSpecular + 1;
public const int ParamLeftEye = ParamHairHighlight + 1; public const int ParamLeftEye = ParamHairHighlight + 1;
public const int ParamLeftScleraIntensity = ParamLeftEye + 1; public const int ParamLeftLimbalIntensity = ParamLeftEye + 1;
public const int ParamRightEye = ParamLeftScleraIntensity + 1; public const int ParamRightEye = ParamLeftLimbalIntensity + 1;
public const int ParamRightScleraIntensity = ParamRightEye + 1; public const int ParamRightLimbalIntensity = ParamRightEye + 1;
public const int ParamFeatureColor = ParamRightScleraIntensity + 1; public const int ParamFeatureColor = ParamRightLimbalIntensity + 1;
public const int ParamFacePaintUvMultiplier = ParamFeatureColor + 1; public const int ParamFacePaintUvMultiplier = ParamFeatureColor + 1;
public const int ParamFacePaintUvOffset = ParamFacePaintUvMultiplier + 1; public const int ParamFacePaintUvOffset = ParamFacePaintUvMultiplier + 1;
public const int ParamDecalColor = ParamFacePaintUvOffset + 1; public const int ParamDecalColor = ParamFacePaintUvOffset + 1;
@ -313,9 +313,9 @@ public readonly record struct StateIndex(int Value) : IEqualityOperators<StateIn
ParamHairSpecular => CustomizeParameterFlag.HairSpecular, ParamHairSpecular => CustomizeParameterFlag.HairSpecular,
ParamHairHighlight => CustomizeParameterFlag.HairHighlight, ParamHairHighlight => CustomizeParameterFlag.HairHighlight,
ParamLeftEye => CustomizeParameterFlag.LeftEye, ParamLeftEye => CustomizeParameterFlag.LeftEye,
ParamLeftScleraIntensity => CustomizeParameterFlag.LeftScleraIntensity, ParamLeftLimbalIntensity => CustomizeParameterFlag.LeftLimbalIntensity,
ParamRightEye => CustomizeParameterFlag.RightEye, ParamRightEye => CustomizeParameterFlag.RightEye,
ParamRightScleraIntensity => CustomizeParameterFlag.RightScleraIntensity, ParamRightLimbalIntensity => CustomizeParameterFlag.RightLimbalIntensity,
ParamFeatureColor => CustomizeParameterFlag.FeatureColor, ParamFeatureColor => CustomizeParameterFlag.FeatureColor,
ParamFacePaintUvMultiplier => CustomizeParameterFlag.FacePaintUvMultiplier, ParamFacePaintUvMultiplier => CustomizeParameterFlag.FacePaintUvMultiplier,
ParamFacePaintUvOffset => CustomizeParameterFlag.FacePaintUvOffset, ParamFacePaintUvOffset => CustomizeParameterFlag.FacePaintUvOffset,