Changeset 37

Timestamp:

16/03/08 23:12:08 (10 months ago)

Author:

gak

Message:

 

Location:

muckaround/freetower

Files:

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

muckaround/freetower/source/level.py

@@ -39 +39 @@
     SECTION_SIZE = 10
 
-    def __init__(self, levels, sections):
+    def __init__(self, game, levels, sections):
+        self.game = game
         self.levels = levels
         self.sections = sections
@@ -162 +163 @@
 class LevelRenderable(Level):
 
-    def __init__(self, levels, sections, video):
-        Level.__init__(self, levels, sections)
-        self.video = video
+    def __init__(self, game, levels, sections):
+        Level.__init__(self, game, levels, sections)
+        self.video = game.video
 
     def render(self):

muckaround/freetower/source/people.py

@@ -1 +1 @@
 class Person(object):
+
     def __init__(self, levelobj, level, section):
         self.levelobj = levelobj
         self.level = level
         self.section = section
-        self.destination = None  # the current target destination
+
+        self.target = None  # the final destination
+        self.destination = None  # the short term destination (pathfinding)
         self.path = None  # path saved for the destination
 
@@ -11 +14 @@
 #        self.is_tired = False
 
+        self.state = None
+
+    def think(self):
+        if not self.state:
+            self.think_of_something()
+
+    def think_of_something(self):
+        pass
+
 class NormalPerson(Person):
     pass
+
 
 class ApartmentOwner(Person):

muckaround/freetower/test.py

@@ -9 +9 @@
 from source.structures import *
 from source.transports import *
+from source.game import Game
 
 def main():
-    video = Video()
-    video.init()
-    level = LevelRenderable(video=video, levels=50, sections=100)
+    game = Game()
+    game.init_video()
+    game.level = LevelRenderable(game, levels=50, sections=100)
+
+    level = game.level
 
     for a in xrange(40):
@@ -23 +26 @@
 
     level.set_section(3, 10, FoodStore)
-
     level.add_transport(Stairs, 0, 30, direction=1)
     level.add_transport(Lift, 0, 20, height=6)
@@ -29 +31 @@
     t = time.time()
     frames = 0
-    while not video.window.has_exit:
+    while not game.video.window.has_exit:
+        game.think(1)
+        game.input()
+        game.render()
+
         frames += 1
-        video.window.dispatch_events()
-        video.window.clear()
-        level.render()
-
-#        meh = level.find_path(
-#            TransportExit(None, level=0, section=0),
-#            TransportExit(None, level=5, section=50),
-#            maxcost=30
-#            )
-#        print '\n'.join([repr(b) for b in meh])
-
-        x, y = video.window._mouse_x, video.window._mouse_y
-        x = float(x) / Level.SECTION_SIZE
-        y = float(y) / Level.LEVEL_SIZE
-
-        glBegin(GL_LINES)
-        glVertex2f(0, 0)
-        glVertex2f(x, y)
-        glEnd()
-
-        video.flip()
-
         if frames % 100 == 0:
             print frames / (time.time() - t)