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
Admin message
Looking for advice? Join the
Matrix channel for GitLab users in Bielefeld
!
Show more breadcrumbs
Social Cognitive Systems
CoCoSy
Cooperative Cuisine Environment
Commits
6ba1f773
Commit
6ba1f773
authored
1 year ago
by
Annika Österdiekhoff
Browse files
Options
Downloads
Patches
Plain Diff
fix error due to merging main
parent
83f5aacc
No related branches found
No related tags found
1 merge request
!45
Resolve "Controller Support"
Pipeline
#46213
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 @
6ba1f773
...
@@ -275,7 +275,7 @@ class PyGameGUI:
...
@@ -275,7 +275,7 @@ class PyGameGUI:
# Axis 0: joy stick left: -1 = left, ~0 = center, 1 = right
# Axis 0: joy stick left: -1 = left, ~0 = center, 1 = right
# Axis 1: joy stick left: -1 = up, ~0 = center, 1 = down
# Axis 1: joy stick left: -1 = up, ~0 = center, 1 = down
# see control stuff here (at the end of the page): https://www.pygame.org/docs/ref/joystick.html
# see control stuff here (at the end of the page): https://www.pygame.org/docs/ref/joystick.html
for
key_set
in
self
.
player_
key_sets
:
for
key_set
in
self
.
key_sets
:
# if a joystick is connected for current player
# if a joystick is connected for current player
if
joysticks
[
key_set
.
joystick
]:
if
joysticks
[
key_set
.
joystick
]:
# Usually axis run in pairs, up/down for one, and left/right for the other. Triggers count as axes.
# Usually axis run in pairs, up/down for one, and left/right for the other. Triggers count as axes.
...
@@ -343,7 +343,7 @@ class PyGameGUI:
...
@@ -343,7 +343,7 @@ class PyGameGUI:
joysticks: list of joysticks
joysticks: list of joysticks
"""
"""
for
key_set
in
self
.
player_
key_sets
:
for
key_set
in
self
.
key_sets
:
# if a joystick is connected for current player
# if a joystick is connected for current player
if
joysticks
[
key_set
.
joystick
]:
if
joysticks
[
key_set
.
joystick
]:
# pickup = Button A <-> 0
# pickup = Button A <-> 0
...
...
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