Skip to content

Commit 26397cb

Browse files
committed
Fix stale config bug
1 parent 7126a3a commit 26397cb

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

ExpressionStrategies/V1Mapper.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public class V1Mapper : ImappingStategy
1818
};
1919

2020
private ILogger _logger;
21-
public Config _config;
22-
23-
public V1Mapper(ILogger logger, Config config)
21+
private readonly Config _config;
22+
23+
public V1Mapper(ILogger logger, ref Config config)
2424
{
2525
_logger = logger;
2626
_config = config;
@@ -54,7 +54,7 @@ private void HandleEyeOpenness(ref UnifiedEyeData eyeData, ref UnifiedExpression
5454

5555
_handleSingleEyeOpenness(ref eyeData.Right, ref eyeShapes, UnifiedExpressions.EyeWideRight,
5656
UnifiedExpressions.EyeSquintRight, baseRightEyeOpenness, _config.WidenThreshold, _config.SqueezeThreshold);
57-
57+
5858
_handleSingleEyeOpenness(ref eyeData.Left, ref eyeShapes, UnifiedExpressions.EyeWideLeft,
5959
UnifiedExpressions.EyeSquintLeft, baseLeftEyeOpenness, _config.WidenThreshold, _config.SqueezeThreshold);
6060
}

ExpressionsMapper.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@ namespace ETVRTrackingModule
66
public class ExpressionsMapper
77
{
88
private ImappingStategy _mappingStrategy;
9-
private ETVRConfigManager _config;
10-
9+
private Config _config;
1110
ILogger _logger;
12-
public ExpressionsMapper(ILogger logger, ref ETVRConfigManager config)
11+
public ExpressionsMapper(ILogger logger, ref ETVRConfigManager configManager)
1312
{
1413
_logger = logger;
15-
_config = config;
16-
_mappingStrategy = new V2Mapper(_logger);
14+
_config = configManager.Config;
15+
_mappingStrategy = new V2Mapper(_logger, ref _config);
1716
}
1817
public void MapMessage(OSCMessage msg)
1918
{
2019
if (!msg.success)
2120
return;
2221

23-
var nextStrategy = IsV2Param(msg) ? (ImappingStategy) new V2Mapper(_logger) : new V1Mapper(_logger, _config.Config);
22+
var nextStrategy = IsV2Param(msg) ? (ImappingStategy) new V2Mapper(_logger, ref _config) : new V1Mapper(_logger, ref _config);
2423

2524
if (_mappingStrategy.GetType() != nextStrategy.GetType())
2625
{

0 commit comments

Comments
 (0)