livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7208 FIX add color / tint to tattoos 

Adds a color swatch to tattoo wearable that allows users to color their tattoos.
Defaults to white so should not affect existing tattoo wearables.

Code reviewed by Vir.
master
Nyx Linden 2010-05-19 12:16:20 -04:00
parent b550bb0f09
commit 46fc55fca5
4 changed files with 290 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

264
indra/newview/character/avatar_lad.xml
View File

@ -6623,6 +6623,60 @@ render_pass="bump">
name="head_tattoo">
<texture
local_texture="head_tattoo" />
<param
id="1062"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_head_red"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="255, 0, 0, 255" />
</param_color>
</param>
<param
id="1063"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_head_green"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 255, 0, 255" />
</param_color>
</param>
<param
id="1064"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_head_blue"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 0, 255, 255" />
</param_color>
</param>
</layer>
@ -6745,6 +6799,61 @@ render_pass="bump">
name="upper_tattoo">
<texture
local_texture="upper_tattoo" />
<param
id="1065"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_upper_red"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="255, 0, 0, 255" />
</param_color>
</param>
<param
id="1066"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_upper_green"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 255, 0, 255" />
</param_color>
</param>
<param
id="1067"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_upper_blue"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 0, 255, 255" />
</param_color>
</param>
</layer>
@ -7942,6 +8051,61 @@ render_pass="bump">
name="lower_tattoo">
<texture
local_texture="lower_tattoo" />
<param
id="1068"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_lower_red"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="255, 0, 0, 255" />
</param_color>
</param>
<param
id="1069"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_lower_green"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 255, 0, 255" />
</param_color>
</param>
<param
id="1070"
group="1"
edit_group="colorpicker_driven"
wearable="tattoo"
name="tattoo_lower_blue"
value_min="0"
value_max="1"
value_default="1">
<param_color>
<value
color="0, 0, 0, 255" />
<value
color="0, 0, 255, 255" />
</param_color>
</param>
</layer>
<layer
@ -11367,6 +11531,106 @@ render_pass="bump">
</param_driver>
</param>
<param
id="1071"
group="0"
wearable="tattoo"
edit_group="colorpicker"
name="tattoo_red"
value_min="0"
value_max="1"
value_default="1">
<param_driver>
<driven
id="1062"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1065"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1068"
min1="0"
max1="1"
max2="1"
min2="1" />
</param_driver>
</param>
<param
id="1072"
group="0"
wearable="tattoo"
edit_group="colorpicker"
name="tattoo_green"
value_min="0"
value_max="1"
value_default="1">
<param_driver>
<driven
id="1063"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1066"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1069"
min1="0"
max1="1"
max2="1"
min2="1" />
</param_driver>
</param>
<param
id="1073"
group="0"
wearable="tattoo"
edit_group="colorpicker"
name="tattoo_blue"
value_min="0"
value_max="1"
value_default="1">
<param_driver>
<driven
id="1064"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1067"
min1="0"
max1="1"
max2="1"
min2="1" />
<driven
id="1070"
min1="0"
max1="1"
max2="1"
min2="1" />
</param_driver>
</param>
</driver_parameters>

3
indra/newview/llpaneleditwearable.cpp
View File

@ -227,7 +227,7 @@ LLEditWearableDictionary::Wearables::Wearables()
addEntry(LLWearableType::WT_UNDERPANTS, new WearableEntry(LLWearableType::WT_UNDERPANTS,"edit_underpants_title","underpants_desc_text",1,1,1, TEX_LOWER_UNDERPANTS, TEX_LOWER_UNDERPANTS, SUBPART_UNDERPANTS));
addEntry(LLWearableType::WT_SKIRT, new WearableEntry(LLWearableType::WT_SKIRT,"edit_skirt_title","skirt_desc_text",1,1,1, TEX_SKIRT, TEX_SKIRT, SUBPART_SKIRT));
addEntry(LLWearableType::WT_ALPHA, new WearableEntry(LLWearableType::WT_ALPHA,"edit_alpha_title","alpha_desc_text",0,5,1, TEX_LOWER_ALPHA, TEX_UPPER_ALPHA, TEX_HEAD_ALPHA, TEX_EYES_ALPHA, TEX_HAIR_ALPHA, SUBPART_ALPHA));
addEntry(LLWearableType::WT_TATTOO, new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text",0,3,1, TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO, SUBPART_TATTOO));
addEntry(LLWearableType::WT_TATTOO, new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text",1,3,1, TEX_HEAD_TATTOO, TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO, SUBPART_TATTOO));
}
LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@ -331,6 +331,7 @@ LLEditWearableDictionary::ColorSwatchCtrls::ColorSwatchCtrls()
addEntry ( TEX_UPPER_GLOVES, new PickerControlEntry (TEX_UPPER_GLOVES, "Color/Tint" ));
addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Color/Tint" ));
addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Color/Tint" ));
addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry(TEX_HEAD_TATTOO, "Color/Tint" ));
}
LLEditWearableDictionary::TextureCtrls::TextureCtrls()

12
indra/newview/llvoavatar.cpp
View File

@ -4886,7 +4886,7 @@ BOOL LLVOAvatar::loadAvatar()
}
// Uncomment to enable avatar_lad.xml debugging.
/* std::ofstream file;
std::ofstream file;
file.open("avatar_lad.log");
for( LLViewerVisualParam* param = (LLViewerVisualParam*) getFirstVisualParam();
param;
@ -4896,7 +4896,7 @@ BOOL LLVOAvatar::loadAvatar()
file << std::endl;
}
file.close();*/
file.close();
return TRUE;
}
@ -6355,6 +6355,14 @@ BOOL LLVOAvatar::teToColorParams( ETextureIndex te, U32 *param_name )
param_name[2] = 923; //"skirt_blue";
break;
case TEX_HEAD_TATTOO:
case TEX_LOWER_TATTOO:
case TEX_UPPER_TATTOO:
param_name[0] = 1071; //"tattoo_red";
param_name[1] = 1072; //"tattoo_green";
param_name[2] = 1073; //"tattoo_blue";
break;
default:
llassert(0);
return FALSE;

14
indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
View File

@ -57,6 +57,20 @@
tool_tip="Click to choose a picture"
top_pad="10"
width="94" />
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="80"
label="Color/Tint"
layout="topleft"
left_pad="20"
name="Color/Tint"
tool_tip="Click to open color picker"
top="10"
width="64" >
<color_swatch.commit_callback
function="ColorSwatch.Commit" />
</color_swatch>
</panel>
</panel>