diff options
Diffstat (limited to 'fish_show.py')
| -rw-r--r-- | fish_show.py | 60 |
1 files changed, 51 insertions, 9 deletions
diff --git a/fish_show.py b/fish_show.py index cda4174..7cd8300 100644 --- a/fish_show.py +++ b/fish_show.py @@ -1,5 +1,6 @@ from __future__ import division import color +from color import Vector import random import constants from constants import * @@ -18,15 +19,53 @@ class Fish(object): self.speed = step self.step = step + self.speed = Vector(0.1, 0) + self.drag = -0.09 + + self.tailAccelMag = 0.4 + self.tailAcceleration = Vector(self.tailAccelMag, 0) + self.tailDuration = 2 + self.tailMoving = False + self.tailThreshold = 0.7 + self.tailMoveCount = 0 + def update(self): """Swim gently to the other side of the bridge.""" - self.x += self.step - if self.x > 200: - self.x = 0 - self.y = 0.25 + 0.25 * math.sin(math.pi * self.x / 10) - #theta = random.random() * math.pi / 2 - math.pi / 4 - #self.y += 0.01 * math.sin(theta) - #print(self.y) + self.speed += self.drag * self.speed + if abs(self.speed) < self.tailThreshold: + self.tailMoving = True + self.tailThreshold = rand_in_range(0.5, 1.4) + self.fix_direction() + if self.tailMoveCount > self.tailDuration: + self.tailMoveCount = 0 + self.tailMoving = False + if self.tailMoving: + self.speed += self.tailAcceleration + self.tailMoveCount += 1 + self.x += self.speed.components[0] + self.y += self.speed.components[1] + # + # THIS NEEDS TO CHANGE + # + if self.x > constants.BRIDGE_WIDTH: + self.x = -self.width + if self.x < -self.width: + self.x = constants.BRIDGE_WIDTH + + print(self.x, self.y) + + def fix_direction(self): + min_theta = -0.32 + max_theta = 0.32 + if self.y < 0: + min_theta = 0 + if self.y > 1: + max_theta = 0 + + #theta = rand_in_range(min_theta, max_theta) + theta = random.gauss((max_theta+min_theta)/2, (max_theta - min_theta)/12) + self.tailAcceleration = Vector(self.tailAccelMag, 0).rot2d(theta) + class Light(object): """Represent a bridge light and its state.""" @@ -108,10 +147,13 @@ class FishShow(Show): self.lights = [Light(x, y, self.bridge.get_light(x, y)) for y in xrange(self.bridge.HEIGHT) for x in xrange(self.bridge.WIDTH)] - self.fish = Fish(0, 0, 23, 1.5, color.black, 1) + self.fish = Fish(0, 0.5, 23, 1.5, color.black, 1) def update(self): self.fish.update() for light in self.lights: - light.update(self.fish)
\ No newline at end of file + light.update(self.fish) + +def rand_in_range(low, high): + return random.random() * (high - low) + low |