mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-22 01:11:42 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -35,7 +35,7 @@ using namespace halsimgui;
|
||||
|
||||
namespace gui = wpi::gui;
|
||||
|
||||
static std::unique_ptr<glass::PlotProvider> gPlotProvider;
|
||||
static std::unique_ptr<wpi::glass::PlotProvider> gPlotProvider;
|
||||
|
||||
extern "C" {
|
||||
#if defined(WIN32) || defined(_WIN32)
|
||||
@@ -45,9 +45,9 @@ int HALSIM_InitExtension(void) {
|
||||
std::puts("Simulator GUI Initializing.");
|
||||
|
||||
gui::CreateContext();
|
||||
glass::CreateContext();
|
||||
wpi::glass::CreateContext();
|
||||
|
||||
glass::SetStorageName("simgui");
|
||||
wpi::glass::SetStorageName("simgui");
|
||||
|
||||
gui::AddInit([] { ImGui::GetIO().ConfigDockingWithShift = true; });
|
||||
|
||||
@@ -66,12 +66,12 @@ int HALSIM_InitExtension(void) {
|
||||
reinterpret_cast<void*>((GetGuiContextFn)&gui::GetCurrentContext));
|
||||
HAL_RegisterExtension(
|
||||
HALSIMGUI_EXT_GETGLASSCONTEXT,
|
||||
reinterpret_cast<void*>((GetGlassContextFn)&glass::GetCurrentContext));
|
||||
reinterpret_cast<void*>((GetGlassContextFn)&wpi::glass::GetCurrentContext));
|
||||
|
||||
HALSimGui::GlobalInit();
|
||||
DriverStationGui::GlobalInit();
|
||||
gPlotProvider = std::make_unique<glass::PlotProvider>(
|
||||
glass::GetStorageRoot().GetChild("Plot"));
|
||||
gPlotProvider = std::make_unique<wpi::glass::PlotProvider>(
|
||||
wpi::glass::GetStorageRoot().GetChild("Plot"));
|
||||
gPlotProvider->GlobalInit();
|
||||
|
||||
// These need to initialize first
|
||||
@@ -95,28 +95,28 @@ int HALSIM_InitExtension(void) {
|
||||
return PCMSimGui::PCMsAnyInitialized() || PHSimGui::PHsAnyInitialized();
|
||||
},
|
||||
[] {
|
||||
return std::make_unique<glass::AllPneumaticControlsModel>(
|
||||
return std::make_unique<wpi::glass::AllPneumaticControlsModel>(
|
||||
PCMSimGui::GetPCMsModel(), PHSimGui::GetPHsModel());
|
||||
});
|
||||
|
||||
HALSimGui::halProvider->RegisterView(
|
||||
"Solenoids", "AllPneumaticControls",
|
||||
[](glass::Model* model) {
|
||||
[](wpi::glass::Model* model) {
|
||||
auto pneumaticModel =
|
||||
static_cast<glass::AllPneumaticControlsModel*>(model);
|
||||
static_cast<wpi::glass::AllPneumaticControlsModel*>(model);
|
||||
return PCMSimGui::PCMsAnySolenoids(pneumaticModel->pcms.get()) ||
|
||||
PHSimGui::PHsAnySolenoids(pneumaticModel->phs.get());
|
||||
},
|
||||
[](glass::Window* win, glass::Model* model) {
|
||||
[](wpi::glass::Window* win, wpi::glass::Model* model) {
|
||||
win->SetFlags(ImGuiWindowFlags_AlwaysAutoResize);
|
||||
win->SetDefaultPos(290, 20);
|
||||
return glass::MakeFunctionView([=] {
|
||||
return wpi::glass::MakeFunctionView([=] {
|
||||
auto pneumaticModel =
|
||||
static_cast<glass::AllPneumaticControlsModel*>(model);
|
||||
glass::DisplayPneumaticControlsSolenoids(
|
||||
static_cast<wpi::glass::AllPneumaticControlsModel*>(model);
|
||||
wpi::glass::DisplayPneumaticControlsSolenoids(
|
||||
pneumaticModel->pcms.get(),
|
||||
HALSimGui::halProvider->AreOutputsEnabled());
|
||||
glass::DisplayPneumaticControlsSolenoids(
|
||||
wpi::glass::DisplayPneumaticControlsSolenoids(
|
||||
pneumaticModel->phs.get(),
|
||||
HALSimGui::halProvider->AreOutputsEnabled());
|
||||
});
|
||||
@@ -169,7 +169,7 @@ int HALSIM_InitExtension(void) {
|
||||
nullptr,
|
||||
[](void*) {
|
||||
gui::Main();
|
||||
glass::DestroyContext();
|
||||
wpi::glass::DestroyContext();
|
||||
gui::DestroyContext();
|
||||
},
|
||||
[](void*) { gui::Exit(); });
|
||||
|
||||
Reference in New Issue
Block a user