Merge branch 'dev' of github.com:peter-slattery/Lumenarium into dev
This commit is contained in:
commit
d1a52c5779
|
@ -85,7 +85,6 @@ PhraseHueMap_GenFromCSV(gscsv_sheet Sheet, gs_memory_arena* Arena)
|
||||||
|
|
||||||
gs_const_string Phrase = CSVSheet_GetCell(Sheet,
|
gs_const_string Phrase = CSVSheet_GetCell(Sheet,
|
||||||
0, Row);
|
0, Row);
|
||||||
u64 PhraseHash = HashDJB2ToU32(StringExpand(Phrase));
|
|
||||||
|
|
||||||
gs_const_string Hue0Str = CSVSheet_GetCell(Sheet, 1, Row);
|
gs_const_string Hue0Str = CSVSheet_GetCell(Sheet, 1, Row);
|
||||||
gs_const_string Hue1Str = CSVSheet_GetCell(Sheet, 2, Row);
|
gs_const_string Hue1Str = CSVSheet_GetCell(Sheet, 2, Row);
|
||||||
|
@ -110,6 +109,8 @@ PhraseHueMap_GenFromCSV(gscsv_sheet Sheet, gs_memory_arena* Arena)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u64 PhraseHash = HashDJB2ToU32(StringExpand(Result.Phrases[Index]));
|
||||||
|
|
||||||
Result.PhraseHashes[Index] = PhraseHash;
|
Result.PhraseHashes[Index] = PhraseHash;
|
||||||
Result.Hue0[Index] = CreateHueFromString(Hue0Str);
|
Result.Hue0[Index] = CreateHueFromString(Hue0Str);
|
||||||
Result.Hue1[Index] = CreateHueFromString(Hue1Str);
|
Result.Hue1[Index] = CreateHueFromString(Hue1Str);
|
||||||
|
|
Loading…
Reference in New Issue