Add extra light controls to delta lights

namely importance multiplier and cast indirect light toggle
luisbarrancos · Mar 3, 2019 · 7aa2190 · 7aa2190
1 parent 132b5d8
commit 7aa2190
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 11 deletions.
diff --git a/scripts/appleseedMaya/AETemplates/__init__.py b/scripts/appleseedMaya/AETemplates/__init__.py
@@ -91,6 +91,12 @@ def buildBody(self, nodeName):
             self.__buildVisibilitySection()
             self.endLayout()
 
+        elif self.thisNode.type() in {'pointLight', 'spotLight', 'directionalLight'}:
+            self.beginLayout('appleseed', collapse=1)
+            self.addControl('asCastIndirectLight', label='Cast Indirect Light')
+            self.addControl('asImportanceMultiplier', label='Importance Multiplier')
+            self.endLayout()
+
         elif self.thisNode.type() == 'bump2d':
             self.beginLayout('appleseed', collapse=1)
             self.addControl('asNormalMapMode', label='Map Mode')

diff --git a/src/appleseedmaya/exporters/arealightexporter.cpp b/src/appleseedmaya/exporters/arealightexporter.cpp
@@ -109,16 +109,6 @@ void AreaLightExporter::createEntities(
     params.insert("width", 2.0f);
     params.insert("height", 2.0f);
 
-    bool castIndirectLight = true;
-    AttributeUtils::get(node(), "asCastIndirectLight", castIndirectLight);
-
-    params.insert("cast_indirect_light", castIndirectLight);
-
-    float importanceMultiplier = 1.0f;
-    AttributeUtils::get(node(), "asImportanceMultiplier", importanceMultiplier);
-
-    params.insert("importance_multiplier", importanceMultiplier);
-
     if (sessionMode() == AppleseedSession::ExportSession)
         m_lightMesh.reset(asr::MeshObjectFactory().create(objectName.asChar(), params));
     else

diff --git a/src/appleseedmaya/exporters/lightexporter.cpp b/src/appleseedmaya/exporters/lightexporter.cpp
@@ -128,17 +128,32 @@ void LightExporter::createEntities(
             asr::ColorEntityFactory::create(colorName.asChar(), params, values));
     }
 
+    auto extraControls = [&](asr::ParamArray& lightParams)
+    {
+        bool castIndirectLight = true;
+        AttributeUtils::get(node(), "asCastIndirectLight", castIndirectLight);
+        lightParams.insert("cast_indirect_light", castIndirectLight);
+
+        float importanceMultiplier = 1.0f;
+        AttributeUtils::get(node(), "asImportanceMultiplier", importanceMultiplier);
+        lightParams.insert("importance_multiplier", importanceMultiplier);
+    };
+
     if (depNodeFn.typeName() == "directionalLight")
     {
         lightFactory = lightFactories.lookup("directional_light");
         lightParams.insert("irradiance", colorName.asChar());
         lightParams.insert("irradiance_multiplier", intensity);
+
+        extraControls(lightParams);
     }
     else if (depNodeFn.typeName() == "pointLight")
     {
         lightFactory = lightFactories.lookup("point_light");
         lightParams.insert("intensity", colorName.asChar());
         lightParams.insert("intensity_multiplier", intensity);
+
+        extraControls(lightParams);
     }
     else if (depNodeFn.typeName() == "spotLight")
     {
@@ -154,6 +169,8 @@ void LightExporter::createEntities(
         AttributeUtils::get(node(), "penumbraAngle", penumbraAngle);
         const double outerAngle = coneAngle.asDegrees() + 2.0 * penumbraAngle.asDegrees();
         lightParams.insert("outer_angle", outerAngle);
+
+        extraControls(lightParams);
     }
     else
     {

diff --git a/src/appleseedmaya/extensionattributes.cpp b/src/appleseedmaya/extensionattributes.cpp
@@ -250,6 +250,7 @@ namespace
             MFnNumericData::kBoolean,
             false,
             status);
+        numAttrFn.setKeyable(false);
         AttributeUtils::makeInput(numAttrFn);
         modifier.addExtensionAttribute(nodeClass, attr);
 
@@ -258,8 +259,9 @@ namespace
             "asCastIndirectLight",
             "asCastIndirectLight",
             MFnNumericData::kBoolean,
-            false,
+            true,
             status);
+        numAttrFn.setKeyable(false);
         AttributeUtils::makeInput(numAttrFn);
         modifier.addExtensionAttribute(nodeClass, attr);
 
@@ -280,6 +282,47 @@ namespace
         modifier.doIt();
     }
 
+    void addDeltaLightExtensionAttributes()
+    {
+        for (const MString& light : {"pointLight", "spotLight", "directionalLight"})
+        {
+            MNodeClass nodeClass(light);
+            MDGModifier modifier;
+
+            MStatus status;
+
+            MFnNumericAttribute numAttrFn;
+
+            MObject attr = createNumericAttribute<bool>(
+                numAttrFn,
+                "asCastIndirectLight",
+                "asCastIndirectLight",
+                MFnNumericData::kBoolean,
+                true,
+                status);
+            numAttrFn.setKeyable(false);
+
+            AttributeUtils::makeInput(numAttrFn);
+            modifier.addExtensionAttribute(nodeClass, attr);
+
+            attr = createNumericAttribute<float>(
+                       numAttrFn,
+                       "asImportanceMultiplier",
+                       "asImportanceMultiplier",
+                       MFnNumericData::kFloat,
+                       1.0f,
+                       status);
+            numAttrFn.setMin(0.0f);
+            numAttrFn.setSoftMax(10.0f);
+
+            AttributeUtils::makeInput(numAttrFn);
+            modifier.addExtensionAttribute(nodeClass, attr);
+
+            addVisibilityExtensionAttributes(nodeClass, modifier);
+            modifier.doIt();
+        }
+    }
+
     void addBump2dExtensionAttributes()
     {
         MNodeClass nodeClass("bump2d");
@@ -416,6 +459,7 @@ MStatus addExtensionAttributes()
 {
     addMeshExtensionAttributes();
     addAreaLightExtensionAttributes();
+    addDeltaLightExtensionAttributes();
     addBump2dExtensionAttributes();
     addShadingEngineExtensionAttrs();
     addCameraExtensionAttrs();