Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from streetpea:main #107

Merged
merged 2 commits into from
Jan 27, 2025
Merged

[pull] main from streetpea:main #107

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92166c2
Adjust trigger intensity for medium and weak
streetpea Jan 26, 2025
3a3b621
If window was maximized before entering stream session, return to max…
streetpea Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Adjust trigger intensity for medium and weak
  • Loading branch information
@streetpea
streetpea committed Jan 26, 2025
commit 92166c2c3938759511c311535aedd782c12aa3cb
14 changes: 7 additions & 7 deletions gui/src/streamsession.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,8 +1707,8 @@ void StreamSession::AdjustAdaptiveTriggerPacket(uint8_t *buf, uint8_t type)
uint32_t strength = ((buf[5] >> 3) & 0x07) + 1;
uint32_t force_zones = *(uint32_t *)(buf + 2);
uint32_t new_strength = strength * ps5_trigger_intensity;
if(new_strength > 0)
new_strength -= 1;
new_strength = (new_strength > 0) ? (new_strength - 1) : 0;
new_strength = (new_strength > 7) ? 7 : new_strength;
uint32_t new_force_zones = 0;
for (int i = 0; i < 10; i++)
{
Expand All @@ -1721,8 +1721,8 @@ void StreamSession::AdjustAdaptiveTriggerPacket(uint8_t *buf, uint8_t type)
case 0x25: {
uint8_t strength = buf[2] + 1;
strength *= ps5_trigger_intensity;
if(strength > 0)
strength -= 1;
strength = (strength > 0) ? (strength - 1) : 0;
strength = (strength > 7) ? 7 : strength;
buf[2] = strength;
break;
}
Expand Down Expand Up @@ -1838,15 +1838,15 @@ void StreamSession::Event(ChiakiEvent *event)
break;
}
case Strong: {
ps5_trigger_intensity = 1;
ps5_trigger_intensity = 1.0;
break;
}
case Weak: {
ps5_trigger_intensity = 0.5;
ps5_trigger_intensity = 0.25;
break;
}
case Medium: {
ps5_trigger_intensity = 0.75;
ps5_trigger_intensity = 0.5;
break;
}
}
Expand Down