Add type IDs, NEtemplates, icons for new shaders

namely asASCCDL, asBlendNormals, asRaySwitchSurface, asSurfaceLuminance.

scripts/appleseedMaya/AETemplates/NEasAscCdlTemplate.xml

@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<templates>
+    <using package='maya'/>
+    <template name='NEasAscCdl'>
+        <attribute name='outColor' type='maya.float3'>
+            <label>Out Color</label>
+        </attribute>
+        <attribute name='color' type='maya.float3'>
+            <label>Color</label>
+        </attribute>
+        <attribute name='slope' type='maya.float'>
+            <label>Slope</label>
+        </attribute>
+        <attribute name='offset' type='maya.float'>
+            <label>Offset</label>
+        </attribute>
+        <attribute name='power' type='maya.float'>
+            <label>Power</label>
+        </attribute>
+        <attribute name='saturation' type='maya.float'>
+            <label>Saturation</label>
+        </attribute>
+    </template>
+    <view name='NEDefault' template='NEasAscCdl'>
+        <property name='outColor'/>
+        <property name='color'/>
+        <property name='slope'/>
+        <property name='offset'/>
+        <property name='power'/>
+        <property name='saturation'/>
+    </view>
+</templates>

scripts/appleseedMaya/AETemplates/NEasBlendNormalsTemplate.xml

@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<templates>
+    <using package='maya'/>
+    <template name='NEasBlendNormals'>
+        <attribute name='outNormal' type='maya.float3'>
+            <label>Out Normal</label>
+        </attribute>
+        <attribute name='normalA' type='maya.float3'>
+            <label>Normal A</label>
+        </attribute>
+        <attribute name='normalB' type='maya.float3'>
+            <label>Normal B</label>
+        </attribute>
+        <attribute name='weight' type='maya.float'>
+            <label>Weight</label>
+        </attribute>
+    </template>
+    <view name='NEDefault' template='NEasBlendNormals'>
+        <property name='outNormal'/>
+        <property name='normalA'/>
+        <property name='normalB'/>
+        <property name='weight'/>
+    </view>
+</templates>

scripts/appleseedMaya/AETemplates/NEasRaySwitchSurfaceTemplate.xml

@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<templates>
+    <using package='maya'/>
+    <template name='NEasRaySwitchSurface'>
+        <attribute name='outColor' type='maya.float3'>
+            <label>Out Color</label>
+        </attribute>
+        <attribute name='materialCamera' type='maya.float3'>
+            <label>Material Camera</label>
+        </attribute>
+        <attribute name='materialShadow' type='maya.float3'>
+            <label>Material Shadow</label>
+        </attribute>
+        <attribute name='materialTransparency' type='maya.float3'>
+            <label>Material Transparency</label>
+        </attribute>
+        <attribute name='materialDiffuse' type='maya.float3'>
+            <label>Material Diffuse</label>
+        </attribute>
+        <attribute name='materialSpecular' type='maya.float3'>
+            <label>Material Specular</label>
+        </attribute>
+        <attribute name='materialGlossy' type='maya.float3'>
+            <label>Material Glossy</label>
+        </attribute>
+        <attribute name='materialLight' type='maya.float3'>
+            <label>Material Light</label>
+        </attribute>
+        <attribute name='materialSubsurface' type='maya.float3'>
+            <label>Material Subsurface</label>
+        </attribute>
+    </template>
+    <view name='NEDefault' template='NEasRaySwitchSurface'>
+        <property name='outColor'/>
+        <property name='materialCamera'/>
+        <property name='materialShadow'/>
+        <property name='materialTransparency'/>
+        <property name='materialDiffuse'/>
+        <property name='materialSpecular'/>
+        <property name='materialGlossy'/>
+        <property name='materialLight'/>
+        <property name='materialSubsurface'/>
+    </view>
+</templates>

scripts/appleseedMaya/AETemplates/NEasSurfaceLuminanceTemplate.xml

@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<templates>
+    <using package='maya'/>
+    <template name='NEasSurfaceLuminance'>
+        <attribute name='outColor' type='maya.float3'>
+            <label>Out Color</label>
+        </attribute>
+        <attribute name='color' type='maya.float3'>
+            <label>Color</label>
+        </attribute>
+    </template>
+    <view name='NEDefault' template='NEasSurfaceLuminance'>
+        <property name='outColor'/>
+        <property name='color'/>
+    </view>
+</templates>

scripts/appleseedMaya/AETemplates/__init__.py

@@ -83,10 +83,20 @@ def buildBody(self, nodeName):
             self.beginLayout('appleseed', collapse=1)
             self.addControl('asIntensityScale', label='Intensity Scale')
             self.addControl('asExposure', label='Exposure')
+            self.addSeparator()
             self.addControl('asNormalize', label='Normalize')
+            self.addControl('asCastIndirectLight', label='Cast Indirect Light')
+            self.addSeparator()
+            self.addControl('asImportanceMultiplier', label='Importance Multiplier')
             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')
@@ -105,12 +115,21 @@ def buildBody(self, nodeName):
 
         elif self.thisNode.type() == 'mesh':
             self.beginLayout('appleseed', collapse=1)
+
             self.__buildVisibilitySection()
+
+            self.beginLayout('Alpha Map', collapse=1)
             self.callCustom(
                 self.meshAlphaMapNew, self.meshAlphaMapUpdate, 'asAlphaMap')
-            self.addControl('asMediumPriority', label='Medium Priority')
-            self.addControl('asIsPhotonTarget', label='Photon Target')
+            self.endLayout()
+
+            self.beginLayout('Rendering', collapse=1)
+            self.addControl('asMediumPriority', label='IOR Medium Priority')
+            self.addSeparator()
             self.addControl('asSubsurfaceSet', label='SSS Set')
+            self.addSeparator()
+            self.addControl('asIsPhotonTarget', label='SPPM Photon Target')
+            self.endLayout()
 
             self.beginLayout('Export', collapse=1)
             self.addControl('asExportUVs', label='Export UVs')
@@ -123,6 +142,7 @@ def buildBody(self, nodeName):
         elif self.thisNode.type() == 'shadingEngine':
             self.beginLayout('appleseed', collapse=1)
             self.addControl('asDoubleSided', label='Double Sided')
+            self.addSeparator()
             self.addControl('asShadingSamples', label='Shading Samples')
             self.endLayout()
 

scripts/appleseedMaya/AETemplates/appleseedPhysicalSkyLightTemplate.py

@@ -52,18 +52,21 @@ def buildBody(self, nodeName):
         self.beginLayout('Sky Attributes', collapse=0)
         self.addControl('sunTheta')
         self.addControl('sunPhi')
+        self.addSeparator()
         self.addControl('turbidity')
         self.addControl('turbidityScale')
-        self.addControl('turbidityScale')
+        self.addSeparator()
         self.addControl('luminanceScale')
         self.addControl('luminanceGamma')
         self.addControl('saturationScale')
+        self.addSeparator()
         self.addControl('horizonShift')
         self.addControl('groundAlbedo')
         self.endLayout()
 
         self.beginLayout('Sun Attributes', collapse=0)
         self.addControl('sunEnable')
+        self.addSeparator()
         self.addControl('sunRadianceScale')
         self.addControl('sunSizeScale')
         self.endLayout()

scripts/appleseedMaya/AETemplates/appleseedSkyDomeLightTemplate.py

@@ -51,8 +51,10 @@ def beginLayout(self, name, collapse=True):
     def buildBody(self, nodeName):
         self.beginLayout('Map', collapse=0)
         self.addControl("map")
+        self.addSeparator()
         self.addControl("intensity")
         self.addControl("exposure")
+        self.addSeparator()
         self.addControl("hShift")
         self.addControl("vShift")
         self.endLayout()

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
     {

src/appleseedmaya/exporters/shadingnodeexporter.cpp

@@ -513,7 +513,7 @@ void ShadingNodeExporter::exportValue(
         {
             bool boolValue;
             if (AttributeUtils::get(plug, boolValue))
-                ss << "int " << boolValue ? "1" : "0";
+                ss << "int " << (boolValue ? "1" : "0"); // ?: has lower precedence than <<
         }
     }
     else if (paramInfo.paramType == "matrix")
@@ -545,8 +545,8 @@ void ShadingNodeExporter::exportValue(
         {
             MObject attr = plug.attribute();
             MFnEnumAttribute fnEnumAttr(attr);
-            int intValue = plug.asInt();
-            MString value = fnEnumAttr.fieldName(intValue);
+            short shortValue = plug.asShort();
+            MString value = fnEnumAttr.fieldName(shortValue);
             ss << "string " << value;
         }
         else

src/appleseedmaya/extensionattributes.cpp

@@ -44,6 +44,7 @@
 #include <maya/MFnStringData.h>
 #include <maya/MFnTypedAttribute.h>
 #include <maya/MNodeClass.h>
+#include <maya/MString.h>
 #include "appleseedmaya/_endmayaheaders.h"
 
 namespace
@@ -225,6 +226,8 @@ namespace
             MFnNumericData::kFloat,
             1.0f,
             status);
+        numAttrFn.setSoftMin(0.0f);
+        numAttrFn.setSoftMax(10.0f);
         AttributeUtils::makeInput(numAttrFn);
         modifier.addExtensionAttribute(nodeClass, attr);
 
@@ -235,6 +238,8 @@ namespace
             MFnNumericData::kFloat,
             0.0f,
             status);
+        numAttrFn.setSoftMin(0.0f);
+        numAttrFn.setSoftMax(16.0f);
         AttributeUtils::makeInput(numAttrFn);
         modifier.addExtensionAttribute(nodeClass, attr);
 
@@ -245,13 +250,79 @@ namespace
             MFnNumericData::kBoolean,
             false,
             status);
+        numAttrFn.setKeyable(false);
+        AttributeUtils::makeInput(numAttrFn);
+        modifier.addExtensionAttribute(nodeClass, attr);
+
+        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 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");
@@ -388,6 +459,7 @@ MStatus addExtensionAttributes()
 {
     addMeshExtensionAttributes();
     addAreaLightExtensionAttributes();
+    addDeltaLightExtensionAttributes();
     addBump2dExtensionAttributes();
     addShadingEngineExtensionAttrs();
     addCameraExtensionAttrs();