From cd5300030ba5dba18bb51af5370df0a7ba6fc95e Mon Sep 17 00:00:00 2001 From: Suwako Moriya Date: Sat, 1 Feb 2020 18:24:24 +0100 Subject: [PATCH] Checkpoint --- mecha.py | 8 ++++---- visual.py | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mecha.py b/mecha.py index bbf92b2..c96e300 100755 --- a/mecha.py +++ b/mecha.py @@ -14,7 +14,7 @@ class Mass(): self.pos = np.array(pos, dtype='float64') self.speed = np.array(speed, dtype='float64') self.mass = mass - self.G = 0.0000001 + self.G = 0.000001 def tick(self): self.pos += self.speed @@ -22,9 +22,9 @@ class Mass(): def ref(self, origin=np.array((0, 0), dtype='float64'), speed=np.array((0, 0), dtype='float64')): - self.pos -= origin - self.speed -= speed - + #self.pos -= origin + #self.speed -= speed + pass def apply_gravity(self, elements): for element in elements: d = element.pos - self.pos diff --git a/visual.py b/visual.py index c794c7b..0232beb 100755 --- a/visual.py +++ b/visual.py @@ -70,7 +70,7 @@ if __name__ == "__main__": tick = (time.time(), time.time(), 0) screen = pygame.display.set_mode(size, flags=pygame.RESIZABLE) - elements = [Player(speed=(5, 0), pos=(10, -200)), Player(speed=(-5, 0), pos=(10, 200), mass = 2), Planet(mass=200)] + elements = [Player(speed=(5, 0), pos=(10, -200)), Player(speed=(-5, 0), pos=(10, 200), mass = 1), Planet(mass=200)] reference = 1 joy=[1, 1] while 1: @@ -103,8 +103,9 @@ if __name__ == "__main__": elements[1].mecha.orientation=joy[0]*(-3) for element in elements: element.mecha.apply_gravity([element.mecha for element in elements]) + for element in elements: element.mecha.tick() - ori,speed=origin=elements[1].mecha.pos, origin=elements[1].mecha.speed + ori,speed=origin=elements[0].mecha.pos, elements[0].mecha.speed for element in elements: element.mecha.ref(origin=ori, speed=speed) if i < 2: