From b606a27d7ce7e91250c0c8795270bb1862e15e26 Mon Sep 17 00:00:00 2001 From: Raymond Hogenson Date: Sun, 16 Oct 2016 12:54:32 -0400 Subject: Create new sorts of fish to be displayed --- fish_types.py | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 fish_types.py (limited to 'fish_types.py') diff --git a/fish_types.py b/fish_types.py new file mode 100644 index 0000000..63e082e --- /dev/null +++ b/fish_types.py @@ -0,0 +1,231 @@ +from __future__ import division +import color as C +import functools +import constants +import random +import math + +class Fish(object): + """Object displayed on the bridge, probably a fish. + + Must override color (or color_at), drag, width, height, tailThreshold, + tailDuration, tailAccelMag + """ + def __init__(self, x=None, y=None): + """Create fish with default parameters.""" + if x is not None: + self.x = x + elif not hasattr(self, 'x'): + self.x = 0 + if x is not None: + self.y = y + elif not hasattr(self, 'y'): + self.y = 0.5 + self.speed = C.Vector(0, 0) + self.tailAcceleration = C.Vector(self.tailAccelMag, 0) + self.tailMoving = False + self.tailMoveCount = 0 + + @classmethod + def by_type(cls, fish_type): + if (fish_type == 'jellyfish'): + return Jellyfish() + if fish_type == 'dolphin': + return Dolphin() + if fish_type == 'boat': + return Boat() + if fish_type == 'dory': + return Dory() + if fish_type == 'nemo': + return Nemo() + if fish_type == 'whale': + return Whale() + if fish_type == 'stingray': + return Stingray() + if fish_type == 'eel': + return Eel() + if fish_type == 'shark': + return Shark() + + def update(self): + """Swim gently to the other side of the bridge.""" + if self.x > constants.BRIDGE_WIDTH or self.x < -self.width: + return False + + 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] + + return True + + 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 = C.Vector(self.tailAccelMag, 0).rot2d(theta) + + def color_at(self, x, y): + """May be overridden to provide multicolored fish.""" + return self.color + + +class Jellyfish(Fish): + color = C.HSV(298/360, 89/100, 53/100).to_RGB() + drag = -0.01 + width = 15 + height = 1.5 + tailThreshold = 0.001 + tailDuration = 4 + tailAccelMag = 0.001 + + +class Dolphin(Fish): + color = C.HSV(18/360, 0/100, 40/100).to_RGB() + drag = -0.09 + width = 35 + height = 1.5 + tailThreshold = 0.7 + tailDuration = 2 + tailAccelMag = 0.8 + gravity = C.Vector(0, -0.01) + + direction_fixed = False + def update(self): + """Swim gently to the other side of the bridge.""" + if self.x > constants.BRIDGE_WIDTH or self.x < -self.width: + return False + + if not self.direction_fixed: + self.tailAcceleration = self.tailAcceleration.rot2d(math.pi / 32) + self.direction_fixed = True + + self.speed += self.drag * self.speed + self.gravity + if self.y <= 0.25: + self.tailMoving = True + 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] + + return True + + +class Boat(Fish): + color = C.HSV(24/360, 45/100, 44/100).to_RGB() + drag = 0 + width = 23 + height = 1 + tailDuration = 1 + tailAccelMag = 0.25 + tailThreshold = tailAccelMag + y = 1 + + def fix_direction(self): + pass + + +class Dory(Fish): + # Need to try this on the bridge + color = C.HSV(235/360, 100/100, 88/100).to_RGB() + drag = -0.1 + width = 23 + height = 1.5 + tailThreshold = 0.7 + tailDuration = 2 + tailAccelMag = 0.4 + + +class Nemo(Fish): + color = C.HSV(31/360, 100/100, 50/100).to_RGB() + drag = -0.09 + width = 23 + height = 1.5 + tailThreshold = 0.7 + tailDuration = 2 + tailAccelMag = 0.4 + + +class Whale(Fish): + drag = -0.2 + width = 50 + height = 2 + tailThreshold = 0.7 + tailDuration = 3 + tailAccelMag = 0.4 + + white_x_min = 30 + white_x_width = 8 + white_y_min = 1 + white_y_height = 1 + + def color_at(self, x, y): + """Mostly copied from compute_coverage. + + The point here is to render that white part of the Orca. + """ + white_x_min = self.white_x_min + self.x + white_x_max = white_x_min + self.white_x_width + white_y_min = self.white_y_min + self.y + white_y_max = white_y_min + self.white_y_height + min_x = min(max(x, white_x_min), x + 1) + max_x = max(min(x + 1, white_x_max), x) + min_y = min(max(y, white_y_min), y + 1) + max_y = max(min(y + 1, white_y_max), y) + coverage = (max_x - min_x) * (max_y - min_y) + return C.white * coverage + + +class Stingray(Fish): + color = C.HSV(0/360, 0/100, 50/100).to_RGB() + drag = -0.09 + width = 15 + height = 2 + tailThreshold = 0.7 + tailDuration = 2 + tailAccelMag = 0.2 + + +class Eel(Fish): + color = C.HSV(109/360, 83/100, 35/100).to_RGB() + drag = -0.09 + width = 23 + height = 1.5 + tailThreshold = 0.7 + tailDuration = 2 + tailAccelMag = 0.4 + + +class Shark(Fish): + color = C.HSV(0/360, 0/100, 50/100).to_RGB() + drag = -0.2 + width = 50 + height = 2 + tailThreshold = 0.7 + tailDuration = 3 + tailAccelMag = 0.4 + + +def rand_in_range(low, high): + return random.random() * (high - low) + low -- cgit v1.3.1 From e717c90bbdc3089f64c943afb98f44df031cab18 Mon Sep 17 00:00:00 2001 From: Raymond Hogenson Date: Sun, 16 Oct 2016 14:35:05 -0400 Subject: Improve eel movement --- fish_show.py | 2 +- fish_types.py | 47 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 42 insertions(+), 7 deletions(-) (limited to 'fish_types.py') diff --git a/fish_show.py b/fish_show.py index 62a07c9..cb80d55 100644 --- a/fish_show.py +++ b/fish_show.py @@ -51,7 +51,7 @@ def compute_coverage(fish, x, y): min_y = min(max(y, fish.y), y + 1) max_y = max(min(y+1, fish.y + fish.height), y) coverage = (max_x - min_x) * (max_y - min_y) - return coverage * scale + return coverage * scale * fish.alpha_at(x, y) def pick_HSV(depth): diff --git a/fish_types.py b/fish_types.py index 63e082e..73b58c1 100644 --- a/fish_types.py +++ b/fish_types.py @@ -25,6 +25,8 @@ class Fish(object): self.tailAcceleration = C.Vector(self.tailAccelMag, 0) self.tailMoving = False self.tailMoveCount = 0 + if not hasattr(self, 'theta_scale'): + self.theta_scale = 12 @classmethod def by_type(cls, fish_type): @@ -71,14 +73,14 @@ class Fish(object): def fix_direction(self): min_theta = -0.32 max_theta = 0.32 - if self.y < 0: + if self.y + self.height < 0: min_theta = 0 - if self.y > 1: + if self.y > 2: max_theta = 0 #theta = rand_in_range(min_theta, max_theta) theta = random.gauss( - (max_theta+min_theta)/2, (max_theta - min_theta)/12 + (max_theta+min_theta)/2, (max_theta - min_theta)/self.theta_scale ) self.tailAcceleration = C.Vector(self.tailAccelMag, 0).rot2d(theta) @@ -86,6 +88,12 @@ class Fish(object): """May be overridden to provide multicolored fish.""" return self.color + def alpha_at(self, x, y): + """Return an additional scale amount for clear parts. + + This is overridden to have oddly shaped fish, such as the eel.""" + return 1 + class Jellyfish(Fish): color = C.HSV(298/360, 89/100, 53/100).to_RGB() @@ -174,6 +182,9 @@ class Whale(Fish): tailThreshold = 0.7 tailDuration = 3 tailAccelMag = 0.4 + theta_scale = 20 + + y = 0 white_x_min = 30 white_x_width = 8 @@ -210,11 +221,34 @@ class Stingray(Fish): class Eel(Fish): color = C.HSV(109/360, 83/100, 35/100).to_RGB() drag = -0.09 - width = 23 - height = 1.5 + width = 50 + height = 2 tailThreshold = 0.7 tailDuration = 2 - tailAccelMag = 0.4 + tailAccelMag = 0.1 + + front_offset = 0 + y = 0 + + def alpha_at(self, x, y): + rel_x = x - self.x + rel_y = y - self.y + eel_height = math.sin( + 2 * math.pi * (rel_x + self.front_offset) / self.width + ) / 2 + 0.5 + y_blend = abs(rel_y - eel_height) + if y_blend > 0.5: + return 0 + return (1 - y_blend) + + def update(self): + self.front_offset += abs(self.speed) + if self.front_offset > self.width: + self.front_offset = 0 + return super(Eel, self).update() + + def fix_direction(self): + pass class Shark(Fish): @@ -225,6 +259,7 @@ class Shark(Fish): tailThreshold = 0.7 tailDuration = 3 tailAccelMag = 0.4 + theta_scale = 20 def rand_in_range(low, high): -- cgit v1.3.1 From 0f54d73feea16124e92ff6baab78e3d3d3d97fa3 Mon Sep 17 00:00:00 2001 From: Raymond Hogenson Date: Sun, 16 Oct 2016 14:38:44 -0400 Subject: Use staticmethod instead of classmethod in by_type --- fish_types.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fish_types.py') diff --git a/fish_types.py b/fish_types.py index 73b58c1..61cd36a 100644 --- a/fish_types.py +++ b/fish_types.py @@ -28,8 +28,8 @@ class Fish(object): if not hasattr(self, 'theta_scale'): self.theta_scale = 12 - @classmethod - def by_type(cls, fish_type): + @staticmethod + def by_type(fish_type): if (fish_type == 'jellyfish'): return Jellyfish() if fish_type == 'dolphin': -- cgit v1.3.1