TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

meta is a modifier key too

Browse Source
This commit is contained in:
David Rose 2006-10-12 23:05:44 +00:00
parent 27aa0ccc9f
commit f8c2e9d790
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
direct/src/showbase/ShowBase.py
View File

@ -1040,6 +1040,7 @@ class ShowBase(DirectObject.DirectObject):
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))
if (i != 0):
@ -1048,6 +1049,7 @@ class ShowBase(DirectObject.DirectObject):
mods.addButton(KeyboardButton.shift())
mods.addButton(KeyboardButton.control())
mods.addButton(KeyboardButton.alt())
mods.addButton(KeyboardButton.meta())
bt.node().setModifierButtons(mods)
self.buttonThrowers.append(bt)
if (win.hasPointer(i)):
@ -1129,6 +1131,10 @@ class ShowBase(DirectObject.DirectObject):
return self.mouseWatcherNode.getModifierButtons().isDown(
KeyboardButton.control())
def getMeta(self):
return self.mouseWatcherNode.getModifierButtons().isDown(
KeyboardButton.meta())
def addAngularIntegrator(self):
if not self.physicsMgrAngular:
self.physicsMgrAngular = 1

8
direct/src/showbase/Sources.pp
View File

@ -3,13 +3,13 @@
#define LOCAL_LIBS \
directbase
#define OTHER_LIBS \
pgraph:c gsgbase:c gobj:c mathutil:c pstatclient:c \
lerp:c downloader:c pandabase:c pnmimage:c prc:c \
pipeline:c cull:c $[if $[HAVE_NET],net:c] \
display:c linmath:c event:c putil:c panda:m \
express:c pandaexpress:m \
interrogatedb:c dconfig:c dtoolconfig:m \
dtoolutil:c dtoolbase:c dtool:m \
pgraph:c gsgbase:c gobj:c mathutil:c pstatclient:c \
lerp:c downloader:c pandabase:c pnmimage:c prc:c \
pipeline:c cull:c $[if $[HAVE_NET],net:c]
dtoolutil:c dtoolbase:c dtool:m
#define SOURCES \
showBase.cxx showBase.h

1
panda/src/framework/windowFramework.cxx
View File

@ -399,6 +399,7 @@ enable_keyboard() {
mods.add_button(KeyboardButton::shift());
mods.add_button(KeyboardButton::control());
mods.add_button(KeyboardButton::alt());
mods.add_button(KeyboardButton::meta());
bt->set_modifier_buttons(mods);
mouse.attach_new_node(bt);
}