starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-14 10:24:37 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

GunCon: Add line/tick offset for position fine-tuning

Browse Source 
Fixes calibration in Ghoul Panic and default position in Judge Dredd.
This commit is contained in:
Stenzek
2026-01-17 14:14:07 +10:00
parent 9882ef4251
commit 3a0c4898ef
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/guncon.cpp
View File

@@ -211,10 +211,13 @@ void GunCon::UpdatePosition()
// are we within the active display area?
u32 tick, line;
s32 offset_tick, offset_line;
if ((display_pos < GSVector2::zero()).anytrue() ||
!g_gpu.ConvertDisplayCoordinatesToBeamTicksAndLines(display_pos, m_x_scale, &tick, &line) || m_shoot_offscreen)
!g_gpu.ConvertDisplayCoordinatesToBeamTicksAndLines(display_pos, m_x_scale, &tick, &line) ||
(offset_tick = static_cast<s32>(tick) + m_tick_offset) < 0 ||
(offset_line = static_cast<s32>(line) + m_line_offset) < 0 || m_shoot_offscreen)
{
DEBUG_LOG("Lightgun out of range for window coordinates {:.0f},{:.0f}", window_x, window_y);
DEV_LOG("Lightgun out of range for window coordinates {:.0f},{:.0f}", window_x, window_y);
m_position_x = 0x01;
m_position_y = 0x0A;
return;
@@ -222,9 +225,10 @@ void GunCon::UpdatePosition()
// 8MHz units for X = 44100*768*11/7 = 53222400 / 8000000 = 6.6528
const double divider = static_cast<double>(g_gpu.GetCRTCFrequency()) / 8000000.0;
m_position_x = static_cast<u16>(static_cast<float>(tick) / static_cast<float>(divider));
m_position_y = static_cast<u16>(line);
DEBUG_LOG("Lightgun window coordinates {} -> tick {} line {} 8mhz ticks {}", display_pos, tick, line, m_position_x);
m_position_x = static_cast<u16>(static_cast<float>(offset_tick) / static_cast<float>(divider));
m_position_y = static_cast<u16>(offset_line);
DEV_LOG("Lightgun window coordinates {} -> tick {} line {} 8mhz ticks {}", display_pos, offset_tick, offset_line,
m_position_x);
}
std::pair<float, float> GunCon::GetAbsolutePositionFromRelativeAxes() const
@@ -299,7 +303,14 @@ static const SettingInfo s_settings[] = {
"#ffffff", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::Float, "XScale", TRANSLATE_NOOP("GunCon", "X Scale"),
TRANSLATE_NOOP("GunCon", "Scales X coordinates relative to the center of the screen."), "1.0", "0.01", "2.0", "0.01",
"%.0f%%", nullptr, 100.0f}};
"%.0f%%", nullptr, 100.0f},
{SettingInfo::Type::Integer, "GunConLineOffset", TRANSLATE_NOOP("GunCon", "Line Offset"),
TRANSLATE_NOOP("GunCon", "Offset applied to lightgun vertical position."), "0", "-128", "127", "1", "%u", nullptr,
0.0f},
{SettingInfo::Type::Integer, "GunConTickOffset", TRANSLATE_NOOP("GunCon", "Tick Offset"),
TRANSLATE_NOOP("GunCon", "Offset applied to lightgun horizontal position."), "140", "-1000", "1000", "1", "%u",
nullptr, 0.0f},
};
const Controller::ControllerInfo GunCon::INFO = {
ControllerType::GunCon, "GunCon", TRANSLATE_NOOP("ControllerType", "GunCon"),
@@ -374,4 +385,11 @@ void GunCon::LoadSettings(const SettingsInterface& si, const char* section, bool
}
}
}
// NOTE: Settings are prefixed to avoid conflicting with Justifier, since stupid me in 2020 thought it was a good idea
// to have all controllers sharing the same configuration section.
m_line_offset = static_cast<s8>(std::clamp<int>(si.GetIntValue(section, "GunConLineOffset", DEFAULT_LINE_OFFSET),
std::numeric_limits<s8>::min(), std::numeric_limits<s8>::max()));
m_tick_offset = static_cast<s16>(std::clamp<int>(si.GetIntValue(section, "GunConTickOffset", DEFAULT_TICK_OFFSET),
std::numeric_limits<s16>::min(), std::numeric_limits<s16>::max()));
}

20
src/core/guncon.h
View File

@@ -59,6 +59,9 @@ private:
YMSB
};
static constexpr s8 DEFAULT_LINE_OFFSET = 0;
static constexpr s16 DEFAULT_TICK_OFFSET = -140;
void UpdatePosition();
// 0..1, not -1..1.
@@ -67,20 +70,23 @@ private:
u32 GetSoftwarePointerIndex() const;
void UpdateSoftwarePointerPosition();
std::string m_cursor_path;
float m_cursor_scale = 1.0f;
u32 m_cursor_color = 0xFFFFFFFFu;
s16 m_tick_offset = DEFAULT_TICK_OFFSET;
s8 m_line_offset = DEFAULT_LINE_OFFSET;
bool m_has_relative_binds = false;
float m_x_scale = 1.0f;
float m_relative_pos[4] = {};
// buttons are active low
u16 m_button_state = UINT16_C(0xFFFF);
u16 m_position_x = 0;
u16 m_position_y = 0;
bool m_shoot_offscreen = false;
bool m_has_relative_binds = false;
u8 m_cursor_index = 0;
TransferState m_transfer_state = TransferState::Idle;
float m_relative_pos[4] = {};
u8 m_cursor_index = 0;
float m_cursor_scale = 1.0f;
u32 m_cursor_color = 0xFFFFFFFFu;
std::string m_cursor_path;
};