made the lamp a lamp
authoradrianna <adrianna.pinska@gmail.com>
Fri, 9 Sep 2016 20:32:34 +0000 (22:32 +0200)
committeradrianna <adrianna.pinska@gmail.com>
Fri, 9 Sep 2016 20:32:42 +0000 (22:32 +0200)
data/stations/station-alpha.json
tabakrolletjie/lights.py

index 7eadc6edf497c25342119f46813fc3a30ac81f93..f14f82e0b49b52628268df20295e7df6f918cfb1 100644 (file)
@@ -37,7 +37,7 @@
       "intensity": 0.8
     },
     {
-      "type": "spotlight",
+      "type": "lamp",
       "colour": "yellow",
       "position": [500, 500],
       "direction": -90.0,
index 9f0005d1bb377e7fd3d49b663880feb6eba2d23e..136f10f1f6839976545e2143409f2497ecf658d2 100644 (file)
@@ -216,9 +216,18 @@ class BaseLight(object):
         pass
 
 
+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)