Skip to content

Commit

Permalink
raw key codes
Browse files Browse the repository at this point in the history
  • Loading branch information
@cflavio
cflavio committed Oct 11, 2018
1 parent c9113e1 commit 4f3ea73
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 33 deletions.
34 changes: 17 additions & 17 deletions menu/inputpage.py
View file
Expand Up @@ -53,7 +53,7 @@ def build(self):
(_('Respawn'), 'respawn' + suff, -.38)] (_('Respawn'), 'respawn' + suff, -.38)]
for btn_data in buttons_data: for btn_data in buttons_data:
widgets += [self._add_lab(btn_data[0], btn_data[2])] widgets += [self._add_lab(btn_data[0], btn_data[2])]
widgets += [self._add_btn(self.keys[btn_data[1]], btn_data[2])] widgets += [self._add_btn(self.eng.event.key2desc(self.keys[btn_data[1]]), btn_data[2])]
l_a = menu_args.label_args.copy() l_a = menu_args.label_args.copy()
l_a['scale'] = .065 l_a['scale'] = .065
self.hint_lab = Label( self.hint_lab = Label(
Expand Down Expand Up @@ -91,12 +91,12 @@ def _on_back(self):
suff = str(self.joyp_idx + 1) suff = str(self.joyp_idx + 1)
dct = {} dct = {}
dct['keys'] = { dct['keys'] = {
'forward' + suff: self.mediator.gui.ibuttons[0]['text'], 'forward' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[0]['text']),
'rear' + suff: self.mediator.gui.ibuttons[1]['text'], 'rear' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[1]['text']),
'left' + suff: self.mediator.gui.ibuttons[2]['text'], 'left' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[2]['text']),
'right' + suff: self.mediator.gui.ibuttons[3]['text'], 'right' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[3]['text']),
'fire' + suff: self.mediator.gui.ibuttons[4]['text'], 'fire' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[4]['text']),
'respawn' + suff: self.mediator.gui.ibuttons[5]['text']} 'respawn' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[5]['text'])}
dct['joystick' + suff] = self.mediator.gui.joypad_cb['indicatorValue'] dct['joystick' + suff] = self.mediator.gui.joypad_cb['indicatorValue']
self.notify('on_back', 'input_page2', [dct]) self.notify('on_back', 'input_page2', [dct])


Expand All @@ -114,9 +114,9 @@ def on_already_dlg(self): self.dial = self.dial.destroy()
def already_used(self, val): def already_used(self, val):
labels = ['forward', 'rear', 'left', 'right', 'fire', 'respawn', 'pause'] labels = ['forward', 'rear', 'left', 'right', 'fire', 'respawn', 'pause']
for i, btn in enumerate(self.mediator.gui.ibuttons): for i, btn in enumerate(self.mediator.gui.ibuttons):
if btn['text'] == val: return '1', labels[i] if self.eng.event.desc2key(btn['text']) == val: return '1', labels[i]
for lab in labels[:-1]: for lab in labels[:-1]:
if self.keys[lab + '2'] == val: return '2', lab if self.eng.event.key2desc(self.keys[lab + '2']) == val: return '2', lab




class InputPageGui1(InputPageGui2): class InputPageGui1(InputPageGui2):
Expand All @@ -130,7 +130,7 @@ def build(self):
**self.menu_args.btn_args) **self.menu_args.btn_args)
self.add_widgets([p2_btn]) self.add_widgets([p2_btn])
self.add_widgets([self._add_lab(_('Pause'), -.56)]) self.add_widgets([self._add_lab(_('Pause'), -.56)])
self.add_widgets([self._add_btn(self.keys['pause'], -.56)]) self.add_widgets([self._add_btn(self.eng.event.key2desc(self.keys['pause']), -.56)])
InputPageGui2.build(self) InputPageGui2.build(self)


def on_player2(self): def on_player2(self):
Expand All @@ -141,13 +141,13 @@ def _on_back(self):
suff = str(self.joyp_idx + 1) suff = str(self.joyp_idx + 1)
dct = {} dct = {}
dct['keys'] = { dct['keys'] = {
'forward' + suff: self.mediator.gui.ibuttons[0]['text'], 'forward' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[0]['text']),
'rear' + suff: self.mediator.gui.ibuttons[1]['text'], 'rear' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[1]['text']),
'left' + suff: self.mediator.gui.ibuttons[2]['text'], 'left' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[2]['text']),
'right' + suff: self.mediator.gui.ibuttons[3]['text'], 'right' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[3]['text']),
'fire' + suff: self.mediator.gui.ibuttons[4]['text'], 'fire' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[4]['text']),
'respawn' + suff: self.mediator.gui.ibuttons[5]['text'], 'respawn' + suff: self.eng.event.desc2key(self.mediator.gui.ibuttons[5]['text']),
'pause': self.mediator.gui.ibuttons[6]['text']} 'pause': self.eng.event.desc2key(self.mediator.gui.ibuttons[6]['text'])}
dct['joystick' + suff] = self.mediator.gui.joypad_cb['indicatorValue'] dct['joystick' + suff] = self.mediator.gui.joypad_cb['indicatorValue']
self.notify('on_back', 'input_page1', [dct]) self.notify('on_back', 'input_page1', [dct])


Expand Down
4 changes: 2 additions & 2 deletions project.py
View file
Expand Up @@ -4,8 +4,8 @@
# TODO LIST ===== # TODO LIST =====


# 0.11 (local multiplayer) # 0.11 (local multiplayer)
# use raw keys as default ones # supporting up to four players (options/input)
# supporting up to four players # supporting up to four players (ingame)




# WAITING ===== # WAITING =====
Expand Down
26 changes: 13 additions & 13 deletions yorg/yorg.py
View file
Expand Up @@ -51,19 +51,19 @@ def __init__(self):
'antialiasing': 0, 'antialiasing': 0,
'cars_number': 7, 'cars_number': 7,
'keys': { 'keys': {
'forward1': 'arrow_up', 'forward1': 'raw-arrow_up',
'rear1': 'arrow_down', 'rear1': 'raw-arrow_down',
'left1': 'arrow_left', 'left1': 'raw-arrow_left',
'right1': 'arrow_right', 'right1': 'raw-arrow_right',
'fire1': 'm', 'fire1': 'raw-rcontrol',
'respawn1': 'n', 'respawn1': 'raw-rshift',
'forward2': 'w', 'forward2': 'raw-w',
'rear2': 's', 'rear2': 'raw-s',
'left2': 'a', 'left2': 'raw-a',
'right2': 'd', 'right2': 'raw-d',
'fire2': 't', 'fire2': 'raw-c',
'respawn2': 'r', 'respawn2': 'raw-v',
'pause': 'p'}, 'pause': 'raw-p'},
'joystick1': 0, 'joystick1': 0,
'joystick2': 0, 'joystick2': 0,
'last_version': '0.7.0-x', 'last_version': '0.7.0-x',
Expand Down
2 changes: 1 addition & 1 deletion yyagl
Submodule yyagl updated 3 files
+15 −0 engine/event.py
+1 −1 racing/car/gui.py
+2 −1 racing/race/gui/loading/loadingpage.py

0 comments on commit 4f3ea73

Please sign in to comment.