summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-12-03 09:25:30 -0500
committerOz Linden <oz@lindenlab.com>2013-12-03 09:25:30 -0500
commit83c62e7094df5ae355efc11b26ac6aa0b0c60da0 (patch)
tree1e7941b4fd9dfef2e8e164874c74b344e2184e9d /indra
parent915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (diff)
Update based on first project viewer tests.
Two more bones to better address back deformation: UPPER_BACK and LOWER_BACK Better deformation for breasts, belly, upper and lower back (seen using the Body Fat and Belly Size sliders) Minor tweaks in the avatar_lad.xml file for a few other minor shapes. Small typo bug (FITMESH-2) Updated rigs and corrected female mesh Removed skeleton-only files so that people all start from the same base meshes with example skinning These updates specifically address the following bugs: FITMESH-2, FITMESH-4, FITMESH-5, FITMESH-7, FITMESH-10 (.ma formats, not .dae)
Diffstat (limited to 'indra')
-rwxr-xr-x[-rw-r--r--]indra/newview/character/avatar_lad.xml59
-rwxr-xr-x[-rw-r--r--]indra/newview/character/avatar_skeleton.xml6
2 files changed, 50 insertions, 15 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 4631e012fd..5268498d56 100644..100755
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3825,7 +3825,11 @@
<volume_morph
name="BELLY"
scale="0.075 0.04 0.03"
- pos="0.07 0 -0.07"/>
+ pos="0.07 0 -0.02"/>
+ <volume_morph
+ name="PELVIS"
+ scale="0.075 0.04 0.03"
+ pos="0.07 0 -0.02"/>
</param_morph>
</param>
@@ -3873,12 +3877,12 @@
<param_morph>
<volume_morph
name="LEFT_PEC"
- scale="0.0 0.0 0.0"
- pos="0.0 -0.027 0.007"/>
+ scale="-0.05 0.0 0.0"
+ pos="-0.01 -0.01 -0.02"/>
<volume_morph
name="RIGHT_PEC"
- scale="0.0 0.0 0.0"
- pos="0.0 0.027 0.007"/>
+ scale="-0.05 0.0 0.0"
+ pos="-0.01 -0.01 -0.02"/>
</param_morph>
</param>
@@ -3899,12 +3903,12 @@
<param_morph>
<volume_morph
name="LEFT_PEC"
- scale="0.0 0.0 0.0"
- pos="0.0 -0.035 0.009"/>
+ scale="-0.051 0.0 0.0"
+ pos="-0.02 -0.01 -0.03"/>
<volume_morph
name="RIGHT_PEC"
- scale="0.0 0.0 0.0"
- pos="0.0 0.035 0.009"/>
+ scale="-0.051 0.0 0.0"
+ pos="-0.02 -0.01 -0.03"/>
</param_morph>
</param>
@@ -3971,6 +3975,10 @@
scale="0.0 -0.01 0.0"
pos="0.0 0.0 0"/>
<volume_morph
+ name="UPPER_BACK"
+ scale="-0.01 -0.01 0.0"
+ pos="0.0 0.0 0"/>
+ <volume_morph
name="CHEST"
scale="-0.01 -0.01 0.0"
pos="0.01 0.0 0"/>
@@ -4021,6 +4029,10 @@
scale="-0.01 -0.01 0.0"
pos="0.01 0.0 0"/>
<volume_morph
+ name="UPPER_BACK"
+ scale="-0.01 -0.01 0.0"
+ pos="0.0 0.0 0"/>
+ <volume_morph
name="CHEST"
scale="-0.02 -0.02 0.0"
pos="0.01 0.0 0"/>
@@ -4069,13 +4081,31 @@
scale="0.02 0.03 0.03"
pos="0 0 -0.03"/>
<volume_morph
+ name="PELVIS"
+ scale="0.02 0.03 0.03"
+ pos="0 0 -0.03"/>
+ <volume_morph
+ name="UPPER_BACK"
+ scale="0.01 0.03 0.0"
+ pos="-0.03 0 0"/>
+ <volume_morph
+ name="LOWER_BACK"
+ scale="0.04 0.06 0.0"
+ pos="-0.06 0 0"/>
+ <volume_morph
+ name="LEFT_HANDLE"
+ pos="0.0 0.08 0.0"/>
+ <volume_morph
+ name="RIGHT_HANDLE"
+ pos="0.0 -0.08 0.0"/>
+ <volume_morph
name="LEFT_PEC"
scale="0.0367 0.0367 0.016"
- pos="0.031 -0.005 -0.013"/>
+ pos="0.00 -0.005 -0.013"/>
<volume_morph
name="RIGHT_PEC"
scale="0.0367 0.0367 0.016"
- pos="0.031 0.005 -0.013"/>
+ pos="0.00 0.005 -0.013"/>
<volume_morph
name="BELLY"
scale="0.09 0.08 0.07"
@@ -4188,6 +4218,9 @@
name="BELLY"
scale="0.0 0.02 0.0"/>
<volume_morph
+ name="LOWER_BACK"
+ scale="0.0 0.02 0.0"/>
+ <volume_morph
name="LEFT_HANDLE"
pos="0.0 0.025 0.0"/>
<volume_morph
@@ -4244,11 +4277,11 @@
<volume_morph
name="LEFT_PEC"
scale="0.0 0.0 0.0"
- pos="-0.01 -0.024 -0.05"/>
+ pos="-0.03 -0.024 -0.01"/>
<volume_morph
name="RIGHT_PEC"
scale="0.0 0.0 0.0"
- pos="-0.01 0.024 -0.05"/>
+ pos="-0.03 0.024 -0.01"/>
</param_morph>
</param>
diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml
index 7ab20f8c6b..6b07bbc1d3 100644..100755
--- a/indra/newview/character/avatar_skeleton.xml
+++ b/indra/newview/character/avatar_skeleton.xml
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
-<linden_skeleton version="1.0" num_bones="51" num_collision_volumes="24">
+<linden_skeleton version="1.0" num_bones="53" num_collision_volumes="26">
<bone name="mPelvis" pos="0.000 0.000 1.067" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 1.067015">
<collision_volume name="PELVIS" pos = "-0.01 0 -0.02" rot="0.000000 8.00000 0.000000" scale="0.12 0.16 0.17"/>
<collision_volume name="BUTT" pos = "-0.06 0 -0.1" rot="0.000000 0.00000 0.000000" scale="0.1 0.1 0.1"/>
<bone name="mTorso" pos="0.000 0.000 0.084" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 0.084073">
- <collision_volume name="BELLY" pos = "0.04 0 0.028" rot="0.000000 8.00000 0.000000" scale="0.09 0.13 0.15"/>
+ <collision_volume name="BELLY" pos = "0.028 0 0.04" rot="0.000000 8.00000 0.000000" scale="0.09 0.13 0.15"/>
+ <collision_volume name="LOWER_BACK" pos = "0.0 0.0 0.023" rot="0.000000 0.00000 0.000000" scale="0.09 0.13 0.15"/>
<collision_volume name="LEFT_HANDLE" pos = "0.0 0.10 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/>
<collision_volume name="RIGHT_HANDLE" pos = "0.0 -0.10 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/>
<bone name="mChest" pos="-0.015 0.000 0.205" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.015368 0.000000 0.204877">
<collision_volume name="CHEST" pos = "0.028 0 0.07" rot="0.000000 -10.00000 0.000000" scale="0.11 0.15 0.2"/>
+ <collision_volume name="UPPER_BACK" pos = "0.0 0.0 0.017" rot="0.000000 0.00000 0.000000" scale="0.09 0.13 0.15"/>
<collision_volume name="LEFT_PEC" pos = "0.119 0.082 0.042" rot="0.000000 4.29000 0.000000" scale="0.05 0.05 0.05"/>
<collision_volume name="RIGHT_PEC" pos = "0.119 -0.082 0.042" rot="0.000000 4.29000 0.000000" scale="0.05 0.05 0.05"/>
<bone name="mNeck" pos="-0.010 0.000 0.251" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.009507 0.000000 0.251108">