add sytoons outline render,but not finish yet.

iceprincefounder · Nov 5, 2017 · f551548 · f551548
1 parent 937e460
commit f551548
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 123 deletions.
diff --git a/ae/syToonsTemplate.py b/ae/syToonsTemplate.py
@@ -11,7 +11,7 @@ def setup(self):
 		self.params["color_major"] = Param("color_major", "Major Color", "", "rgb", presets=None)
 		self.params["color_shadow"] = Param("color_shadow", "Shadow Color", "", "rgb", presets=None)
 		self.params["color_mask"] = Param("color_mask", "Mask Color", "", "rgb", presets=None)
-		self.params["color_extra"] = Param("color_extra", "Extra Color", "", "rgb", presets=None)
+		self.params["color_outline"] = Param("color_outline", "Outline Color", "", "rgb", presets=None)
 
 		self.params["lambert_color"] = Param("lambert_color", "Lambert Color", "", "rgb", presets=None)
 		self.params["shadow_ramp"] = Param("shadow_ramp", "Shadow Ramp", "", "rgb", presets=None)
@@ -24,7 +24,7 @@ def setup(self):
 		self.params["sy_aov_color_major"] = Param("sy_aov_color_major", "Aov Color Major", "", "rgb", presets=None)
 		self.params["sy_aov_color_shadow"] = Param("sy_aov_color_shadow", "Aov Color Shadow", "", "rgb", presets=None)
 		self.params["sy_aov_color_mask"] = Param("sy_aov_color_mask", "Aov Color Mask", "", "rgb", presets=None)
-		self.params["sy_aov_color_extra"] = Param("sy_aov_color_extra", "Aov Color Extra", "", "rgb", presets=None)
+		self.params["sy_aov_outline"] = Param("sy_aov_outline", "Aov Outline", "", "rgb", presets=None)
 		self.params["sy_aov_dynamic_shadow"] = Param("sy_aov_dynamic_shadow", "Aov Dynamic Shadow", "", "rgb", presets=None)
 		self.params["sy_aov_dynamic_shadow_raw"] = Param("sy_aov_dynamic_shadow_raw", "Aov Dynamic Shadow Raw", "", "rgb", presets=None)
 		self.params["sy_aov_normal"] = Param("sy_aov_normal", "Aov Normal", "", "rgb", presets=None)
@@ -40,7 +40,7 @@ def setup(self):
 		self.addControl("color_major", label="Major Color", annotation="")
 		self.addControl("color_shadow", label="Shadow Color", annotation="")
 		self.addControl("color_mask", label="Mask Color", annotation="")
-		self.addControl("color_extra", label="Extra Color", annotation="")
+		self.addControl("color_outline", label="Outline Color", annotation="")
 		self.endLayout() 
 
 		self.beginLayout("Light Shading", collapse=False)
@@ -59,7 +59,7 @@ def setup(self):
 		self.addControl("sy_aov_color_major", label="Aov Color Major", annotation="")
 		self.addControl("sy_aov_color_shadow", label="Aov Color Shadow", annotation="")
 		self.addControl("sy_aov_color_mask", label="Aov Color Mask", annotation="")
-		self.addControl("sy_aov_color_extra", label="Aov Color Extra", annotation="")
+		self.addControl("sy_aov_outline", label="Aov Outline", annotation="")
 		self.addControl("sy_aov_dynamic_shadow", label="Aov Dynamic Shadow", annotation="")
 		self.addControl("sy_aov_dynamic_shadow_raw", label="Aov Dynamic Shadow Raw", annotation="")
 		self.addControl("sy_aov_normal", label="Aov Normal", annotation="")

diff --git a/aexml/AEsyToonsTemplate.xml b/aexml/AEsyToonsTemplate.xml
@@ -19,8 +19,8 @@
 			<label>Mask Color</label>
 			<description></description>
 		</attribute>
-		<attribute name="color_extra" type="maya.float3">
-			<label>Extra Color</label>
+		<attribute name="color_outline" type="maya.float3">
+			<label>Outline Color</label>
 			<description></description>
 		</attribute>
 		<attribute name="lambert_color" type="maya.float3">
@@ -59,8 +59,8 @@
 			<label>Aov Color Mask</label>
 			<description></description>
 		</attribute>
-		<attribute name="sy_aov_color_extra" type="maya.float3">
-			<label>Aov Color Extra</label>
+		<attribute name="sy_aov_outline" type="maya.float3">
+			<label>Aov Outline</label>
 			<description></description>
 		</attribute>
 		<attribute name="sy_aov_dynamic_shadow" type="maya.float3">
@@ -96,7 +96,7 @@
 			<property name="color_major"/>
 			<property name="color_shadow"/>
 			<property name="color_mask"/>
-			<property name="color_extra"/>
+			<property name="color_outline"/>
 			</group>
 			<group name="LightShading">
 				<label>Light Shading</label>
@@ -115,7 +115,7 @@
 			<property name="sy_aov_color_major"/>
 			<property name="sy_aov_color_shadow"/>
 			<property name="sy_aov_color_mask"/>
-			<property name="sy_aov_color_extra"/>
+			<property name="sy_aov_outline"/>
 			<property name="sy_aov_dynamic_shadow"/>
 			<property name="sy_aov_dynamic_shadow_raw"/>
 			<property name="sy_aov_normal"/>

diff --git a/aexml/NEsyToonsTemplate.xml b/aexml/NEsyToonsTemplate.xml
@@ -13,8 +13,8 @@
 		<attribute name="colorMask" type="maya.float3">
 			<label>Mask Color</label>
 		</attribute>
-		<attribute name="colorExtra" type="maya.float3">
-			<label>Extra Color</label>
+		<attribute name="colorOutline" type="maya.float3">
+			<label>Outline Color</label>
 		</attribute>
 		<attribute name="lambertColor" type="maya.float3">
 			<label>Lambert Color</label>
@@ -31,7 +31,7 @@
 		<property name="colorMajor" />
 		<property name="colorShadow" />
 		<property name="colorMask" />
-		<property name="colorExtra" />
+		<property name="colorOutline" />
 		<property name="lambertColor" />
 		<property name="shadowRamp" />
 		<property name="shadowPosition" />

diff --git a/bin/sytoons.dll b/bin/sytoons.dll
diff --git a/bin/sytoons.mtd b/bin/sytoons.mtd
@@ -21,10 +21,10 @@
 		aov.type INT 0x05
 		aov.enable_composition BOOL TRUE
 		default STRING "sy_aov_color_mask"
-	[attr sy_aov_color_extra]
+	[attr sy_aov_outline]
 		aov.type INT 0x05
 		aov.enable_composition BOOL TRUE
-		default STRING "sy_aov_color_extra"
+		default STRING "sy_aov_outline"
 	[attr sy_aov_dynamic_shadow]
 		aov.type INT 0x05
 		aov.enable_composition BOOL TRUE

diff --git a/src/include/kt_util.h b/src/include/kt_util.h
@@ -26,7 +26,7 @@ data->aovs_custom.push_back(params[p_sy_aov_sytoons_beauty].STR); \
 data->aovs_custom.push_back(params[p_sy_aov_color_major].STR); \
 data->aovs_custom.push_back(params[p_sy_aov_color_shadow].STR); \
 data->aovs_custom.push_back(params[p_sy_aov_color_mask].STR); \
-data->aovs_custom.push_back(params[p_sy_aov_color_extra].STR); \
+data->aovs_custom.push_back(params[p_sy_aov_outline].STR); \
 data->aovs_custom.push_back(params[p_sy_aov_dynamic_shadow].STR); \
 data->aovs_custom.push_back(params[p_sy_aov_dynamic_shadow_raw].STR); \
 data->aovs_custom.push_back(params[p_sy_aov_normal].STR); \
@@ -44,7 +44,7 @@ enum AovIndices
 	k_sy_aov_color_major,
 	k_sy_aov_color_shadow,
 	k_sy_aov_color_mask,
-	k_sy_aov_color_extra,
+  k_sy_aov_outline,
 	k_sy_aov_dynamic_shadow,
 	k_sy_aov_dynamic_shadow_raw,
 	k_sy_aov_normal,