From 94ee6292b6213d14634006769bbd2f6b90ea4ea4 Mon Sep 17 00:00:00 2001
From: nrp <olpc@spongezone.net>
Date: Sun, 31 Aug 2008 00:05:38 +0000
Subject: adding train

---
diff --git a/bridge.py b/bridge.py
index 76daffc..bebd9e1 100644
--- a/bridge.py
+++ b/bridge.py
@@ -12,3 +12,36 @@ def create_world(game):
     game.world.add.rect(rect.center, rect.width / 2, rect.height / 2,
         dynamic=False)
 
+def create_train(game, worldpoint = (300,500), train = (100, 50), wheelrad = 20, cars = 3):
+    points = []
+    for i in range(0,cars):
+        startpoint = (worldpoint[0]-(train[0]+7)*i, worldpoint[1])
+        points.append(startpoint)
+        rect = pygame.Rect(startpoint, train)
+        rect.normalize()
+        pygame.draw.rect(game.screen, (200, 50, 100), rect, 3)
+
+        game.world.add.rect(rect.center, rect.width / 2, rect.height / 2,
+            dynamic = True, density=1.0, restitution=0.16, friction=0.5)
+
+        rearwheel = (startpoint[0]+wheelrad,startpoint[1]+train[1]-wheelrad/2)
+        pygame.draw.circle(game.screen, (0,0,0), rearwheel, wheelrad, 3)
+        game.world.add.ball(rearwheel,wheelrad, dynamic=True, density=1.0, 
+            restitution=0.16, friction=0.5)
+
+        frontwheel = (startpoint[0]+train[0]-wheelrad,startpoint[1]+train[1]-wheelrad/2)
+        pygame.draw.circle(game.screen, (0,0,0), frontwheel, wheelrad, 3)
+        game.world.add.ball(frontwheel,wheelrad, dynamic=True, density=1.0, 
+            restitution=0.16, friction=0.5)
+
+        rearaxle = game.world.get_bodies_at_pos(rearwheel)
+        frontaxle = game.world.get_bodies_at_pos(frontwheel)
+        game.world.add.jointMotor(rearaxle[0],rearaxle[1],rearwheel)
+        game.world.add.jointMotor(frontaxle[0],frontaxle[1],frontwheel)
+        
+    for i in range(1,len(points)):
+        backlink = (points[i][0]+train[0]-1,points[i][1]+train[1]-1)
+        frontlink = (points[i-1][0]+1,points[i-1][1]+train[1]-1)
+        btrain = game.world.get_bodies_at_pos(backlink)
+        ftrain = game.world.get_bodies_at_pos(frontlink)
+        game.world.add.distanceJoint(btrain[0], ftrain[0], backlink, frontlink)
diff --git a/elements/add_objects.py b/elements/add_objects.py
index 3842b75..66a59cd 100644
--- a/elements/add_objects.py
+++ b/elements/add_objects.py
@@ -528,13 +528,17 @@ class Add:
         jointDef.maxMotorTorque = torque
         jointDef.motorSpeed = speed
         jointDef.enableMotor = True
-        self.parent.world.CreateJoint(jointDef)
-    #def jointMotor(self,b1,b2,p1,speed):
-    #    p1 = self.tob2vec(p1)
-    #    jointDef = box2d.b2RevoluteJointDef()
-    #    jointDef.Initialize(b1, b2, p1)
-    #    jointDef.
-    #    
+        self.parent.world.CreateJoint(jointDef)
+        
+    def jointMotor(self,b1,b2,p1,torque=900,speed=-10):
+        p1 = self.to_b2vec(p1)
+        jointDef = box2d.b2RevoluteJointDef()
+        jointDef.Initialize(b1, b2, p1)
+        jointDef.maxMotorTorque = torque
+        jointDef.motorSpeed = speed
+        jointDef.enableMotor = True
+        self.parent.world.CreateJoint(jointDef)
+        
     def joint(self, *args):        
         print "* Add Joint:", args
 
diff --git a/physics.py b/physics.py
index 6d9fb78..f2e38f5 100644
--- a/physics.py
+++ b/physics.py
@@ -49,10 +49,16 @@ class PhysicsGame:
         self.world.add.ground()    
 
         bridge.create_world(self)
+        bridge.create_train(self)
         
     def run(self):
-        self.running = True    
+        self.running = True
+        t = pygame.time.get_ticks()
         while self.running:
+            if (pygame.time.get_ticks() - t) > 1500:
+#                bridge.create_train(self)
+                t = pygame.time.get_ticks()
+                
             for event in pygame.event.get():
                 self.currentTool.handleEvents(event)
             # Clear Display
diff --git a/tools.py b/tools.py
index 0ce23d9..07d6f49 100644
--- a/tools.py
+++ b/tools.py
@@ -334,6 +334,10 @@ class JointTool(Tool):
                     self.jb2 = self.jb2pos = None
             elif event.type == MOUSEBUTTONUP:
                 if event.button == 1:
+                    if self.jb1[1]:
+                        self.game.world.add.jointMotor(self.jb1[0],self.jb1[1],event.pos)
+                        self.jb1 = None
+                    '''                  
                     # grab the second body
                     self.jb2pos = event.pos
                     self.jb2 = self.game.world.get_bodies_at_pos(event.pos)
@@ -347,14 +351,17 @@ class JointTool(Tool):
                     self.jb1 = self.jb2 = self.jb1pos = self.jb2pos = None
                 if event.button == 3:
                     # add a centered fixed joint
-                    '''self.jb2 = self.game.world.get_bodies_at_pos(event.pos)
+                    
+                    self.jb2 = self.game.world.get_bodies_at_pos(event.pos)
                     if self.jb2:
                         self.game.world.add.fixedJoint(self.jb2[0])
                     # regardless, clean everything up
-                    self.jb1 = self.jb2 = self.jb1pos = self.jb2pos = None'''
+                    self.jb1 = self.jb2 = self.jb1pos = self.jb2pos = None
                     if self.jb1:
                         self.game.world.add.motor(self.jb1[0],self.jb1pos)
                     self.jb1 = self.jb2 = self.jb1pos = self.jb2pos = None
+                    '''
+                    
     def draw(self):
         if self.jb1:
             pygame.draw.line(self.game.screen,(100,180,255),self.jb1pos,pygame.mouse.get_pos(),3)
--
cgit v0.9.1