Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Cooperative Cuisine Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Social Cognitive Systems
CoCoSy
Cooperative Cuisine Environment
Commits
5e0fe384
Commit
5e0fe384
authored
1 year ago
by
Annika Österdiekhoff
Browse files
Options
Downloads
Patches
Plain Diff
fix error when only one controller is connected
parent
2bed7e6c
No related branches found
No related tags found
1 merge request
!45
Resolve "Controller Support"
Pipeline
#46229
passed
1 year ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
overcooked_simulator/gui_2d_vis/overcooked_gui.py
+2
-2
2 additions, 2 deletions
overcooked_simulator/gui_2d_vis/overcooked_gui.py
with
2 additions
and
2 deletions
overcooked_simulator/gui_2d_vis/overcooked_gui.py
+
2
−
2
View file @
5e0fe384
...
...
@@ -274,7 +274,7 @@ class PyGameGUI:
for
key_set
in
self
.
key_sets
:
current_player_name
=
str
(
key_set
.
current_player
)
# if a joystick is connected for current player
if
joysticks
[
key_set
.
joystick
]
:
if
key_set
.
joystick
in
joysticks
:
# Usually axis run in pairs, up/down for one, and left/right for the other. Triggers count as axes.
# You may want to take into account some tolerance to handle jitter, and
# joystick drift may keep the joystick from centering at 0 or using the full range of position values.
...
...
@@ -341,7 +341,7 @@ class PyGameGUI:
for
key_set
in
self
.
key_sets
:
current_player_name
=
str
(
key_set
.
current_player
)
# if a joystick is connected for current player
if
joysticks
[
key_set
.
joystick
]
:
if
key_set
.
joystick
in
joysticks
:
# pickup = Button A <-> 0
if
joysticks
[
key_set
.
joystick
].
get_button
(
0
)
and
event
.
type
==
pygame
.
JOYBUTTONDOWN
:
action
=
Action
(
current_player_name
,
ActionType
.
PUT
,
"
pickup
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment