click outside object to deselect

Author: rasql

docs/conf.py

@@ -17,8 +17,9 @@
 sys.path.insert(0, os.path.abspath('.'))
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.insert(0, os.path.abspath('./tutorial1'))
-sys.path.insert(0, os.path.abspath('../tutorial2'))
+sys.path.insert(0, os.path.abspath('./tutorial2'))
 sys.path.insert(0, os.path.abspath('./tutorial3'))
+sys.path.insert(0, os.path.abspath('./tutorial4'))
 
 # -- Project information -----------------------------------------------------
 

docs/index.rst

@@ -17,6 +17,7 @@ This tutorial explains how to make interactive games and applications with Pygam
    tutorial3/tutorial3
    tutorial4/board
    sandbox
+   todo
 
 Indices and tables
 ==================

docs/todo.rst

@@ -0,0 +1,26 @@
+To do
+=====
+
+* cmd-click : select an item
+* alt-click : move selection
+* Board games table: number, visibilty, text, color, image
+* Selection : arrows and mouse clic
+* Multiple selection : cmd+click, drag, (border margins)
+* Games: Pong, Snake, Bricks, Space invader, 
+* Memory, 2048, Wordament
+* Astroid, bullets, gravity
+* Platformer games
+* Dame, Go, Chess
+* Button, ListMenu, TextMenu, CheckBox, Slider
+* Select, move and resize an objet
+* Edit a polygon
+* Collision between objects
+* Schedule : one-time and regular
+* Music, sounds, images
+* Object : x, y, z, scale, rotation, visible, anchor
+
+object selection
+
+* click outside to deselect
+* TAB to select next (shift-TAB) to select previous
+* draw rect to make multiple selection

docs/tutorial3/gui1.py

@@ -17,8 +17,8 @@
 class ShortcutDemo(Game):
     def __init__(self):
         super(ShortcutDemo, self).__init__()
-        Text('Shortcuts', size=100)
-        Text('Press A, with shift, ctrl, alt and cmd', size=50)
+        Text('Shortcuts')
+        Text('Press A, with shift, ctrl, alt and cmd', size=24)
 
     def on_event(self, event):
         if event.type == KEYDOWN:

docs/tutorial3/gui2.py

@@ -1,8 +1,4 @@
-"""Menu elements
-* Button
-* ListMenu
-* Var
-"""
+"""Place clickable buttons on the screen."""
 
 import pygame
 from random import randint
@@ -19,13 +15,12 @@ class ButtonDemo(Game):
     def __init__(self):
         super(ButtonDemo, self).__init__()
         self.shortcuts.update(cmd)
-        Text('Button Demo', size=48)
+        Text('Button Demo')
         Text('Press A to add, BACK to remove', size=24)
 
-        Button('Start 1', 'print("start 1")')
+        Button('Start 1', 'print("start 1")', pos=(10, 100))
         Button('Start 2', 'print("start 2")')
-        Button('Stop', 'Game.running=False', pos=(200, 100), color=YELLOW)
-        Button('Quit', 'sys.exit()')
+        Button('Stop', 'sys.exit()', pos=(200, 100), color=YELLOW)
 
 if __name__ == '__main__':
     ButtonDemo().run()

docs/tutorial3/gui3.py

@@ -17,7 +17,7 @@ def __init__(self):
         self.var2 = 'hello'
         self.var3 = True
 
-        Text('Display variables', size=48)
+        Text('Display variables')
         Text('Press Up/Down to inc by 1', size=24)
         Text('Press shift+Up/Down to inc by 10')
         Text('var1 = ' + str(self.var1))

docs/tutorial3/gui4.py

@@ -1,27 +1,20 @@
-"""Editing graphical shapes.
-* placing rectangles"""
+"""Editing graphical shapes. placing rectangles"""
 
 import pygame
 from random import randint
 from pygame.locals import *
 from pygamelib import *
 
-words = ['beauty', 'strength', 'love', 'dream', 'silence']
-cmd = {
-    K_BACKSPACE:'Game.objects.pop()',
-    K_p:'Game.capture(self)',
-    K_t:'print("test")',}
-
 class GuiDemo(Game):
     """Draw text in different sizes and colors."""
     def __init__(self):
         super(GuiDemo, self).__init__()
+        self.shortcuts[K_BACKSPACE] = 'Game.objects.pop()'
         Text('Placing rectangles', size=50)
         Text('Press A to add, BACK to remove', size=24)
         self.editing = False
         self.cmd = cmd
 
-
     def on_event(self, event):
         if event.type == MOUSEBUTTONDOWN:
             if self.key == K_a:

docs/tutorial3/gui5.py

@@ -8,9 +8,9 @@ class GuiDemo5(Game):
     """Make a subclass of the Game class."""
     def __init__(self):
         super(GuiDemo5, self).__init__()
-        Text('Selecting objects', size=48)
+        Text('Selecting objects')
         Text('Click to select', size=24)
-        Text('Cmd-drag to move')
+        Text('Ctrl-drag to move')
         Text('Type to edit text')
         Text('Cmd-V to animate')
 

docs/tutorial4/board.rst

@@ -34,27 +34,4 @@ Adding background color
 .. autoclass:: BoardDemo
     :members:
 
-.. image:: BoardDemo.png
-
-To do
-=====
-
-GUI
-
-* cmd-click : select an item
-* alt-click : move selection
-* Board games table: number, visibilty, text, color, image
-* Selection : arrows and mouse clic
-* Multiple selection : cmd+click, drag, (border margins)
-* Games: Pong, Snake, Bricks, Space invader, 
-* Memory, 2048, Wordament
-* Astroid, bullets, gravity
-* Platformer games
-* Dame, Go, Chess
-* Button, ListMenu, TextMenu, CheckBox, Slider
-* Select, move and resize an objet
-* Edit a polygon
-* Collision between objects
-* Schedule : one-time and regular
-* Music, sounds, images
-* Object : x, y, z, scale, rotation, visible, anchor
+.. image:: BoardDemo.png

pygamelib.py

@@ -173,7 +173,7 @@ def draw(self):
 class Text(Shape):
     """Draw a line of text on the screen."""
     fontcolor = BLACK
-    fontsize = 24
+    fontsize = 48
     fontname = None
     bgcolor = None
 
@@ -267,7 +267,7 @@ def __init__(self, msg, cmd, size=None, color=None, d=None, **kwargs):
             Button.size = list(size)
         self.size = Button.size
         self.rect.size = self.size
-        Game.pos[1] += Button.size[1]
+        Shape.pos[1] += Button.size[1]
 
         if d != None:
             Button.d = d
@@ -432,13 +432,7 @@ def run(self):
                         self.current_obj.on_key(event)
 
                 elif event.type == MOUSEBUTTONDOWN:
-                    for obj in Game.objects:
-                        if obj.rect.collidepoint(event.pos):
-                            if self.current_obj:
-                                self.current_obj.is_active = False
-                            self.current_obj = obj
-                            obj.is_active = True
-                            obj.on_click(event)
+                    self.select_objects(event)
 
                 elif event.type == MOUSEMOTION:
                     if self.current_obj:
@@ -482,6 +476,18 @@ def find_objects(self, pos):
         """Return the objects at position."""
         return [obj for obj in Game.objects if obj.rect.collidepoint(pos)]
 
+    def select_objects(self, event):
+        """Select objects at position pos."""
+        objs = self.find_objects(event.pos)
+        for obj in objs:
+            if self.current_obj:
+                self.current_obj.is_active = False
+            self.current_obj = obj
+            obj.is_active = True
+            obj.on_click(event)
+        if len(objs) == 0:
+            self.current_obj.is_active = False
+
     def do_shortcuts(self, event):
         """Check if the key/mod combination is part of the shortcuts
         dictionary and execute it. More shortcuts can be added 
@@ -493,6 +499,8 @@ def do_shortcuts(self, event):
             exec(self.shortcuts[k])
         elif (k, m) in self.shortcuts:
             exec(self.shortcuts[k, m])
-        
+
+
+
 if __name__ == '__main__':
     Game().run()