Prevented expressions getting stuck when expression detection is disabled or tracking is lost in OpenSeeVRMDriver.

This commit is contained in:
Emiliana 2020-08-15 19:14:38 +02:00
parent 9ce7d39505
commit 8f65c0254e

View file

@ -846,13 +846,13 @@ public class OpenSeeVRMDriver : MonoBehaviour {
toggledExpression.triggered = false; toggledExpression.triggered = false;
if (!overridden && !trigger) { if (!overridden && !trigger) {
if (openSeeExpression.expression == null || openSeeExpression.expression == "" || !expressionMap.ContainsKey(openSeeExpression.expression)) { if (!openSeeExpression.enabled || openSeeExpression.expressionTime + 15f < Time.time || openSeeExpression.expression == null || openSeeExpression.expression == "" || !expressionMap.ContainsKey(openSeeExpression.expression)) {
currentExpression = null; currentExpression = null;
} else { } else {
currentExpression = expressionMap[openSeeExpression.expression]; currentExpression = expressionMap[openSeeExpression.expression];
currentExpression.triggered = true; currentExpression.triggered = true;
} }
} else if (openSeeExpression.expression != null && openSeeExpression.expression != "" && expressionMap.ContainsKey(openSeeExpression.expression)) { } else if (openSeeExpression.enabled && openSeeExpression.expressionTime + 15f > Time.time && openSeeExpression.expression != null && openSeeExpression.expression != "" && expressionMap.ContainsKey(openSeeExpression.expression)) {
if (expressionMap[openSeeExpression.expression].additive) if (expressionMap[openSeeExpression.expression].additive)
expressionMap[openSeeExpression.expression].triggered = true; expressionMap[openSeeExpression.expression].triggered = true;
} }