ps
/
Lumenarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Override all hue phrases

This commit is contained in:
PS 2021-04-09 16:15:25 -10:00
parent 6f1d247bc8
commit 9404a6b57d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/ss_blumen_lumen/blumen_lumen.cpp
View File

@ -457,7 +457,8 @@ BlumenLumen_ApplyNextHotHue(blumen_lumen_state* BLState, context Context, gs_str
OutputDebugString(DebugStr->Str); OutputDebugString(DebugStr->Str);
if (BLState->PatternMode == BlumenPattern_Standard) if (BLState->PatternMode == BlumenPattern_Standard ||
NewHue.OverrideAll)
{ {
BlumenLumen_SetNextHue(BLState, 0, NewHue); BlumenLumen_SetNextHue(BLState, 0, NewHue);
BlumenLumen_SetNextHue(BLState, 1, NewHue); BlumenLumen_SetNextHue(BLState, 1, NewHue);

11
src/app/ss_blumen_lumen/phrase_hue_map.h
View File

@ -45,6 +45,7 @@ typedef struct phrase_hue_map
r32* Speed; r32* Speed;
u8* Pattern; u8* Pattern;
u8* AddIn; u8* AddIn;
bool* OverrideAll;
} phrase_hue_map; } phrase_hue_map;
typedef struct phrase_hue typedef struct phrase_hue
@ -58,6 +59,7 @@ typedef struct phrase_hue
r32 Speed; r32 Speed;
u8 Pattern; u8 Pattern;
u8 AddIn; u8 AddIn;
bool OverrideAll;
} phrase_hue; } phrase_hue;
internal p_hue internal p_hue
@ -118,9 +120,9 @@ CreateHueFromString(gs_const_string Str)
{ {
p_hue Result = {}; p_hue Result = {};
if (Str.Str[0] == 'b') { if (Str.Str[0] == 'b') {
Result.HSV = v4{0, 0, 1, 1 }; Result.HSV = v4{0, 0, 0, 1 };
} else if (Str.Str[0] == 'w') { } else if (Str.Str[0] == 'w') {
Result.HSV = v4{0, 0, 0, 1 };; Result.HSV = v4{0, 0, 1, 1 };;
} else { } else {
parse_float_result Parsed = ValidateAndParseFloat(Str); parse_float_result Parsed = ValidateAndParseFloat(Str);
if (!Parsed.Success) if (!Parsed.Success)
@ -158,6 +160,7 @@ PhraseHueMap_GenFromCSV(gscsv_sheet Sheet, gs_memory_arena* Arena)
Result.Pattern = PushArray(Arena, u8, Result.CountMax); Result.Pattern = PushArray(Arena, u8, Result.CountMax);
Result.Speed = PushArray(Arena, r32, Result.CountMax); Result.Speed = PushArray(Arena, r32, Result.CountMax);
Result.AddIn = PushArray(Arena, u8, Result.CountMax); Result.AddIn = PushArray(Arena, u8, Result.CountMax);
Result.OverrideAll = PushArray(Arena, bool, Result.CountMax);
// this lets us tightly pack phrase_hues even if there is a // this lets us tightly pack phrase_hues even if there is a
// row in the csv that is empty or invalid // row in the csv that is empty or invalid
@ -177,6 +180,7 @@ PhraseHueMap_GenFromCSV(gscsv_sheet Sheet, gs_memory_arena* Arena)
gs_const_string Speed = CSVSheet_GetCell(Sheet, 6, Row); gs_const_string Speed = CSVSheet_GetCell(Sheet, 6, Row);
gs_const_string Pattern = CSVSheet_GetCell(Sheet, 7, Row); gs_const_string Pattern = CSVSheet_GetCell(Sheet, 7, Row);
gs_const_string AddIn = CSVSheet_GetCell(Sheet, 8, Row); gs_const_string AddIn = CSVSheet_GetCell(Sheet, 8, Row);
gs_const_string OverrideAll = CSVSheet_GetCell(Sheet, 9, Row);
// essential parameters // essential parameters
if (Phrase.Length == 0 || if (Phrase.Length == 0 ||
@ -234,6 +238,8 @@ PhraseHueMap_GenFromCSV(gscsv_sheet Sheet, gs_memory_arena* Arena)
ParsedGranularity.Value = 1; ParsedGranularity.Value = 1;
} }
Result.Gran[Index] = ParsedGranularity.Value; Result.Gran[Index] = ParsedGranularity.Value;
Result.OverrideAll[Index] = StringsEqualUpToLength(OverrideAll, ConstString("yes"), 3);
} }
Result.Count = Result.CountMax + DestOffset; Result.Count = Result.CountMax + DestOffset;
@ -255,6 +261,7 @@ PhraseHueMap_Get(phrase_hue_map Map, u32 Index)
Result.Speed = Map.Speed[Index]; Result.Speed = Map.Speed[Index];
Result.AddIn = Map.AddIn[Index]; Result.AddIn = Map.AddIn[Index];
Result.Pattern = Map.Pattern[Index]; Result.Pattern = Map.Pattern[Index];
Result.OverrideAll = Map.OverrideAll[Index];
return Result; return Result;
} }