allow pan-tilt to be applied to light, parent or grandparent

pan-tilt affects delta-rotation, so rotation can be used for setting centre

Author: BryanCrotaz

__init__.py

@@ -23,7 +23,7 @@
 
 import bpy
 from bpy.app.handlers import persistent
-from bpy.props import BoolProperty, IntProperty, StringProperty
+from bpy.props import BoolProperty, IntProperty, StringProperty, EnumProperty
 
 from .src.artnet_socket import ArtNetSocket
 from .src.universe_store import UniverseStore, ALL_UNIVERSES
@@ -36,9 +36,25 @@
 GLOBAL_DATA = {
     ArtNetSocket: ArtNetSocket,
     BlenderSynchroniser: BlenderSynchroniser,
-    FixtureStore: FixtureStore
+    FixtureStore: FixtureStore,
 }
 
+PAN_TILT_TARGETS = [
+    ('lx', 'Light x', 'tilt around light x axis', 0),
+    ('ly', 'Light y', 'tilt around light y axis', 1),
+    ('lz', 'Light z', 'tilt around light z axis', 2),
+    None,
+    ('px', 'Parent x', 'tilt around parent x axis', 3),
+    ('py', 'Parent y', 'tilt around parent y axis', 4),
+    ('pz', 'Parent z', 'tilt around parent z axis', 5),
+    None,
+    ('gpx', 'Grandparent x', 'tilt around grandparent x axis', 6),
+    ('gpy', 'Grandparent y', 'tilt around grandparent y axis', 7),
+    ('gpz', 'Grandparent z', 'tilt around grandparent z axis', 8),
+    None,
+    ('none', 'Ignore', 'ignore tilt from Artnet', 9)
+]
+
 bl_info = {
     "name": "ArtNet Lighting Controller",
     "description": "Combine with Evee to get a real "
@@ -87,24 +103,70 @@ def register():
     bpy.app.handlers.load_post.append(_on_file_loaded)
     # add light properties
     bpy.types.Light.artnet_enabled = BoolProperty(
-        name="artnet_enabled",
+        name="Enabled",
         update=_light_data_change
     )
     bpy.types.Light.artnet_universe = IntProperty(
-        name="artnet_universe",
+        name="Universe",
         update=_light_data_change
     )
     bpy.types.Light.artnet_fixture_type = StringProperty(
-        name="artnet_fixture_type",
+        name="Fixture Type",
         update=_light_data_change
     )
     bpy.types.Light.artnet_base_address = IntProperty(
-        name="artnet_base_address",
+        name="Base DMX Address",
         update=_light_data_change
     )
+    bpy.types.Light.artnet_pan_target = EnumProperty(
+        name="Pan Target",
+        items=PAN_TILT_TARGETS,
+        default="lx",
+        update=_light_data_change,
+        get=get_pan_target,
+        set=set_pan_target
+    )
+    bpy.types.Light.artnet_tilt_target = EnumProperty(   
+        name="Tilt Target",
+        items=PAN_TILT_TARGETS,
+        default="lz",
+        update=_light_data_change,
+        get=get_tilt_target,
+        set=set_tilt_target
+    )
+    bpy.types.Light.artnet_old_pan_target = EnumProperty(
+        name="Old Pan Target",
+        items=PAN_TILT_TARGETS,
+        default="none"
+    )
+    bpy.types.Light.artnet_old_tilt_target = EnumProperty(
+        name="Old Tilt Target",
+        items=PAN_TILT_TARGETS,
+        default="none"
+    )
     # register UI Panel
     bpy.utils.register_class(LightArtNetPanel)
 
+def get_pan_target(self):
+    return self.get("artnet_pan_target", "lz")
+
+def set_pan_target(self, value):
+    self.artnet_old_pan_target = get_pan_tilt_target_from_int(self.get("artnet_pan_target", 9))   
+    self["artnet_pan_target"] = value
+
+def get_pan_tilt_target_from_int(value):
+    for target in PAN_TILT_TARGETS:
+        if target is not None:
+            if target[3] == value:
+                return target[0]
+
+def get_tilt_target(self):
+    return self.get("artnet_tilt_target", "lx")
+
+def set_tilt_target(self, value):
+    self.artnet_old_tilt_target = get_pan_tilt_target_from_int(self.get("artnet_tilt_target", 9))   
+    self["artnet_tilt_target"] = value
+
 def unregister():
     """Called from Blender"""
     if GLOBAL_DATA["ArtNetSocket"] is not None:
@@ -119,6 +181,8 @@ def unregister():
     del bpy.types.Light.artnet_fixture_type
     del bpy.types.Light.artnet_universe
     del bpy.types.Light.artnet_base_address
+    del bpy.types.Light.artnet_pan_target
+    del bpy.types.Light.artnet_tilt_target
 
 def _light_data_change(data, context):
     """One of the lights changed in the scene - update our internal data"""

src/blender_sync.py

@@ -59,7 +59,7 @@ def update_spot_light(self, obj, mapping, universe, raw_universe):
             # push the data
             obj.data.color = self._get_color(universe, raw_universe, base_address, fixture_type) or [0, 0, 0]
             obj.data.energy = self._get_power(universe, base_address, fixture_type)
-            obj.rotation_euler = self._get_rotation(universe, base_address, fixture_type) or [0, 0, 0]
+            self._set_rotation(obj, universe, base_address, fixture_type)
             obj.data.spot_size = self._get_zoom(universe, base_address, fixture_type) or 0
 
     def update_area_light(self, obj, mapping, universe, raw_universe):
@@ -69,7 +69,7 @@ def update_area_light(self, obj, mapping, universe, raw_universe):
             # push the data
             obj.data.color = self._get_color(universe, raw_universe, base_address, fixture_type) or [0, 0, 0]
             obj.data.energy = self._get_power(universe, base_address, fixture_type)
-            obj.rotation_euler = self._get_rotation(universe, base_address, fixture_type) or [0, 0, 0]
+            self._set_rotation(obj, universe, base_address, fixture_type)
 
     def _get_zoom(self, universe, base_address, fixture_type):
         try:
@@ -93,18 +93,56 @@ def _get_power(self, universe, base_address, fixture_type):
             return 1000 # because no data yet
 
     def _get_rotation(self, universe, base_address, fixture_type):
+        pan = universe[base_address + fixture_type["pan"]]
+        tilt = universe[base_address + fixture_type["tilt"]]
+        pan_range = fixture_type["panRange"]
+        tilt_range = fixture_type["tiltRange"]
+        pan -= 0.5
+        tilt -= 0.5
+        pan *= pan_range
+        tilt *= tilt_range
+        return [pan, tilt]
+
+    def _set_rotation(self, obj, universe, base_address, fixture_type):
+        if obj.data.artnet_old_pan_target != "none":
+            self.set_rotation_on_target(obj, obj.data.artnet_old_pan_target, 0)
+            obj.data.artnet_old_pan_target = "none"
+
+        if obj.data.artnet_old_tilt_target != "none":
+            self.set_rotation_on_target(obj, obj.data.artnet_old_tilt_target, 0)
+            obj.data.artnet_old_tilt_target = "none"
+
         try:
-            pan = universe[base_address + fixture_type["pan"]]
-            tilt = universe[base_address + fixture_type["tilt"]]
-            pan_range = fixture_type["panRange"]
-            tilt_range = fixture_type["tiltRange"]
-            pan -= 0.5
-            tilt -= 0.5
-            pan *= pan_range
-            tilt *= tilt_range
-            return [0, tilt, pan]
+            rotation = self._get_rotation(universe, base_address, fixture_type)
         except IndexError:
-            return [0, 0, 0] # null movement, because no data yet
+            print ('_set_rotation error')
+            pass # null movement, because no data yet
+        pan = rotation[0]
+        tilt = rotation[1]
+        self.set_rotation_on_target(obj, obj.data.artnet_pan_target, pan)
+        self.set_rotation_on_target(obj, obj.data.artnet_tilt_target, tilt)
+
+    def set_rotation_on_target(self, obj, target, rotation):
+        if target == "lx":
+            obj.delta_rotation_euler.x = rotation
+        elif target == "ly":
+            obj.delta_rotation_euler.y = rotation
+        elif target == "lz":
+            obj.delta_rotation_euler.z = rotation
+        elif obj.parent is not None:
+            if target == "px":
+                obj.parent.delta_rotation_euler.x = rotation
+            elif target == "py":
+                obj.parent.delta_rotation_euler.y = rotation
+            elif target == "pz":
+                obj.parent.delta_rotation_euler.z = rotation
+            elif obj.parent.parent is not None:
+                if target == "gpx":
+                    obj.parent.parent.delta_rotation_euler.x = rotation
+                elif target == "gpy":
+                    obj.parent.parent.delta_rotation_euler.y = rotation
+                elif target == "gpz":
+                    obj.parent.parent.delta_rotation_euler.z = rotation
 
     def _get_color(self, universe, rawUniverse, base_address, fixture_type):
         color_mode = fixture_type["colorMode"]

src/ui/light_panel.py

@@ -28,6 +28,8 @@ def draw(self, context):
             return
 
         layout = self.layout
-        layout.prop(data, "artnet_fixture_type", text="Fixture Type")
-        layout.prop(data, "artnet_universe", text="Universe")
-        layout.prop(data, "artnet_base_address", text="Base DMX Address")
+        layout.prop(data, "artnet_fixture_type")
+        layout.prop(data, "artnet_universe")
+        layout.prop(data, "artnet_base_address")
+        layout.prop(data, "artnet_pan_target")
+        layout.prop(data, "artnet_tilt_target")