Merge pull request #47 from PySlither/update-examples

Fixed some bugs, updated and moved the examples

Author: BookOwl

examples/bg.png

@@ -7,6 +7,7 @@
 # To use a consistent encoding
 #from codecs import open
 from os import path
+import glob
 
 here = path.abspath(path.dirname(__file__))
 
@@ -20,7 +21,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.2.0',
+    version='0.2.1',
 
     description='A Python module that uses PyGame to bring Scratch-like features to Python',
     long_description='A Python module that uses PyGame to bring Scratch-like features to Python\nPyGame IS required for this module to work.',
@@ -64,7 +65,7 @@
 
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
-    packages=["slither"],
+    packages=["slither", "slither.examples"],
 
     # Alternatively, if you want to distribute just a my_module.py, uncomment
     # this:
@@ -87,7 +88,8 @@
     # installed, specify them here.  If using Python 2.6 or less, then these
     # have to be included in MANIFEST.in as well.
     package_data={
-      'slither': ['snakey.png']
+      'slither': ['snakey.png'],
+      'slither.examples': list(map(path.basename, glob.glob("slither/examples/*.png") + glob.glob("slither/examples/*.wav")))
     },
 
     # Although 'package_data' is the preferred approach, in some case you may

examples/soundtest.py

@@ -10,7 +10,7 @@
 # Also make sure to credit sources like StackOverflow.
 
 import pygame
-import sys, os
+import sys, os, collections, warnings
 
 WIDTH, HEIGHT = (800, 600)
 SCREEN_SIZE = (WIDTH, HEIGHT)
@@ -26,7 +26,11 @@
                 } # Create a dict of callbacks that do nothing
 globalscreen = None
 
-scriptdir = os.path.dirname(os.path.realpath(__import__("__main__").__file__))
+try:
+    scriptdir = os.path.dirname(os.path.realpath(__import__("__main__").__file__))
+except AttributeError:
+    warnings.warn("Couldn't find scripts dir, some functions may not work.")
+    scriptdir = os.path.realpath(".")
 
 # Convienience functions
 # Taken from http://stackoverflow.com/questions/4183208/how-do-i-rotate-an-image-around-its-center-using-pygame
@@ -39,7 +43,7 @@ def rotateCenter(image, angle):
 class Stage():
     def __init__(self):
         self.snakey = pygame.image.load(os.path.join(os.path.dirname(__file__), "snakey.png"))
-        self.costumes = {"costume0" : self.snakey}
+        self.costumes = collections.OrderedDict({"costume0" : self.snakey})
         self.costumeNumber = 0
         self.costumeName = "costume0"
         self.currentCostume = None
@@ -63,32 +67,31 @@ def deleteCostumeByNumber(self, number):
         if number < len(self.costumes.keys()):
             costumeName = self.costumes.keys()[number]
             self.deleteCostumeByName(costumeName) # TODO: Fix this stupid "get name from number" thing
-            
+
     @property
     def costumeNumber(self):
         '''The number of the costume the sprite is showing'''
         return self._costumeNumber
 
     @costumeNumber.setter
     def costumeNumber(self, val):
-        if number < len(self.costumes.keys()): # TODO: use mod to wrap around
+        if val < len(self.costumes.keys()): # TODO: use mod to wrap around
             self.costumeName = list(self.costumes.keys())[val]
-            self.costumeNumber = val
+            self._costumeNumber = val
 
     @property
     def costumeName(self):
         '''The name of the costume the sprite is showing'''
         return self._costumeName
-    
+
     @costumeName.setter
     def costumeName(self, val):
         if val in self.costumes:
             self.recalculateCostumeDataFromName(val)
 
     def recalculateCostumeDataFromName(self, name):
-            self.costumeName = name
-            self.costumeNumber = list(self.costumes.keys()).index(name)
-            self.currentCostume = self.costumes[self.costumeNumber]
+            self._costumeName = name
+            self.currentCostume = self.costumes[self.costumeName]
 
 
 slitherStage = Stage()
@@ -139,23 +142,28 @@ def delete(self):
         '''Remove the sprite from the global sprites list, causing it not to be drawn.'''
         sprites.remove(self)
 
-class Sound():
-    # Based on pygame examples
-    def loadSound(self, name):
-        '''Load a sound. Set this function to a variable then call variable.play()'''
-        class NoneSound:
-            def play(self): pass
-        if not pygame.mixer or not pygame.mixer.get_init():
-            return NoneSound()
-        fullname = name
-        try:
-            sound = pygame.mixer.Sound(fullname)
-        except pygame.error as e:
-            print ('Cannot load sound: %s' % fullname)
-            raise e
-        return sound
-
-slitherSound = Sound()
+# DOES NOT WORK!
+# class Sound():
+#     # Based on pygame examples
+#     def loadSound(self, name):
+#         '''Load a sound. Set this function to a variable then call variable.play()'''
+#         try:
+#             pygame.mixer.get_init()
+#         except:
+#             pass
+#         class NoneSound:
+#             def play(self): pass
+#         if not pygame.mixer:
+#             return NoneSound()
+#         fullname = os.path.join(scriptdir, name)
+#         try:
+#             sound = pygame.mixer.Sound(fullname)
+#         except pygame.error as e:
+#             print ('Cannot load sound: %s' % fullname)
+#             raise e
+#         return sound
+#
+# slitherSound = Sound()
 
 def setup(caption=sys.argv[0]):
     '''Sets up PyGame and returns a screen object that can be used with blit().'''
@@ -182,7 +190,7 @@ def blit(screen):
         screen.fill(slitherStage.bgColor)
 
         if slitherStage.currentCostume:
-            screen.blit(pygame.transform.scale(slitherStage.currentCostume, SCREEN_SIZE, (0, 0)))
+            screen.blit(pygame.transform.scale(slitherStage.currentCostume, SCREEN_SIZE), (0, 0))
 
         for obj in sprites:
             if obj.isVisible(): # Check if the object is showing before we do anything

setup.py

@@ -1,16 +1,17 @@
 import slither, pygame, time
 
 snakey = slither.Sprite()
-snakey.setCostumeByName("costume0") # You can set the default costume (costume0) by name...
+snakey.costumeName = "costume0" # You can set the default costume (costume0) by name...
+snakey.ypos = 100
 
 SoExcited = slither.Sprite()
 SoExcited.addCostume("SoExcited.png", "avatar")
-SoExcited.setCostumeByNumber(0) # ...or you can use a number.
+SoExcited.costumeNumber = 1 # ...or you can use a number.
 
-SoExcited.goTt(300, 300)
+SoExcited.goto(300, 300)
 SoExcited.scale = 0.33 # May look grainy when used on too low a scale.
 
-slither.slitherStage.setColor(40, 222, 40)
+slither.slitherStage.bgColor = (40, 222, 40)
 
 slither.setup() # Begin slither
 

slither/__init__.py

@@ -1,12 +1,11 @@
-import slither, time, math
+import slither, math
 
 snakey = slither.Sprite()
-snakey.setCostumeByName("costume0")
-snakey.ypos = 360
+snakey.ypos = 460
 
-slither.slitherStage.setColor(40, 222, 40)
+slither.slitherStage.bgColor = (40, 222, 40)
 slither.slitherStage.addCostume("bg2.png", "bg")
-slither.slitherStage.setCostumeByName("bg")
+slither.slitherStage.costumeName = "bg"
 
 slither.setup() # Begin slither'