2
0
Эх сурвалжийг харах

Made arrow key events passed from wx to panda

Gyedo Jeon 15 жил өмнө
parent
commit
08a28d9ca7

+ 24 - 0
direct/src/leveleditor/LevelEditorUIBase.py

@@ -338,6 +338,18 @@ class LevelEditorUIBase(WxAppShell):
             base.direct.fControl = 1
             base.direct.fControl = 1
         elif evt.GetKeyCode() == wx.WXK_SHIFT:
         elif evt.GetKeyCode() == wx.WXK_SHIFT:
             base.direct.fShift = 1
             base.direct.fShift = 1
+        elif evt.GetKeyCode() == wx.WXK_UP:
+            messenger.send('arrow_up')
+        elif evt.GetKeyCode() == wx.WXK_DOWN:
+            messenger.send('arrow_down')
+        elif evt.GetKeyCode() == wx.WXK_LEFT:
+            messenger.send('arrow_left')
+        elif evt.GetKeyCode() == wx.WXK_RIGHT:
+            messenger.send('arrow_right')
+        elif evt.GetKeyCode() == wx.WXK_PAGEUP:
+            messenger.send('page_up')
+        elif evt.GetKeyCode() == wx.WXK_PAGEDOWN:
+            messenger.send('page_down')
         else:
         else:
             evt.Skip()
             evt.Skip()
 
 
@@ -348,6 +360,18 @@ class LevelEditorUIBase(WxAppShell):
             base.direct.fControl = 0
             base.direct.fControl = 0
         elif evt.GetKeyCode() == wx.WXK_SHIFT:
         elif evt.GetKeyCode() == wx.WXK_SHIFT:
             base.direct.fShift = 0
             base.direct.fShift = 0
+        elif evt.GetKeyCode() == wx.WXK_UP:
+            messenger.send('arrow_up-up')
+        elif evt.GetKeyCode() == wx.WXK_DOWN:
+            messenger.send('arrow_down-up')
+        elif evt.GetKeyCode() == wx.WXK_LEFT:
+            messenger.send('arrow_left-up')
+        elif evt.GetKeyCode() == wx.WXK_RIGHT:
+            messenger.send('arrow_right-up')
+        elif evt.GetKeyCode() == wx.WXK_PAGEUP:
+            messenger.send('page_up-up')
+        elif evt.GetKeyCode() == wx.WXK_PAGEDOWN:
+            messenger.send('page_down-up')
         else:
         else:
             evt.Skip()
             evt.Skip()
         
         

+ 3 - 3
direct/src/leveleditor/ViewPort.py

@@ -95,9 +95,9 @@ class Viewport(wx.Panel, DirectObject):
 
 
     self.camNode.setCameraMask(LE_CAM_MASKS[self.name])
     self.camNode.setCameraMask(LE_CAM_MASKS[self.name])
 
 
-    bt = base.setupMouse(self.win, True)
-    bt.node().setPrefix('_le_%s_'%self.name[:3])    
-    mw = bt.getParent()
+    self.bt = base.setupMouse(self.win, True)
+    self.bt.node().setPrefix('_le_%s_'%self.name[:3])    
+    mw = self.bt.getParent()
     mk = mw.getParent()
     mk = mw.getParent()
     winCtrl = WindowControls(
     winCtrl = WindowControls(
                 self.win, mouseWatcher=mw,
                 self.win, mouseWatcher=mw,