From cbbe82b8dc08260aa4102214a7c99aeab7915371 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 22 Mar 2016 16:18:46 -0400 Subject: SL-276, SL-344 - Skeleton and slider updates including new face joints to enable nose, eye slider controls. Increased max joint count. --- indra/llcharacter/lljoint.h | 2 +- indra/newview/character/avatar_lad.xml | 13218 +++++++++++++++----------- indra/newview/character/avatar_skeleton.xml | 165 +- 3 files changed, 7501 insertions(+), 5884 deletions(-) (limited to 'indra') diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 61592363f5..2c1974e6e7 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -42,7 +42,7 @@ const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15; // BENTO JOINT COUNT LIMIT - need to set this to final skeleton size // (bones + attachments) + 2, rounded to next multiple of 4. -const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 180; // must be divisible by 4! +const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 184; // must be divisible by 4! const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110; // These should be higher than the joint_num of any diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 2aa90969c9..5802b6e2fd 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1,6 +1,6 @@ - + + visible_in_first_person="true"/> + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - + visible_in_first_person="false"/> + + visible_in_first_person="false" /> + visible_in_first_person="false" /> + visible_in_first_person="false" /> + visible_in_first_person="false"/> + visible_in_first_person="false" /> + visible_in_first_person="false"/> + visible_in_first_person="true" /> + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - + visible_in_first_person="true" /> + + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - - + + - @@ -1103,7 +1103,7 @@ scale="0 0 0" offset="0 0 .004" /> - @@ -1268,7 +1268,7 @@ name="mFaceCheekUpperInnerRight" scale="0 0 0" offset="-0.005 0 0" /> - + @@ -1360,7 +1360,7 @@ id="655" group="1" name="Head Size" - label="Head Size" + label="Head Size" wearable="shape" edit_group="shape_head" label_min="Small Head" @@ -1383,7 +1383,7 @@ name="mFaceRoot" scale="1 1 1" offset="0 0 0" /> - + - - @@ -1720,7 +1718,7 @@ scale="0 0 0" offset="-.005 0 0" /> - @@ -1827,7 +1825,8 @@ scale="0 0 .5" /> - - - - - - + - - + id="30002" + group="0" + name="Nose_Big_Out" + value_min="-0.8" + value_max="2.5"> + + + + + - - + - + - + name="Broad_Nostrils" + value_min="-.5" + value_max="1"> + + + + - + - - + name="Bulbous_Nose" + value_min="-.5" + value_max="1.5" + > + + + + + + + - + name="Wide_Nose" + value_min="-.5" + value_max="1"> + + + + + - - + name="Crooked_Nose" + value_min="-2" + value_max="2"> + + + + + + + + + + + + + + + + - - - + + + + + + + + - + name="Lip Width" + value_min="-0.9" + value_max="1.3" + value_default="0"> + + + + + + + + + + + + + + - - + name="Tall_Lips" + value_min="-1" + value_max="2"> + + + + + + + + + + + + + + - - + + + - + - - + value_max="0.7"> + + + + + + + + + + + + + + + + + + + + - - + value_max="1"> + + + + + + + + + + + + + + + + + + + + - + value_max="1.5"> + + + + + + + + + + + + + + + + + + + - + value_max="1.5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value_max="1.4"> + + + + + + + + + + + + + + + + + - - + value_max="1.4"> + + + - - - + - - - + + + - - - + + + + + - - - + - - + - + - - + id="30764" + group="0" + name="Lip_Cleft_Deep" + value_min="-.5" + value_max="1.2"> + + + + + + + + + + - - + name="Wide_Lip_Cleft" + value_min="-.8" + value_max="1.5"> + + + + + - - + - + - - + value_max="2"> + + - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + value_max="2"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + id="30035" + group="0" + name="Big_Ears" + value_min="-1" + value_max="2"> + + + + - + - - - + value_max="1.5"> + + + + + + + - + id="30796" + group="0" + name="Pointy_Ears" + value_min="-.4" + value_max="3"> + + + + - + - - + + - - - + - - - + + + + + + + + + + + - + + + - + - - + id="30024" + group="0" + name="Wide_Eyes" + value_min="-1.5" + value_max="2"> + + + + + + + + + + + + - - + name="Eyelid_Corner_Up" + value_min="-1.3" + value_max="1.2"> + + + + + + - + name="Puffy_Lower_Lids" + value_min="-.3" + value_max="2.5"> + + + + + + + - + name="Forehead Angle" + value_min="0" + value_max="1"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value_max="1.5"> + + + + + + + - + id="30027" + group="0" + name="Wide_Nose_Bridge" + value_min="-1.3" + value_max="1.2"> + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + value_max="1.3" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + value_max="1.3" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + edit_group_order="5" + label_min="Less" + label_max="More" + value_min="-1" + value_max="1" + value_default="0.14" + camera_elevation=".1" + camera_distance=".5" + camera_angle="90"> + edit_group_order="6" + label_min="Less" + label_max="More" + value_min="-1" + value_max="1" + value_default=".7" + camera_elevation=".1" + camera_distance=".5" + camera_angle="90"> + edit_group_order="7" + label_min="Less" + label_max="More" + value_min="-1" + value_max="1" + value_default="0.05" + camera_elevation=".1" + camera_distance=".7" + camera_angle="90"> - - - - - - - - - - - - - - - - - - - - + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="20"> + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + id="147" + group="1" + clothing_morph="true" + name="Bangs_Sides_Down" + label="Side Bangs Down" + wearable="hair" + edit_group="hair_style" + label_min="Side Bangs" + label_max="Side Bangs Down" + value_min="0" + value_max="2" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="150"> + camera_distance=".5" + camera_angle="150"> + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="150"> - + camera_distance=".5" + camera_angle="150"> + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> - - - - + camera_distance=".5" + camera_angle="90"> + camera_distance=".5" + camera_angle="90"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + id="640" + group="1" + name="Hair_Egg_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="-1.3" + value_max="1"> + id="641" + group="1" + name="Hair_Squash_Stretch_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="-.5" + value_max="1"> + id="642" + group="1" + name="Hair_Square_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="0" + value_max="1"> + id="643" + group="1" + name="Hair_Round_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="0" + value_max="1"> + value_max="1"> + id="645" + group="1" + name="Hair_Forehead_Slant" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="0" + value_max="1"> - - - - - - - - - - - - - - + camera_distance=".5" + camera_angle="100"> + camera_distance=".5" + camera_angle="30"> + camera_distance=".5" + camera_angle="160"> @@ -3331,775 +3751,895 @@ - - - + clothing_morph="true" + name="Hair_Pigtails_Short" + wearable="hair" + edit_group="hair_style" + value_min="0" + value_max="1"> + + value_max="1"> + value_max="1"> + clothing_morph="true" + name="Hair_Pigtails_Long" + wearable="hair" + edit_group="hair_style" + value_min="0" + value_max="1"> + value_max="1"> + id="787" + group="1" + name="Hair_Ponytail_Med" + wearable="hair" + edit_group="hair_style" + value_min="0" + value_max="1"> - + value_max="1"> + - - - + + + + + + + + + + + + + + + + + + + + id="20001" + group="0" + name="Big_Brow" + value_min="-.3" + value_max="2"> + name="Nose_Big_Out" + value_min="-0.8" + value_max="2.5"> + id="20517" + group="0" + name="Wide_Nose" + value_min="-.5" + value_max="1"> - + name="Bulbous_Nose" + value_min="-.5" + value_max="1.5"> - + + value_max="2"> - + + id="20004" + group="0" + name="Broad_Nostrils" + value_min="-.5" + value_max="1"> + id="20653" + group="0" + name="Tall_Lips" + value_min="-1" + value_max="2"> - + + id="20506" + group="0" + name="Mouth_Height" + value_min="-2" + value_max="2"> + + + + - + id="20025" + group="0" + name="Wide_Lip_Cleft" + value_min="-.8" + value_max="1.5"> + - + + value_default="0"> - + - - - + value_max="2"> + - + + + + + + + + + + + + + + value_max="2"> - + + + + + + value_max="1.2"> + + + + + label_min="High" + label_max="Low" + value_min="-1" + value_max="1.5" + value_default="0.5" + camera_elevation=".1" + camera_distance=".3" + camera_angle="-20"> + edit_group_order="6" + label_min="Round" + label_max="Cleft" + value_min="-.1" + value_max="1" + camera_elevation="0" + camera_distance=".28" + camera_angle="-20"> + edit_group="shape_nose" + edit_group_order="8" + label_min="Pointy" + label_max="Bulbous" + value_min="-.3" + value_max="1" + camera_elevation=".1" + camera_distance=".35" + camera_angle="15"> + edit_group="shape_chin" + edit_group_order="1" + label_min="Chin Out" + label_max="Chin In" + value_min="-.5" + value_max=".5" + camera_elevation=".1" + camera_distance=".4" + camera_angle="45"> - - + id="8" + group="0" + name="Double_Chin" + label="Chin-Neck" + wearable="shape" + edit_group="shape_chin" + edit_group_order="8" + label_min="Tight Chin" + label_max="Double Chin" + value_min="-.5" + value_max="1.5" + camera_elevation="-.1" + camera_distance=".3" + camera_angle="60"> + id="20010" + group="0" + name="Sunken_Cheeks" + value_min="-1.5" + value_max="3"> + id="20011" + group="0" + name="Noble_Nose_Bridge" + value_min="-.5" + value_max="1.5"> + id="20758" + group="0" + name="Lower_Bridge_Nose" + value_min="-1.5" + value_max="1.5"> + id="12" + group="0" + name="Jowls" + wearable="shape" + edit_group="shape_chin" + edit_group_order="5" + label_min="Less" + label_max="More" + value_min="-.5" + value_max="2.5" + camera_elevation=".1" + camera_distance=".4" + camera_angle="0"> + value_max="1.5" + camera_elevation="0" + camera_distance=".28" + camera_angle="-20"> + - + name="Pointy_Eyebrows" + label="Eyebrow Points" + wearable="hair" + edit_group="hair_eyebrows" + edit_group_order="4" + label_min="Smooth" + label_max="Pointy" + value_min="-.5" + value_max="1" + camera_elevation=".1" + camera_distance=".3"> + + id="17" + group="0" + name="Square_Jaw" + label="Jaw Shape" + wearable="shape" + edit_group="shape_chin" + edit_group_order="2" + label_min="Pointy" + label_max="Square" + value_min="-.5" + value_max="1" + camera_distance=".3" + camera_elevation=".04" + camera_angle="-20"> + id="20018" + group="0" + name="Puffy_Upper_Cheeks" + value_min="-1.5" + value_max="2.5"> + id="19" + group="0" + name="Upturned_Nose_Tip" + label="Nose Tip Angle" + wearable="shape" + edit_group="shape_nose" + edit_group_order="7" + label_min="Downturned" + label_max="Upturned" + value_min="-1.5" + value_max="1" + camera_elevation=".1" + camera_distance=".35" + camera_angle="15"> - + + id="21" + group="0" + name="Upper_Eyelid_Fold" + label="Upper Eyelid Fold" + wearable="shape" + edit_group="shape_eyes" + edit_group_order="5" + label_min="Uncreased" + label_max="Creased" + value_min="-0.2" + value_max="1.3" + camera_elevation=".1" + camera_distance=".35"> + value_max="1" + camera_elevation=".1" + camera_distance=".3" + camera_angle="45"> + id="23" + group="0" + name="Baggy_Eyes" + label="Eye Bags" + wearable="shape" + edit_group="shape_eyes" + edit_group_order="6" + label_min="Smooth" + label_max="Baggy" + value_min="-.5" + value_max="1.5" + camera_elevation=".1" + camera_distance=".35"> + value_max=".7"> + id="20027" + group="0" + name="Wide_Nose_Bridge" + value_min="-1.3" + value_max="1.2"> + value_max="2"> + name="Wide_Upper_Lip" + wearable="shape" + edit_group="driven" + value_min="-.7" + value_max="1.3"> + name="Wide_Lower_Lip" + wearable="shape" + edit_group="driven" + value_min="-.7" + value_max="1.3"> + - - + + name="Lower_Eyebrows" + label="Eyebrow Height" + show_simple="true" + wearable="hair" + edit_group="hair_eyebrows" + edit_group_order="2.5" + label_min="Higher" + label_max="Lower" + value_min="-2" + value_max="2"> + name="Egg_Head" + label="Egg Head" + wearable="shape" + edit_group="shape_head" + label_min="Chin Heavy" + label_max="Forehead Heavy" + value_min="-1.3" + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> - - + edit_group="shape_head" + label_min="Squash Head" + label_max="Stretch Head" + value_min="-.5" + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + + + + value_max=".7" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> - + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + + + + + value_max="2"> + + + + + + + + + value_max="1.4" + camera_distance=".3" + camera_elevation=".04"> + value_max="1.2" + camera_distance=".3" + camera_elevation=".04"> + value_max="1.5" + camera_distance=".3" + camera_elevation=".04"> - - - - - - - - - - - - - - + + + - - + + + + camera_elevation=".1" + camera_distance=".35"> + label="Jaw Angle" + edit_group="shape_chin" + edit_group_order="3.5" + label_min="Low Jaw" + label_max="High Jaw" + value_min="-1.2" + value_max="2" + value_default="0" + camera_distance=".5" + camera_elevation=".04" + camera_angle="70"> + value_default="0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + label="Eye Depth" + edit_group="shape_eyes" + edit_group_order="4.5" + label_min="Sunken Eyes" + label_max="Bug Eyes" + value_min="-2" + value_max="2" + value_default="0"> + + + + + + + + + - @@ -4517,835 +4939,578 @@ + --> + - - - - - - - + - - - - + value_max="1"> + + - - - - + value_max="1"> + - - - - + value_max="1"> + - - - - - - - - + value_max="1"> + - - - - - - - - - - - + value_max="1"> + - - - - - - - - - - - + value_max="1"> + - - - - - - - - - - - - - - - - - - - + value_max="1"> + - - - - - - - + value_max="1"> + + + + + + + + + + + + + + + + + shared="1" + id="660" + group="1" + name="Shear_Head" + wearable="shape" + label="Shear Face" + edit_group="shape_head" + label_min="Shear Left" + label_max="Shear Right" + value_min="-2" + value_max="2" + value_default="0" + camera_distance=".5" + camera_elevation=".04"> - - - - - - + value_max="1" + value_default="0" + camera_distance=".5" + camera_elevation=".04"> + - - - - + camera_distance=".5" + camera_elevation=".04" + camera_angle="-20"> + - + - - - - + edit_group="shape_eyes" + label_min="Uncreased" + label_max="Creased" + value_min="-0.2" + value_max="1.3" + camera_elevation=".1" + camera_distance=".35"> + - - - - - - - - - - - - - - - + name="Egg_Head" + label="Egg Head" + wearable="shape" + edit_group="shape_head" + label_min="Chin Heavy" + label_max="Forehead Heavy" + value_min="-1.3" + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + name="Express_Frown" + value_min="0" + value_max="1"> + - - - - - - + name="Express_Laugh_Emote" + value_min="0" + value_max="1"> + + + - - - + - - - - + name="Express_Smile" + value_min="0" + value_max="1"> + - - - - - - - - + ############## + # other morphs (not user controlled) + ############## + --> + + + - - + + + + - + + + - + + + + - + value_max="1" + camera_elevation=".1" + camera_distance="1" + camera_angle="15"> - + name="LEFT_PEC" + scale="0.0273 0.0273 0.0273" + pos="0.038 0.024 -0.016"/> + + + value_max="1" + camera_elevation="0" + camera_distance=".28"> + name="LEFT_PEC" + scale="-0.05 0.0 0.0" + pos="-0.01 -0.01 -0.02"/> - + name="RIGHT_PEC" + scale="-0.05 0.0 0.0" + pos="-0.01 -0.01 -0.02"/> + + value_max="1" + camera_elevation="0" + camera_distance=".28"> - - + name="LEFT_PEC" + scale="-0.051 0.0 0.0" + pos="-0.02 -0.01 -0.03"/> - + name="RIGHT_PEC" + scale="-0.051 0.0 0.0" + pos="-0.02 -0.01 -0.03"/> + - - + value_max="1.4" + camera_elevation=".3" + camera_distance="1.2"> + + name="L_CLAVICLE" + scale="0.02 0.0 0.005" + pos="0.0 0 0.005"/> + name="L_UPPER_ARM" + scale="0.015 0.0 0.005" + pos="0.015 0 0"/> + name="L_LOWER_ARM" + scale="0.005 0.0 0.005" + pos="0.005 0 0"/> + + + + edit_group="shape_torso" + label_min="Regular" + label_max="Scrawny" + value_min="0" + value_max="1.3" + camera_elevation=".3" + camera_distance="1.2"> + name="BELLY" + scale="0.0 -0.01 0.0" + pos="0.0 0.0 0"/> + name="UPPER_BACK" + scale="-0.01 -0.01 0.0" + pos="0.0 0.0 0"/> + name="CHEST" + scale="-0.01 -0.01 0.0" + pos="0.01 0.0 0"/> + name="L_CLAVICLE" + scale="0.0 -0.03 -0.005" + pos="0.0 0 -0.005"/> + + + + + - + value_max="1.3" + camera_elevation=".3" + camera_distance="1.2"> + + + + + + + + + + + - + camera_elevation=".3"> + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + camera_elevation=".3" + camera_distance=".8"> + name="LEFT_PEC" + scale="0.0 0.0 0.0" + pos="0.004 0.0 -0.01"/> + name="RIGHT_PEC" + scale="0.0 0.0 0.0" + pos="0.004 0.0 -0.01"/> - + - - - - - - - - + edit_group="driven" + value_default="0" + value_min="-1" + value_max="2"> - + name="BELLY" + scale="0.0 0.02 0.0"/> + name="LOWER_BACK" + scale="0.0 0.02 0.0"/> + name="LEFT_HANDLE" + pos="0.0 0.025 0.0"/> + name="RIGHT_HANDLE" + pos="0.0 -0.025 0.0"/> + edit_group="shape_torso" + edit_group_order="8" + label_min="Separate" + label_max="Join" + value_default="0" + value_min="-.3" + value_max="1.3" + camera_elevation=".3" + camera_distance=".8"> + name="LEFT_PEC" + scale="0.0 0.0 0.0" + pos="0.0 -0.026 0.0"/> + - - + - + value_min="-0.5" + value_max="1.1" + camera_elevation=".3" + camera_distance="1.2"> + + + + - + - + + + + + + + + + + + + + + - - - - + - - - + - - - - - - - - - - - - - - - - - - - - + name="Hands_Relaxed_L" + value_min="0" + value_max="1"> + name="Hands_Point_L" + value_min="0" + value_max="1"> - - - + name="Hands_Fist_L" + value_min="0" + value_max="1"> + name="Hands_Relaxed_R" + value_min="0" + value_max="1"> - - - - - - - - - - - - - - - - - - - - - - - - - + value_max="1"> - - - - - - - - + - + + + + - + value_default="0" + value_min="-1.25" + value_max="1.25"> + + + + - + value_max="1"> + + + - - - - - - - + value_min="-2" + value_max="2"> + + + + + + + reference="avatar_upper_body.llm"> + reference="avatar_upper_body.llm"> + reference="avatar_upper_body.llm"> + reference="avatar_upper_body.llm"> - - + + + - - - - + value_max="1"> + + - - - + + + + - - - + value_max="1"> + + + + - - - - - - - - - - - - - - - - - + value_max="1.5" + camera_distance="1.3" + camera_elevation="-.5"> + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + value_max="1.5" + camera_distance="1.3" + camera_elevation="-.5"> + + + + + + + - - + + + + + + + - - - - - + camera_distance="1.5" + camera_elevation="-.5"> + - - - - - + camera_distance="1.5" + camera_elevation="-.5"> + + + + + - - - - - - - - - - + camera_distance="1.3" + camera_elevation="-.5"> + + - + + + - + + + - - + + - - - - - - + value_max="2" + camera_angle="15" + camera_distance="1.5" + camera_elevation="-1"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + value_max="1.5" + camera_distance="1.8" + camera_angle="30" + camera_elevation="-.3"> + + - - + + - - - - - - + + + - - - + + + + + + + + + - - - + + + + - - + - - - + + + - - - - - - - - - + + + + - - - + + + + - - - + + + + + + - - + + + + + - - - + - - - - + - - + + + + - - - + + + + - - - - - - + + + + + + + - - - + + + + - - - - + + + + + - - - - - - + + + + - - - - + + + + + + - - - - - + + + + - - - - - - - - + + + + + - - - + + + + - - - + + + + - - - - + + + - - + + + - - - + + + - - - + + + - - - - + + + - - - - + + + - + + + - + + + - + + + - + + + - + + + + - + + + + - + - + + - - - + + - - - - + + - - - - - + + - - - - + + + + + - - - + - + - + + + - + + + + + - + + + - + - + - - - + - - - + - - - - + - - - - + - + + + + - + + + + + - + - + - + - + - + - + - + - + - + - + + + - + + + - + + + - + + + - + + + - + + + - + - + - + - + - + - + - - - + + + + - - - + + + + + + - - - + + - - - - + + - - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + + - + + + - + + + + - + + + + + - + + + - + + + - + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + color="0, 0, 0, 0" /> + color="0, 0, 0, 128" /> + + + + + + + + + +color="255, 255, 255, 0" /> + + color="255, 255, 255, 64" /> + + + - + camera_elevation=".07"> + + color="198, 71, 71, 0" /> + color="198, 71, 71, 255" /> + + + + - + camera_distance=".25"> + + + + + + name="wrinkles_shading" + render_pass="bump" + fixed_color="0,0,0,100"> + value_max="1"> + domain="0.3" /> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - +name="eyebrowsbump" +render_pass="bump"> - - - - - - - - - - - - + color="255,255,255,0" /> + color="255,255,255,255" /> - - - - - - - - - + value_max="1" + value_default="0.5"> - - - - + color="255,255,255,0" /> + color="255,255,255,255" /> - - - - - - - - - - + name="lipstick"> + value_default=".25" + camera_distance=".25"> + color="245,161,177,200" /> - - + color="216,37,67,200" /> - - + color="178,48,76,200" /> - - + color="68,0,11,200" /> - - + color="252,207,184,200" /> - - + color="241,136,106,200" /> - + + - + - - - - - - + + + + value_max=".9" + value_default="0.0" + camera_distance=".25"> + tga_file="lipstick_alpha.tga" + skip_if_zero="true" + domain="0.05" /> - - - - - - - - - - + name="lipgloss" + fixed_color="255,255,255,190"> - - - - - + value_max="1" + camera_distance=".25"> + - + name="blush"> + + + + value_max="1" + value_default=".5" + camera_distance=".3" + camera_elevation=".07" + camera_angle="20"> + color="253,162,193,200" /> - - - + color="247,131,152,200" /> - - - + - - - - - + - - + - - + color="195,128,122,200" /> + color="148,103,100,200" /> + + - + value_default=".5" + camera_distance=".3" + camera_elevation=".07" + camera_angle="20"> + + color="255,255,255,0" /> + color="255,255,255,255" /> + + + id="708" + group="0" + wearable="skin" + edit_group="skin_makeup" + edit_group_order="11" + name="Out Shdw Color" + label_min="Light" + label_max="Dark" + value_min="0" + value_max="1" + camera_distance=".3" + camera_elevation=".14"> + color="252,247,246,255" /> - - + color="255,206,206,255" /> - + + - - + - - - + - - - + - - - + - - - - + - - + - - + color="223,227,213,255" /> - - + color="96,116,87,255" /> - - + color="88,143,107,255" /> + color="194,231,223,255" /> + + + + + + + + + + + + + + + + + + + + + + - + value_default=".6" + camera_distance=".3" + camera_elevation=".14"> + + color="255,255,255,0" /> + color="255,255,255,255" /> - - - - + value_max=".7" + camera_distance=".3" + camera_elevation=".14"> + + - - + camera_distance=".3" + camera_elevation=".14"> + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + value_default="0" + camera_distance=".3" + camera_elevation=".14"> + tga_file="eyeshadow_inner_alpha.tga" + skip_if_zero="true" + domain="0.2" /> + name="eyeliner" + fixed_color="0,0,0,200"> + camera_distance=".3" + camera_elevation=".14"> + camera_distance=".3" + camera_elevation=".14"> + color="24,98,40,250" /> + + color="9,100,127,250" /> + + color="61,93,134,250" /> + + color="70,29,27,250" /> + + color="115,75,65,250" /> + + color="100,100,100,250" /> + + color="91,80,74,250" /> + + color="112,42,76,250" /> + + color="14,14,14,250" /> + + + name="facialhair bump" + render_pass="bump"> + tga_file="head_hair.tga" + file_is_mask="false" /> + name="Sideburns bump" + value_min="0" + value_max="1"> + tga_file="facehair_sideburns_alpha.tga" + skip_if_zero="true" + domain="0.05" /> + name="Moustache bump" + value_min="0" + value_max="1"> + tga_file="facehair_moustache_alpha.tga" + skip_if_zero="true" + domain="0.05" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + value_max="1"> + tga_file="facehair_soulpatch_alpha.tga" + skip_if_zero="true" + domain="0.1" /> + wearable="hair" + name="Chin Curtains bump" + value_min="0" + value_max="1"> + tga_file="facehair_chincurtains_alpha.tga" + skip_if_zero="true" + domain="0.03" /> - - - - + value_max="1"> + color="255,255,255,255" /> + color="255,255,255,0" /> + + + + + + name="Sideburns" + value_min="0" + value_max="1"> + domain="0.05" /> + domain="0.1" /> + domain="0.03" /> + + + + + + + + + name="head_bodypaint"> - + local_texture="head_bodypaint" /> + + + + + + + + + - + value_max="1" + value_default="1"> + + + + + - + value_max="1" + value_default="1"> + + + + + - + edit_group="colorpicker_driven" + wearable="tattoo" + name="tattoo_head_blue" + value_min="0" + value_max="1" + value_default="1"> + + + + + + + + + + + + + + + + + + domain="0" /> + name="base" + global_color="skin_color"> + tga_file="body_skingrain.tga" /> + + + tga_file="upperbody_color.tga" /> + + + + + value_max="1"> + color="0, 0, 0, 0" /> + color="0, 0, 0, 128" /> + - - - + + - - + + - - + + + + + + + + + tga_file="upperbodyfreckles_alpha.tga" + skip_if_zero="true" + domain="0.6" /> + name="upper_tattoo"> + local_texture="upper_tattoo" /> @@ -8555,11 +8832,11 @@ render_pass="bump"> @@ -8573,11 +8850,11 @@ render_pass="bump"> @@ -8590,525 +8867,318 @@ render_pass="bump"> + + + + + + + name="Sleeve Length bump" + value_min=".01" + value_max="1" + value_default=".4"> + name="upper_undershirt"> + local_texture="upper_undershirt" /> - - + value_max="1" + value_default="1"> + + - - + + - - + value_max="1" + value_default="1"> + + - - + + - - - - - - - - - - - + value_max="1" + value_default="1"> + color="0, 0, 0, 255" /> + color="0, 0, 255, 255" /> + name="Sleeve Length" + value_min=".01" + value_max="1" + value_default=".4"> + value_max="1" + value_default=".8"> + value_max="1" + value_default=".8"> + value_max="1" + value_default=".8"> + domain="0.05" /> + + + value_max="1" + value_default="0.0" + camera_distance="1.6" + camera_elevation="-.4" + camera_angle="70"> + tga_file="nailpolish_alpha.tga" + skip_if_zero="true" + domain="0.1" /> - - - - + camera_distance="1.6" + camera_elevation="-.4" + camera_angle="70"> + color="255,187,200,255" /> - - + color="194,102,127,255" /> - - + color="227,34,99,255" /> - - + color="168,41,60,255" /> - - + color="97,28,59,255" /> - - + color="234,115,93,255" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + color="114,30,46,255" /> + color="14,14,14,255" /> + name="upper_gloves bump" + render_pass="bump" + fixed_color="128,128,128,255"> + local_texture="upper_gloves" + local_texture_alpha_only="true" /> - - - - - + wearable="gloves" + edit_group="driven" + name="Glove Length bump" + value_min=".01" + value_max="1" + value_default=".8"> + - - - - - - - - - - + wearable="gloves" + edit_group="driven" + name="Glove Fingers bump" + value_min=".01" + value_max="1" + value_default="1"> + tga_file="gloves_fingers_alpha.tga" + multiply_blend="true" + domain="0.01" /> + name="upper_gloves"> + local_texture="upper_gloves" /> @@ -9122,11 +9192,11 @@ render_pass="bump"> @@ -9140,11 +9210,11 @@ render_pass="bump"> @@ -9157,267 +9227,283 @@ render_pass="bump"> - - - - - + value_default=".8"> + value_default="1"> + tga_file="gloves_fingers_alpha.tga" + multiply_blend="true" + domain="0.01" /> + name="upper_clothes_shadow"> + local_texture="upper_shirt" /> + value_default="0"> + color="0, 0, 0, 0" /> + color="0, 0, 0, 80" /> - - - - - + id="900" + group="1" + wearable="shirt" + edit_group="driven" + name="Sleeve Length Shadow" + value_min="0.02" + value_max=".87" + value_default="0.02"> + - - - - - + id="901" + group="1" + wearable="shirt" + edit_group="driven" + name="Shirt Shadow Bottom" + value_min="0.02" + value_max="1"> + + name="Collar Front Shadow Height" + value_min="0.02" + value_max="1"> + multiply_blend="true" + tga_file="shirt_collar_alpha.tga" + skip_if_zero="true" + domain="0.02" /> + name="Collar Back Shadow Height" + value_min="0.02" + value_max="1"> + multiply_blend="true" + tga_file="shirt_collar_back_alpha.tga" + skip_if_zero="true" + domain="0.02" /> + value_max="0.85"> - - - - - - - - - - - - - - - - - + value_max="1"> + - - - - - + value_max="1"> + + value_max="1"> + multiply_blend="true" + tga_file="shirt_collar_back_alpha.tga" + domain="0.05" /> + name="upper_clothes bump" + render_pass="bump"> + + + + + + + + + + + value_max="0.85"> + + + + + + + + + + + + + name="upper_clothes"> + local_texture="upper_shirt" /> @@ -9431,11 +9517,11 @@ render_pass="bump"> @@ -9449,11 +9535,11 @@ render_pass="bump"> @@ -9467,357 +9553,259 @@ render_pass="bump"> + value_max="0.85" + value_default=".7"> - - - - - - - - - + value_default=".8"> + + name="Collar Front Height Cloth" + value_min="0" + value_max="1" + value_default=".8"> + multiply_blend="true" + tga_file="shirt_collar_alpha.tga" + domain="0.05" /> + name="Collar Back Height Cloth" + value_min="0" + value_max="1" + value_default=".8"> + multiply_blend="true" + tga_file="shirt_collar_back_alpha.tga" + domain="0.05" /> + multiply_blend="false" + tga_file="shirt_sleeve_alpha.tga" + domain="0.01" /> + multiply_blend="true" + tga_file="shirt_collar_alpha.tga" + domain="0.05" /> - - - - - - - - - - - + value_max="1"> + + multiply_blend="true" + tga_file="jacket_length_upper_alpha.tga" + domain="0.01" /> + name="upper_jacket bump" + render_pass="bump"> + tga_file="bump_shirt_wrinkles.tga" /> - - - - - - - - - - - - - - - + + + id="875" + group="1" + wearable="jacket" + name="jacket upper Wrinkles" + value_min="0" + value_max="1" + value_default="0"> + color="255, 255, 255, 0" /> + color="255, 255, 255, 255" /> - - - - - - - - - - - - + tga_file="shirt_collar_alpha.tga" + domain="0.05" /> - - - - - - - - - - - - + value_max="1"> + + name="upper_jacket"> + local_texture="upper_jacket" /> @@ -9831,11 +9819,11 @@ render_pass="bump"> @@ -9849,11 +9837,11 @@ render_pass="bump"> @@ -9867,11 +9855,53 @@ render_pass="bump"> + + + + + + + + + + + + camera_angle="30" camera_elevation=".2"> camera_elevation=".2"> + name="upper alpha" + visibility_mask="TRUE"> + local_texture="upper_alpha" /> + body_region="lower_body" + width="512" + height="512"> - + name="lower body bump base" + fixed_color = "128,128,128,255" + render_pass="bump"> - + name="base_lowerbody bump" + render_pass="bump"> + tga_file="bump_lowerbody_base.tga" + file_is_mask="FALSE" /> + + + + + name="base" + global_color="skin_color"> + tga_file="body_skingrain.tga" /> - + + + + + + + + + + + - - + name="highlight"> + tga_file="lowerbody_highlights_alpha.tga" + file_is_mask="TRUE" /> + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9974,11 +10084,11 @@ render_pass="bump"> @@ -9992,11 +10102,11 @@ render_pass="bump"> @@ -10008,124 +10118,1563 @@ render_pass="bump"> color="0, 0, 255, 255" /> + + name="lower_underpants bump" + render_pass="bump" + fixed_color="128,128,128,255"> + + + value_default=".3"> + tga_file="pants_length_alpha.tga" + domain="0.01" /> + value_default=".8"> + tga_file="pants_waist_alpha.tga" + domain="0.05" /> + + + + - + value_default="1"> + + + + + - - + value_default="1"> + + - + + + + + value_default="1"> + + + + + + + + + tga_file="pants_length_alpha.tga" + domain="0.01" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + max1="1" max2="1" min2="1" /> + + + + @@ -10560,8 +12123,8 @@ render_pass="bump"> edit_group="shape_mouth" edit_group_order="3.2" name="Lip Ratio" - label="Lip Ratio" - show_simple="true" + label="Lip Ratio" + show_simple="true" label_min="More Upper Lip" label_max="More Lower Lip" value_min="0" @@ -10584,6 +12147,21 @@ render_pass="bump"> max1="1" max2="1" min2="1" /> + + + + + @@ -10609,6 +12187,10 @@ render_pass="bump"> + + + @@ -11291,6 +12873,21 @@ render_pass="bump"> max1="1" max2="1" min2="1" /> + + + + + @@ -11501,8 +13098,23 @@ render_pass="bump"> min1=".5" max1="1" max2="1" + min2="1" /> + + + + + - - + + - + - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - + + + + + + + + - + - + - + - + - + - + - + - + - + @@ -106,35 +111,35 @@ - + - + - + - + - + - + - + - + - + @@ -143,8 +148,8 @@ - - + + @@ -152,7 +157,7 @@ - + @@ -167,31 +172,31 @@ - + - + - + - - + + - + - + - + - - + + - + @@ -202,14 +207,14 @@ - - - + + + - + -- cgit v1.2.3