Remove old direction and spread parameters.

diff --git a/data/stations/station-alpha.json b/data/stations/station-alpha.json
index f14f82e0b49b52628268df20295e7df6f918cfb1..40adfeaf61ac0950c2f7ab26321b5e9f3f721036 100644 (file)
--- 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 6a6b6bc26902447a6b963d1d1f84a507e8c4de00..f2f535b3d59cff57f8ba6c7885af09f537de9795 100644 (file)
--- 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 12b3fe07a07898483930c8fb90f08ea2c5ba47ec..4c54a49f32f9143cc6367e79b94d4bc4651b6fc0 100644 (file)
--- 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 1c518c526514a0ea8871dedf5e2d87e4f831caf4..670b05cce897a54ec24e4dbefb0bef00322876c0 100644 (file)
--- 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],