Skip to content

Commit a368202

Browse files
committed
Switch emulating eyebrows to separate threshold param
1 parent bc5f6a1 commit a368202

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

ExpressionStrategies/V1Mapper.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,17 @@ private void EmulateEyeBrows(ref UnifiedExpressionShape[] eyeShapes)
101101
UnifiedExpressions.BrowLowererRight,
102102
UnifiedExpressions.BrowOuterUpRight,
103103
baseRightEyeOpenness,
104-
_config.WidenThreshold,
105-
_config.SqueezeThreshold
104+
_config.EyebrowThresholdRising,
105+
_config.EyebrowThresholdLowering
106106
);
107107

108108
_emulateEyeBrow(
109109
ref eyeShapes,
110110
UnifiedExpressions.BrowLowererLeft,
111111
UnifiedExpressions.BrowOuterUpLeft,
112112
baseLeftEyeOpenness,
113-
_config.WidenThreshold,
114-
_config.SqueezeThreshold
113+
_config.EyebrowThresholdRising,
114+
_config.EyebrowThresholdLowering
115115
);
116116
}
117117
}

ExpressionStrategies/V2Mapper.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,17 @@ private void EmulateEyebrows(ref UnifiedExpressionShape[] eyeShapes, bool isSing
119119
UnifiedExpressions.BrowLowererRight,
120120
UnifiedExpressions.BrowOuterUpRight,
121121
eyeOpenness,
122-
_config.WidenThreshold,
123-
_config.SqueezeThreshold
122+
_config.EyebrowThresholdRising,
123+
_config.EyebrowThresholdLowering
124124
);
125125

126126
_emulateEyeBrow(
127127
ref eyeShapes,
128128
UnifiedExpressions.BrowLowererLeft,
129129
UnifiedExpressions.BrowOuterUpLeft,
130130
eyeOpenness,
131-
_config.WidenThreshold,
132-
_config.SqueezeThreshold
131+
_config.EyebrowThresholdRising,
132+
_config.EyebrowThresholdLowering
133133
);
134134

135135
return;
@@ -143,17 +143,17 @@ private void EmulateEyebrows(ref UnifiedExpressionShape[] eyeShapes, bool isSing
143143
UnifiedExpressions.BrowLowererRight,
144144
UnifiedExpressions.BrowOuterUpRight,
145145
baseRightEyeOpenness,
146-
_config.WidenThreshold,
147-
_config.SqueezeThreshold
146+
_config.EyebrowThresholdRising,
147+
_config.EyebrowThresholdLowering
148148
);
149149

150150
_emulateEyeBrow(
151151
ref eyeShapes,
152152
UnifiedExpressions.BrowLowererLeft,
153153
UnifiedExpressions.BrowOuterUpLeft,
154154
baseLeftEyeOpenness,
155-
_config.WidenThreshold,
156-
_config.SqueezeThreshold
155+
_config.EyebrowThresholdRising,
156+
_config.EyebrowThresholdLowering
157157
);
158158
}
159159
}

ModuleConfig.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public struct Config
1313
[JsonInclude] public bool ShouldEmulateEyebrows;
1414
[JsonInclude] public float SqueezeThreshold;
1515
[JsonInclude] public float WidenThreshold;
16-
[JsonInclude] public float EyebrowThreshold;
16+
[JsonInclude] public float EyebrowThresholdRising;
17+
[JsonInclude] public float EyebrowThresholdLowering;
1718

1819
public static Config Default
1920
{
@@ -25,7 +26,8 @@ public static Config Default
2526
ShouldEmulateEyebrows = true,
2627
SqueezeThreshold = 0.05f,
2728
WidenThreshold = 0.95f,
28-
EyebrowThreshold = 0.9f,
29+
EyebrowThresholdRising = 0.9f,
30+
EyebrowThresholdLowering = 0.05f,
2931
};
3032
}
3133
}

0 commit comments

Comments
 (0)