Changeset 38

Timestamp:

24/03/08 00:12:50 (10 months ago)

Author:

gak

Message:

 

Location:

muckaround/freetower

Files:

• source/game.py (modified) (1 diff)
• source/level.py (modified) (4 diffs)
• source/people.py (modified) (2 diffs)
• test.py (modified) (3 diffs)

muckaround/freetower/source/game.py

@@ -17 +17 @@
     def think(self, dt):
         self.current_time += dt
+        self.level.think(dt)
 
     def input(self):

muckaround/freetower/source/level.py

@@ -5 +5 @@
 
 from structures import *
+from transports import TransportExit
 
 
@@ -48 +49 @@
         self.transport_exits = []
 
+    def think(self, dt):
+
+#        for transport in self.transports:
+#            transport.think(dt)
+
+        for person in self.people:
+            person.think(dt)
+
     def set_section(self, level, section, struct, *args, **kwargs):
 
@@ -69 +78 @@
         if not person_type:
             person_type = NormalPerson
-        person = person_type(self, level=0, section=0, *args, **kwargs)
+        person = person_type(self, *args, **kwargs)
         self.people.append(person)
+        return person
 
     def add_transport(self, transport, *args, **kwargs):
@@ -186 +196 @@
             transport.render()
 
+        for person in self.people:
+            person.render()
+
     def render_path(self, p):
         glColor3f(0.2, 0.7, 0.2)

muckaround/freetower/source/people.py

@@ +1 @@
+import random
+
+from pyglet.gl import *
+
+from transports import TransportExit
+
 class Person(object):
 
@@ -16 +22 @@
         self.state = None
 
-    def think(self):
-        if not self.state:
-            self.think_of_something()
+    def think(self, dt):
+        #if not self.state:
+        #    self.think_of_something()
+        if self.destination:
+            assert(self.path)
+            if self.destination.dst.section > self.section:
+                direction = 1
+            else:
+                direction - 1
+            self.section += direction
+            print 'zing'
 
     def think_of_something(self):
         pass
+
+    def find_path(self, level, section):
+        target = TransportExit(None, level, section)
+        self.path = self.levelobj.find_path(
+            TransportExit(None, self.level, self.section),
+            target,
+            maxcost=100,
+            )
+        self.target = target
+        self.destination = self.path[0]
+
+
+    def render(self):
+        glBegin(GL_LINES)
+        glVertex2f(self.section + random.random(), self.level + 0.3)
+        glVertex2f(self.section + random.random(), self.level + 0.5)
+        glEnd()
+
 
 class NormalPerson(Person):

muckaround/freetower/test.py

@@ -10 +10 @@
 from source.transports import *
 from source.game import Game
+from source.people import *
 
 def main():
@@ -28 +29 @@
     level.add_transport(Stairs, 0, 30, direction=1)
     level.add_transport(Lift, 0, 20, height=6)
+    p = level.add_person(person_type=Person, level=0, section=0)
+    p.find_path(0, 10)
 
     t = time.time()
@@ -40 +43 @@
             print frames / (time.time() - t)
 
-
 if __name__ == '__main__':
     sys.exit(main())