From e2815caa72656c480b62cde059b10dee1dc09adb Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 15 Oct 2008 03:48:58 +0000 Subject: [PATCH] better mousewatcher and buttonthrower names --- direct/src/showbase/ShowBase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 17d426b3d3..c7e3ed2527 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -1213,16 +1213,16 @@ class ShowBase(DirectObject.DirectObject): for i in range(win.getNumInputDevices()): name = win.getInputDeviceName(i) mk = self.dataRoot.attachNewNode(MouseAndKeyboard(win, i, name)) - mw = mk.attachNewNode(MouseWatcher(name)) + mw = mk.attachNewNode(MouseWatcher("watcher%s" % (i))) mb = mw.node().getModifierButtons() mb.addButton(KeyboardButton.shift()) mb.addButton(KeyboardButton.control()) mb.addButton(KeyboardButton.alt()) mb.addButton(KeyboardButton.meta()) mw.node().setModifierButtons(mb) - bt = mw.attachNewNode(ButtonThrower(name)) + bt = mw.attachNewNode(ButtonThrower("buttons%s" % (i))) if (i != 0): - bt.node().setPrefix('mousedev'+str(i)+'-') + bt.node().setPrefix('mousedev%s-' % (i)) mods = ModifierButtons() mods.addButton(KeyboardButton.shift()) mods.addButton(KeyboardButton.control())