rotation

[pmachines.git] / pmachines / scene.py

diff --git a/pmachines/scene.py b/pmachines/scene.py
index bd7d9bfaf3d02192ef27163af439899667ff9a62..dbc6282a6dcf22a8764b0b142ecd7d1aa3443a7a 100644 (file)
--- a/pmachines/scene.py
+++ b/pmachines/scene.py
@@ -41,8 +41,10 @@ class Scene(DirectObject):
         self._set_directional_light('rim light', (75, -30, 0), (.3, .3, .3, 1))
 
     def _set_input(self):
-        self.accept('mouse1', self.on_click)
+        self.accept('mouse1', self.on_click_l)
         self.accept('mouse1-up', self.on_release)
+        self.accept('mouse3', self.on_click_r)
+        self.accept('mouse3-up', self.on_release)
         self.accept('p-up', self.on_play)
 
     def _set_mouse_plane(self):
@@ -63,18 +65,22 @@ class Scene(DirectObject):
         p_to = render.get_relative_point(base.cam, p_to)  # global coords
         return self._world.ray_test_all(p_from, p_to).get_hits()
 
-    def on_click(self):
+    def _on_click(self, method):
         for hit in self._get_hits():
             if hit.get_node() == self._mouse_plane_node:
                 pos = hit.get_hit_pos()
         for hit in self._get_hits():
             for item in [i for i in self.items if hit.get_node() == i.node]:
-                item.on_click(pos)
+                getattr(item, method)(pos)
+
+    def on_click_l(self):
+        self._on_click('on_click_l')
+
+    def on_click_r(self):
+        self._on_click('on_click_r')
 
     def on_release(self):
-        for hit in self._get_hits():
-            for item in [i for i in self.items if hit.get_node() == i.node]:
-                item.on_release()
+        [item.on_release() for item in self.items]
 
     def on_frame(self, task):
         hits = self._get_hits()