add lightgroup support for volumes

Theverat · Theverat · commit eb059f09216a · 2018-05-27T18:38:22.000+02:00
diff --git a/nodes/__init__.py b/nodes/__init__.py
@@ -131,10 +131,14 @@ class LuxCoreNodeVolume(LuxCoreNode):
     # priority (IntProperty)
     # emission_id (IntProperty) (or maybe PointerProperty to light group later)
     # color_depth (FloatProperty) - for implicit colordepth texture
+    # lightgroup (StringProperty)
 
     def draw_common_buttons(self, context, layout):
         layout.prop(self, "priority")
-        # layout.prop(self, "emission_id")  # TODO correct lightgroup dropdown
+        lightgroups = context.scene.luxcore.lightgroups
+        layout.prop_search(self, "lightgroup",
+                           lightgroups, "custom",
+                           icon="OUTLINER_OB_LAMP", text="")
         layout.prop(self, "color_depth")
 
     def add_common_inputs(self):
@@ -171,6 +175,13 @@ def export_common_inputs(self, exporter, props, definitions):
         definitions["absorption"] = abs_col
         definitions["emission"] = self.inputs["Emission"].export(exporter, props)
 
+        lightgroups = exporter.scene.luxcore.lightgroups
+        lightgroup_id = lightgroups.get_id_by_name(self.lightgroup)
+        definitions["emission.id"] = lightgroup_id
+        exporter.lightgroup_cache.add(lightgroup_id)
+
+        print(definitions)
+
     def export_scattering(self, exporter, props):
         scattering_col_socket = self.inputs["Scattering"]
         scattering_scale_socket = self.inputs["Scattering Scale"]
diff --git a/nodes/volumes/clear.py b/nodes/volumes/clear.py
@@ -1,5 +1,6 @@
-from bpy.props import IntProperty, FloatProperty
+from bpy.props import IntProperty, FloatProperty, StringProperty
 from .. import LuxCoreNodeVolume, COLORDEPTH_DESC
+from ...properties.light import LIGHTGROUP_DESC
 
 
 class LuxCoreNodeVolClear(LuxCoreNodeVolume):
@@ -12,6 +13,7 @@ class LuxCoreNodeVolClear(LuxCoreNodeVolume):
     color_depth = FloatProperty(name="Absorption Depth", default=1.0, min=0,
                                 subtype="DISTANCE", unit="LENGTH",
                                 description=COLORDEPTH_DESC)
+    lightgroup = StringProperty(name="Light Group", description=LIGHTGROUP_DESC)
 
     def init(self, context):
         self.add_common_inputs()
diff --git a/nodes/volumes/heterogeneous.py b/nodes/volumes/heterogeneous.py
@@ -1,8 +1,9 @@
 import math
 import bpy
-from bpy.props import IntProperty, BoolProperty, FloatProperty, PointerProperty
+from bpy.props import IntProperty, BoolProperty, FloatProperty, PointerProperty, StringProperty
 from ... import utils
 from .. import LuxCoreNodeVolume, COLORDEPTH_DESC
+from ...properties.light import LIGHTGROUP_DESC
 
 
 STEP_SIZE_DESCRIPTION = (
@@ -28,6 +29,8 @@ class LuxCoreNodeVolHeterogeneous(LuxCoreNodeVolume):
     color_depth = FloatProperty(name="Absorption Depth", default=1.0, min=0,
                                 subtype="DISTANCE", unit="LENGTH",
                                 description=COLORDEPTH_DESC)
+    lightgroup = StringProperty(name="Light Group", description=LIGHTGROUP_DESC)
+
     step_size = FloatProperty(name="Step Size", default=0.1, min=0.0001,
                               soft_min=0.01, soft_max=1,
                               subtype="DISTANCE", unit="LENGTH",
diff --git a/nodes/volumes/homogeneous.py b/nodes/volumes/homogeneous.py
@@ -1,5 +1,6 @@
-from bpy.props import IntProperty, BoolProperty, FloatProperty
+from bpy.props import IntProperty, BoolProperty, FloatProperty, StringProperty
 from .. import LuxCoreNodeVolume, COLORDEPTH_DESC
+from ...properties.light import LIGHTGROUP_DESC
 
 
 class LuxCoreNodeVolHomogeneous(LuxCoreNodeVolume):
@@ -12,6 +13,7 @@ class LuxCoreNodeVolHomogeneous(LuxCoreNodeVolume):
     color_depth = FloatProperty(name="Absorption Depth", default=1.0, min=0,
                                 subtype="DISTANCE", unit="LENGTH",
                                 description=COLORDEPTH_DESC)
+    lightgroup = StringProperty(name="Light Group", description=LIGHTGROUP_DESC)
 
     multiscattering = BoolProperty(name="Multiscattering", default=False)
 
