Changeset 34

Timestamp:

08/21/08 07:17:52 (5 months ago)

Author:

skit

Message:

refacto de pyxoo (changement nommage methode + variable)

mise en place du monitor
mise en place du package engine, displayobject, particle, structure

Files:

• project/trunk/example (added)
• project/trunk/example/particle (added)
• project/trunk/example/particle.py (added)
• project/trunk/example/particle/__init__.py (added)
• project/trunk/example/particle/explosion.py (added)
• project/trunk/example/particle/fountain.py (added)
• project/trunk/example/particle/mouse_gravity.py (added)
• project/trunk/src/pyxoo/__init__.py (modified) (1 diff)
• project/trunk/src/pyxoo/displayobject.py (added)
• project/trunk/src/pyxoo/engine.py (added)
• project/trunk/src/pyxoo/event.py (modified) (2 diffs)
• project/trunk/src/pyxoo/particle (added)
• project/trunk/src/pyxoo/particle/__init__.py (added)
• project/trunk/src/pyxoo/particle/action.py (added)
• project/trunk/src/pyxoo/particle/emission.py (added)
• project/trunk/src/pyxoo/particle/initializer.py (added)
• project/trunk/src/pyxoo/particle/renderer.py (added)
• project/trunk/src/pyxoo/particle/system.py (added)
• project/trunk/src/pyxoo/structure.py (added)
• project/trunk/src/pyxoo/utils/__init__.py (modified) (2 diffs)
• project/trunk/src/pyxoo/utils/monitor.py (added)
• project/trunk/test/commands/TestDelegate.py (modified) (2 diffs)
• project/trunk/test/particle (added)
• project/trunk/test/particle/TestParticleManager.py (added)
• project/trunk/test/particle/__init__.py (added)
• project/trunk/test/structure (added)
• project/trunk/test/structure/TestPoint.py (added)
• project/trunk/test/structure/__init__.py (added)

project/trunk/src/pyxoo/__init__.py

@@ -32 +32 @@
-import pyxoo.model
-import pyxoo.view
-
+
+
+
+
-

project/trunk/src/pyxoo/event.py

@@ -1 +1 @@
-
-
+
+
-
-__version__ = pyxoo.__version__
@@ -804 +805 @@
-        Returns the string representation of this instance."""
-        return pyxoo.utils.PyxooStringifier.stringify(self)  
+
+
+
+onJoystickAxisMotionEVENT = "onJoystickAxisMotion"
+onJoystickBallMotionEVENT = "onJoystickBallMotion"
+onJoystickHatMotionEVENT  = "onJoystickHatMotion"
+onJoystickButtonUpEVENT   = "onJoystickButtonUp"
+onJoystickButtonDownEVENT = "onJoystickButtonDown"
+
+onKeyboardKeyUpEVENT      = "onKeyboardKeyUp"
+onKeyboardKeyDownEVENT    = "onKeyboardKeyDown" 
+
+onQuitEVENT               = "onQuit"
+onActiveEVENT             = "onActive"
+onVideoResizeEVENT        = "onVideoResize"
+onVideoExposeEVENT        = "onVideoExpose"
+onUserEVENT               = "onUser"
+
+onMouseMoveEVENT          = "onMouseMove"
+onMouseButtonUpEVENT      = "onMouseButtonUp"
+onMouseButtonDownEVENT    = "onMouseButtonDown"
+
+onInitAppEVENT            = "onInitApp"
+onQuitAppEVENT            = "onQuitApp"
+onUpdateEVENT             = "onUpdate"
+onDrawEVENT               = "onDraw"
+onTickEVENT               = "onTick"
+
+
+class InputDispatcher:
+    def __init__(self):
+        self.__eb = EventBroadcaster(self)
+        self.__event_types = dict()
+        
+        self.__event_types[pygame.MOUSEMOTION]     = onMouseMoveEVENT
+        self.__event_types[pygame.MOUSEBUTTONDOWN] = onMouseButtonDownEVENT
+        self.__event_types[pygame.MOUSEBUTTONUP]   = onMouseButtonUpEVENT
+        self.__event_types[pygame.KEYUP]           = onKeyboardKeyUpEVENT
+        self.__event_types[pygame.KEYDOWN]         = onKeyboardKeyDownEVENT
+        self.__event_types[pygame.ACTIVEEVENT]     = onActiveEVENT
+        self.__event_types[pygame.QUIT]            = onQuitEVENT
+        self.__event_types[pygame.VIDEORESIZE]     = onVideoResizeEVENT
+        self.__event_types[pygame.VIDEOEXPOSE]     = onVideoExposeEVENT
+        self.__event_types[pygame.USEREVENT]       = onUserEVENT
+        self.__event_types[pygame.JOYAXISMOTION]   = onJoystickAxisMotionEVENT
+        self.__event_types[pygame.JOYBALLMOTION]   = onJoystickBallMotionEVENT
+        self.__event_types[pygame.JOYHATMOTION]    = onJoystickHatMotionEVENT
+        self.__event_types[pygame.JOYBUTTONUP]     = onJoystickButtonUpEVENT
+        self.__event_types[pygame.JOYBUTTONDOWN]   = onJoystickButtonDownEVENT  
+        
+    def dispatch(self):
+        for event in pygame.event.get():
+            self.__eb.broadcast(Event(self.__event_types[event.type], event))
+            
+    def add_listener(self, listener):
+        return self.__eb.add_listener(listener)
+    
+    def remove_listener(self, listener):
+        return self.__eb.remove_listener(listener)
+    
+    def add_event_listener(self, event_type, listener, *args):
+        return self.__eb.add_event_listener(event_type, listener, *args)
+    
+    def remove_event_listener(self, event_type, listener):
+        return self.__eb.remove_event_listener(event_type, listener)
+    
+    def __str__(self):
+        """__str__():String
+        Returns the string representation of this instance."""
+        return pyxoo.utils.PyxooStringifier.stringify(self)
+        

project/trunk/src/pyxoo/utils/__init__.py

@@ -1 +1 @@
-
-
+, random
-
-__version__ = pyxoo.__version__
@@ -10 +10 @@
-from pyxoo.utils.type import is_boolean, is_class, is_dict, is_file, is_float, is_function, is_instance, is_int, is_list, is_long, is_method, is_module, is_none, is_number, is_string, is_tuple, is_type
-from pyxoo.utils.stringifier import PyxooStringifier, BasicStringifier, Stringifier
+import pyxoo.utils.monitor
-
-
-
+def random_balance(value):
+    return random.random() * value - value / 2
-
+
+

project/trunk/test/commands/TestDelegate.py

@@ -29 +29 @@
-    return a + b
-
+def coucou():
+    return "coucou"
+
-class TestDelegate(unittest.TestCase):
-    def setUp(self):
@@ -43 +46 @@
-        self.assertEquals( "12", self.instance.call_function() )
-        
+    def testCallFunctionWithNoArgument(self):
+        delegate = pyxoo.command.Delegate(coucou)
+        self.assertEquals( "coucou", delegate.call_function() )
+        
-    def testCreate(self):
-        f = pyxoo.command.Delegate.create(myFunction, "a", "b")