Changeset 50

Timestamp:

04/05/08 11:04:27 (8 months ago)

Author:

gak

Message:

 

Location:

muckaround/blobworld

Files:

• source/blobs.py (added)
• source/game.py (modified) (3 diffs)
• source/level.py (modified) (2 diffs)
• source/player.py (added)
• test.py (modified) (2 diffs)

muckaround/blobworld/source/game.py

@@ +1 @@
+import random
+
 from video import Video
 from level import Level
+from player import HumanPlayer, ComputerPlayer
+from blobs import Blob
 
 from pyglet.gl import *
+
+
+def rand_pos(max_x, max_y):
+    return (random.uniform(0, max_x), random.uniform(0, max_y))
+
 
 class Game(object):
@@ -10 +19 @@
         self.video = None
         self.level = None
+        self.human = None
+        self.renderable = True
+        self.players = []
+
+    def spawn_players(self):
+        # Hard code to 1HUMAN v 1CPU
+        human = HumanPlayer(self, 'human')
+        self.players.append(human)
+        self.human = human
+        self.players.append(ComputerPlayer(self, 'computer'))
+
+        for p in self.players:
+            self.add_blob(p, rand_pos(self.level.width, self.level.height), 5)
+
 
     def init_video(self):
@@ -24 +47 @@
 
     def on_mouse_press(self, x, y, button, modifiers):
-        self.level.add_blob((x, y), 10)
+        self.add_blob(self.human, (x, y), 10)
+
+    def add_blob(self, owner, pos, radius):
+        blob = Blob(self, owner, pos, radius)
+        self.level.add_blob(blob)
+        owner.inform_blob_ownership(blob)
 
     def render(self):

muckaround/blobworld/source/level.py

@@ -6 +6 @@
 from blobs import Blob
 
+
 class Level(object):
 
-    def __init__(self, game):
+    def __init__(self, game, width, height):
         self.game = game
+        self.width = width
+        self.height = height
         self.blobs = []
 
@@ -16 +19 @@
             b.think(dt)
 
-    def add_blob(self, pos, radius):
-        b = Blob(pos, radius)
-        self.blobs.append(b)
+    def add_blob(self, blob):
+        self.blobs.append(blob)
 
 
 class LevelRenderable(Level):
 
-    def __init__(self, game):
-        Level.__init__(self, game)
+    def __init__(self, game, *args, **kwargs):
+        Level.__init__(self, game, *args, **kwargs)
         self.video = game.video
 

muckaround/blobworld/test.py

@@ -12 +12 @@
     game = Game()
     game.init_video()
-    game.level = LevelRenderable(game)
+    game.level = LevelRenderable(game, 800, 600)
+    game.spawn_players()
 
     last_think = time.time()
@@ -18 +19 @@
     fr = 1. / 30
     frames = 0
-
-    for a in xrange(100):
-        game.level.add_blob((random.random() * 640, random.random() * 480), 1)
 
     while not game.video.window.has_exit: