muskit/spice2x.github.io
0
0
Fork 0
mirror of https://github.com/spice2x/spice2x.github.io.git synced 2026-08-02 06:40:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

overlay: refactor code for lights (#539)

Browse Source 
No functional change.
This commit is contained in:
bicarus
2026-01-29 16:13:56 -08:00
committed by GitHub
parent 4feca23240
commit 7a6cadb176
2 changed files with 100 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spice2x/overlay/windows/config.cpp
+98 -92
View File
@@ -2183,98 +2183,7 @@ namespace overlay::windows {
// check lights
if (lights) {
for (auto &light_in : *lights) {
// get light based on page
auto light = &light_in;
auto &light_alternatives = light->getAlternatives();
if (this->lights_page > 0) {
while ((int) light_alternatives.size() < this->lights_page) {
light_alternatives.emplace_back(light->getName());
}
light = &light_alternatives.at(this->lights_page - 1);
}
// get light info
auto light_name = light->getName();
auto light_display = light->getDisplayString(RI_MGR.get());
auto light_state = GameAPI::Lights::readLight(RI_MGR, *light);
// list entry
ImGui::PushID(light);
ImGui::TableNextRow();
// progress bar & light name
ImGui::TableNextColumn();
ImGui::ProgressBar(light_state, ImVec2(32.f, 0));
ImGui::SameLine();
ImGui::TextUnformatted(light_name.c_str());
// binding name
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
if (light_display.size() > 0) {
std::string light_text = ImGui::TruncateText(
light_display, ImGui::GetContentRegionAvail().x - overlay::apply_scaling(20));
ImGui::TextUnformatted(light_text.c_str());
if (ImGui::IsItemHovered()) {
ImGui::SameLine();
ImGui::HelpTooltip(light_display.c_str());
}
} else {
ImGui::TextDisabled("-");
}
// clear light
if (light_display.size() > 0) {
ImGui::SameLine();
if (ImGui::DeleteButton("Remove")) {
light->setDeviceIdentifier("");
light->setIndex(0xFF);
::Config::getInstance().updateBinding(
games_list[games_selected], *light,
lights_page - 1);
}
}
// bind button
ImGui::TableNextColumn();
// light binding
if (ImGui::Button("Set")) {
ImGui::OpenPopup("Light Binding");
light->override_enabled = true;
// get devices
this->lights_devices.clear();
for (auto &device : RI_MGR->devices_get()) {
switch (device.type) {
case rawinput::HID:
if (!device.hidInfo->button_output_caps_list.empty()
|| !device.hidInfo->value_output_caps_list.empty())
this->lights_devices.emplace_back(&device);
break;
case rawinput::SEXTET_OUTPUT:
case rawinput::PIUIO_DEVICE:
case rawinput::SMX_STAGE:
case rawinput::SMX_DEDICAB:
this->lights_devices.emplace_back(&device);
break;
default:
continue;
}
// check if this is the current device
if (device.name == light->getDeviceIdentifier()) {
this->lights_devices_selected = (int) this->lights_devices.size() - 1;
this->lights_devices_control_selected = light->getIndex();
}
}
}
edit_light_popup(light);
// clean up
ImGui::PopID();
build_light(&light_in);
}
}
@@ -2282,6 +2191,103 @@ namespace overlay::windows {
}
}
void Config::build_light(Light *light) {
// get light based on page
auto &light_alternatives = light->getAlternatives();
if (this->lights_page > 0) {
while ((int) light_alternatives.size() < this->lights_page) {
light_alternatives.emplace_back(light->getName());
}
light = &light_alternatives.at(this->lights_page - 1);
}
// get light info
auto light_name = light->getName();
auto light_display = light->getDisplayString(RI_MGR.get());
auto light_state = GameAPI::Lights::readLight(RI_MGR, *light);
// list entry
ImGui::PushID(light);
ImGui::TableNextRow();
// progress bar & light name
ImGui::TableNextColumn();
ImGui::ProgressBar(light_state, ImVec2(32.f, 0));
ImGui::SameLine();
ImGui::TextUnformatted(light_name.c_str());
// binding name
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
if (light_display.size() > 0) {
std::string light_text = ImGui::TruncateText(
light_display, ImGui::GetContentRegionAvail().x - overlay::apply_scaling(20));
ImGui::TextUnformatted(light_text.c_str());
if (ImGui::IsItemHovered()) {
ImGui::SameLine();
ImGui::HelpTooltip(light_display.c_str());
}
} else {
ImGui::TextDisabled("-");
}
// clear light
if (light_display.size() > 0) {
ImGui::SameLine();
if (ImGui::DeleteButton("Remove")) {
clear_light(light);
}
}
// bind button
ImGui::TableNextColumn();
// light binding
if (ImGui::Button("Set")) {
ImGui::OpenPopup("Light Binding");
light->override_enabled = true;
// get devices
this->lights_devices.clear();
for (auto &device : RI_MGR->devices_get()) {
switch (device.type) {
case rawinput::HID:
if (!device.hidInfo->button_output_caps_list.empty()
|| !device.hidInfo->value_output_caps_list.empty())
this->lights_devices.emplace_back(&device);
break;
case rawinput::SEXTET_OUTPUT:
case rawinput::PIUIO_DEVICE:
case rawinput::SMX_STAGE:
case rawinput::SMX_DEDICAB:
this->lights_devices.emplace_back(&device);
break;
default:
continue;
}
// check if this is the current device
if (device.name == light->getDeviceIdentifier()) {
this->lights_devices_selected = (int) this->lights_devices.size() - 1;
this->lights_devices_control_selected = light->getIndex();
}
}
}
edit_light_popup(light);
// clean up
ImGui::PopID();
}
void Config::clear_light(Light *light) {
light->setDeviceIdentifier("");
light->setIndex(0xFF);
::Config::getInstance().updateBinding(
games_list[games_selected], *light,
lights_page - 1);
}
void Config::edit_light_popup(Light *light) {
if (ImGui::BeginPopupModal("Light Binding", NULL, ImGuiWindowFlags_AlwaysAutoResize)) {
src/spice2x/overlay/windows/config.h
+2
View File
@@ -94,6 +94,8 @@ namespace overlay::windows {
void edit_analog_popup(Analog &analog);
void build_lights(const std::string &name, std::vector<Light> *lights);
void build_light(Light *light);
void clear_light(Light *light);
void edit_light_popup(Light *light);
void build_cards();