From 1094dfe625913999361ea943e7a214ffc38a9738 Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Fri, 9 Sep 2016 23:52:36 +0200 Subject: [PATCH] Remove old direction and spread parameters. --- data/stations/station-alpha.json | 4 ---- data/stations/station-beta.json | 2 -- tabakrolletjie/lights.py | 7 ------- tabakrolletjie/scenes/day.py | 1 - 4 files changed, 14 deletions(-) diff --git a/data/stations/station-alpha.json b/data/stations/station-alpha.json index f14f82e..40adfea 100644 --- a/data/stations/station-alpha.json +++ b/data/stations/station-alpha.json @@ -29,8 +29,6 @@ "type": "spotlight", "colour": "red", "position": [700, 500], - "direction": 90.0, - "spread": 45.0, "radius_limits": [20, 400], "angle_limits": [90, 180], "angular_velocity": 5, @@ -40,8 +38,6 @@ "type": "lamp", "colour": "yellow", "position": [500, 500], - "direction": -90.0, - "spread": 45.0, "intensity": 0.5 } ] diff --git a/data/stations/station-beta.json b/data/stations/station-beta.json index 6a6b6bc..f2f535b 100644 --- a/data/stations/station-beta.json +++ b/data/stations/station-beta.json @@ -29,8 +29,6 @@ "type": "spotlight", "colour": "red", "position": [700, 500], - "direction": 90.0, - "spread": 45.0, "radius_limits": [20, 400], "intensity": 0.8 } diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py index 12b3fe0..4c54a49 100644 --- a/tabakrolletjie/lights.py +++ b/tabakrolletjie/lights.py @@ -227,18 +227,11 @@ class BaseLight(object): class Lamp(BaseLight): FITTING_IMG = "lamp.png" - def __init__(self, **kw): - kw.pop("direction", None) - kw.pop("spread", None) - super(Lamp, self).__init__(**kw) - class SpotLight(BaseLight): FITTING_IMG = "spotlight.png" def __init__(self, **kw): - kw.pop("direction", None) - kw.pop("spread", None) self.angular_velocity = kw.pop("angular_velocity", None) super(SpotLight, self).__init__(**kw) diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py index 1c518c5..670b05c 100644 --- a/tabakrolletjie/scenes/day.py +++ b/tabakrolletjie/scenes/day.py @@ -111,7 +111,6 @@ class DayScene(BaseScene): "type": "spotlight", "colour": colour, "position": pos, - "direction": 45, "angle_limits": [0, 90], "intensity": 0.5, "radius_limits": [0, 100], -- 2.34.1