Merge branch 'dev' of github.com:peter-slattery/Lumenarium into dev
This commit is contained in:
commit
7a67bd8c74
|
@ -137,6 +137,8 @@ AssemblyDebug_Render(panel* Panel, rect2 PanelBounds, render_command_buffer* Ren
|
||||||
}break;
|
}break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
State->SendEmptyPackets = ui_LabeledToggle(Interface, MakeString("Send Empty Packets"), State->SendEmptyPackets);
|
||||||
ui_PopLayout(Interface, MakeString("Assembly Debug Layout"));
|
ui_PopLayout(Interface, MakeString("Assembly Debug Layout"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -166,6 +166,18 @@ UPDATE_AND_RENDER(UpdateAndRender)
|
||||||
|
|
||||||
Assert(State->UserSpaceDesc.UserData.Memory != 0);
|
Assert(State->UserSpaceDesc.UserData.Memory != 0);
|
||||||
BuildAssemblyData(State, *Context, OutputData);
|
BuildAssemblyData(State, *Context, OutputData);
|
||||||
|
|
||||||
|
// NOTE(PS): We introduced this in order to test some things on the
|
||||||
|
// blumen lumen circuit boards, to see if they were getting out
|
||||||
|
// of sync
|
||||||
|
if (State->SendEmptyPackets) {
|
||||||
|
for (addressed_data_buffer* At = OutputData->Root;
|
||||||
|
At != 0;
|
||||||
|
At = At->Next)
|
||||||
|
{
|
||||||
|
ZeroMemoryBlock(At->Memory, At->MemorySize);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CLEANUP_APPLICATION(CleanupApplication)
|
CLEANUP_APPLICATION(CleanupApplication)
|
||||||
|
|
|
@ -77,6 +77,7 @@ struct app_state
|
||||||
bool ShowingUserSpaceDebug;
|
bool ShowingUserSpaceDebug;
|
||||||
|
|
||||||
bool RunEditor;
|
bool RunEditor;
|
||||||
|
bool SendEmptyPackets;
|
||||||
};
|
};
|
||||||
|
|
||||||
internal void OpenColorPicker(app_state* State, v4* Address);
|
internal void OpenColorPicker(app_state* State, v4* Address);
|
||||||
|
|
|
@ -16,7 +16,7 @@ gs_const_string Flower2AssemblyPath = ConstString("data/ss_blumen_three.fold");
|
||||||
|
|
||||||
// The path to the phrase map CSV. Can be an absolute path, or relative
|
// The path to the phrase map CSV. Can be an absolute path, or relative
|
||||||
// to the app_run_tree folder
|
// to the app_run_tree folder
|
||||||
gs_const_string PhraseMapCSVPath = ConstString("C:/projects/flowers-sound/flower_codes.tsv");
|
gs_const_string PhraseMapCSVPath = ConstString("C:/projects/Lumenarium/app_run_tree/data/flower_codes.tsv");
|
||||||
char PhraseMapCSVSeparator = '\t';
|
char PhraseMapCSVSeparator = '\t';
|
||||||
|
|
||||||
// Search Strings for which folders to find ambient animation files and
|
// Search Strings for which folders to find ambient animation files and
|
||||||
|
@ -50,6 +50,9 @@ global r32 MotorResendStatePeriod = 90.0f; // seconds
|
||||||
// The times of day when the leds should be on
|
// The times of day when the leds should be on
|
||||||
// Search for @TimeFormat to find documentation
|
// Search for @TimeFormat to find documentation
|
||||||
global time_range LedOnTimes[] = {
|
global time_range LedOnTimes[] = {
|
||||||
|
{ 14, 43, 14, 44 },
|
||||||
|
{ 14, 45, 14, 46 },
|
||||||
|
|
||||||
{ 17, 00, 23, 59 },
|
{ 17, 00, 23, 59 },
|
||||||
{ 00, 00, 06, 30 },
|
{ 00, 00, 06, 30 },
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue