Merge branch 'dev' of github.com:peter-slattery/Lumenarium into dev
This commit is contained in:
commit
3ee4f9f9a5
|
@ -445,7 +445,11 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
|
||||||
u32 NameLen = CStringLength(Mic.AnimationFileName);
|
u32 NameLen = CStringLength(Mic.AnimationFileName);
|
||||||
|
|
||||||
phrase_hue NewHue = PhraseHueMap_Get(BLState->PhraseHueMap, NameHash);
|
phrase_hue NewHue = PhraseHueMap_Get(BLState->PhraseHueMap, NameHash);
|
||||||
if (NewHue.Phrase.Length > 0 && BLState->NextHotHue.Phrase.Length < NewHue.Phrase.Length)
|
if (NewHue.Phrase.Length > 0)
|
||||||
|
{
|
||||||
|
bool IsLonger = (BLState->NextHotHue.Phrase.Length < NewHue.Phrase.Length);
|
||||||
|
bool IsntInPhraseReceptionMode = !BLState->InPhraseReceptionMode;
|
||||||
|
if (IsLonger || IsntInPhraseReceptionMode)
|
||||||
{
|
{
|
||||||
PrintF(&DebugStr, "Queuing: %S\n", NewHue.Phrase);
|
PrintF(&DebugStr, "Queuing: %S\n", NewHue.Phrase);
|
||||||
NullTerminate(&DebugStr);
|
NullTerminate(&DebugStr);
|
||||||
|
@ -460,6 +464,7 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
|
||||||
}
|
}
|
||||||
BLState->TimeLastPhraseReceived = Context->SystemTime_Current;
|
BLState->TimeLastPhraseReceived = Context->SystemTime_Current;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}break;
|
}break;
|
||||||
|
|
||||||
case PacketType_MotorState:
|
case PacketType_MotorState:
|
||||||
|
|
Loading…
Reference in New Issue