Skip to content

Commit f93f5d9

Browse files
authored
Merge pull request #475 from umasteeringgroup/MeshModifiers
Mesh modifiers
2 parents 6def95a + e9a1932 commit f93f5d9

34 files changed

+4390
-6241
lines changed
Binary file not shown.

UMAProject/Assets/UMA/Content/Core/HumanMale/Overlays/Face/M_Face DNT.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UMAProject/Assets/UMA/Content/Core/HumanMale/Recipes/BaseRecipes/HumanMale Base Recipe.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ MonoBehaviour:
3434
poly Head","scale":100,"copyIdx":-1,"overlays":[{"id":"M_Face","colorIdx":0,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0,0,0],"Tags":[],"tiling":[false,false,false,false,false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}}],"Tags":["Head","Face","smooshtarget"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":1,"isDisabled":false,"expandAlongNormal":0},{"id":"","scale":1,"copyIdx":-1,"overlays":[],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"","scale":1,"copyIdx":-1,"overlays":[],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"","scale":1,"copyIdx":-1,"overlays":[],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"","scale":1,"copyIdx":-1,"overlays":[],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"MaleEyes","scale":100,"copyIdx":-1,"overlays":[{"id":"Eye
3535
Overlay","colorIdx":4,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0],"Tags":[],"tiling":[false,false,false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}},{"id":"Default
3636
Eye Adjust","colorIdx":2,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":0.0,"y":0.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0],"Tags":[],"tiling":[false,false,false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}}],"Tags":["Eyes"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"MaleInnerMouth","scale":100,"copyIdx":-1,"overlays":[{"id":"InnerMouth","colorIdx":4,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":0.0},"rotation":0.0,"blendModes":[0,0,0],"Tags":[],"tiling":[false,false,false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}}],"Tags":["InnerMouth","Mouth","Head"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"","scale":1,"copyIdx":-1,"overlays":[],"Tags":[],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"M_Eyebrow","scale":100,"copyIdx":-1,"overlays":[{"id":"M_Face
37-
1 eyebrows2","colorIdx":4,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":0.0},"rotation":0.0,"blendModes":[0],"Tags":[],"tiling":[false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}}],"Tags":["Eyebrows"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"FemaleEyelash","scale":100,"copyIdx":-1,"overlays":[{"id":"F_H_Eyelash","colorIdx":4,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":0.0},"rotation":0.0,"blendModes":[0],"Tags":[],"tiling":[false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}}],"Tags":["Eyelash","Head"],"Races":[],"blendShapeTarget":"","overSmoosh":0.009999999776482582,"smooshDistance":0.0010000000474974514,"smooshInvertX":false,"smooshInvertY":true,"smooshInvertZ":false,"smooshInvertDist":true,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"LongHair","uvOverride":0,"isDisabled":false,"expandAlongNormal":0}],"colors":[],"fColors":[{"name":"Skin","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":["Color;#FD151500;_SSSCol","Float;0.5000;_BumpScale"],"alwaysUpdate":false,"alwaysUpdateParms":true,"isBaseColor":false,"displayColor":-1},{"name":"Hair","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1},{"name":"Eyes","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1},{"name":"Tattoo","colors":[157,10,10,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-16119139},{"name":"-","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":4,"race":"HumanMale","packedDna":[{"dnaType":"DynamicUMADna","dnaTypeHash":815443803,"packedDna":"{\"bDnaAsset\":{\"instanceID\":28386},\"bDnaAssetName\":\"HumanMaleDynamicDnaAsset\",\"bDnaSettings\":[{\"name\":\"skinGreenness\",\"value\":128},{\"name\":\"skinBlueness\",\"value\":128},{\"name\":\"skinRedness\",\"value\":128},{\"name\":\"height\",\"value\":128},{\"name\":\"headSize\",\"value\":128},{\"name\":\"headWidth\",\"value\":128},{\"name\":\"neckThickness\",\"value\":128},{\"name\":\"armLength\",\"value\":128},{\"name\":\"forearmLength\",\"value\":128},{\"name\":\"armWidth\",\"value\":128},{\"name\":\"forearmWidth\",\"value\":128},{\"name\":\"handsSize\",\"value\":128},{\"name\":\"feetSize\",\"value\":128},{\"name\":\"legSeparation\",\"value\":128},{\"name\":\"upperMuscle\",\"value\":128},{\"name\":\"lowerMuscle\",\"value\":128},{\"name\":\"upperWeight\",\"value\":128},{\"name\":\"lowerWeight\",\"value\":128},{\"name\":\"legsSize\",\"value\":128},{\"name\":\"belly\",\"value\":128},{\"name\":\"waist\",\"value\":128},{\"name\":\"gluteusSize\",\"value\":128},{\"name\":\"earsSize\",\"value\":128},{\"name\":\"earsPosition\",\"value\":128},{\"name\":\"earsRotation\",\"value\":128},{\"name\":\"noseSize\",\"value\":128},{\"name\":\"noseCurve\",\"value\":128},{\"name\":\"noseWidth\",\"value\":128},{\"name\":\"noseInclination\",\"value\":128},{\"name\":\"nosePosition\",\"value\":128},{\"name\":\"nosePronounced\",\"value\":128},{\"name\":\"noseFlatten\",\"value\":128},{\"name\":\"chinSize\",\"value\":128},{\"name\":\"chinPronounced\",\"value\":128},{\"name\":\"chinPosition\",\"value\":128},{\"name\":\"mandibleSize\",\"value\":128},{\"name\":\"jawsSize\",\"value\":128},{\"name\":\"jawsPosition\",\"value\":128},{\"name\":\"cheekSize\",\"value\":128},{\"name\":\"cheekPosition\",\"value\":128},{\"name\":\"lowCheekPronounced\",\"value\":128},{\"name\":\"lowCheekPosition\",\"value\":128},{\"name\":\"foreheadSize\",\"value\":128},{\"name\":\"foreheadPosition\",\"value\":128},{\"name\":\"lipsSize\",\"value\":128},{\"name\":\"mouthSize\",\"value\":128},{\"name\":\"eyeRotation\",\"value\":128},{\"name\":\"eyeSize\",\"value\":128},{\"name\":\"breastSize\",\"value\":128},{\"name\":\"eyeSpacing\",\"value\":128},{\"name\":\"bodyFitness\",\"value\":128}]}"}],"uvOverride":0,"wardrobeSet":[],"packedRecipeType":"Standard"}'
37+
1 eyebrows2","colorIdx":4,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":0.0},"rotation":0.0,"blendModes":[0],"Tags":[],"tiling":[false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}}],"Tags":["Eyebrows"],"Races":[],"blendShapeTarget":"","overSmoosh":0.0,"smooshDistance":0.0,"smooshInvertX":false,"smooshInvertY":false,"smooshInvertZ":false,"smooshInvertDist":false,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"","uvOverride":0,"isDisabled":false,"expandAlongNormal":0},{"id":"FemaleEyelash","scale":100,"copyIdx":-1,"overlays":[{"id":"F_H_Eyelash","colorIdx":4,"rect":[0.0,0.0,0.0,0.0],"isTransformed":false,"scale":{"x":1.0,"y":1.0,"z":0.0},"rotation":0.0,"blendModes":[0],"Tags":[],"tiling":[false],"uvOverride":0,"translate":{"x":0.0,"y":0.0}}],"Tags":["Eyelash","Head"],"Races":[],"blendShapeTarget":"","overSmoosh":0.009999999776482582,"smooshDistance":0.0010000000474974514,"smooshInvertX":false,"smooshInvertY":true,"smooshInvertZ":false,"smooshInvertDist":true,"smooshTargetTag":"","smooshableTag":"","isSwapSlot":false,"swapTag":"LongHair","uvOverride":0,"isDisabled":false,"expandAlongNormal":0}],"colors":[],"fColors":[{"name":"Skin","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":["Color;#FD151500;_SSSCol","Float;0.5000;_BumpScale"],"alwaysUpdate":false,"alwaysUpdateParms":true,"isBaseColor":false,"displayColor":-1},{"name":"Hair","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1},{"name":"Eyes","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1},{"name":"Tattoo","colors":[157,10,10,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-16119139},{"name":"-","colors":[255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0,255,255,255,255,0,0,0,0],"ShaderParms":[],"alwaysUpdate":false,"alwaysUpdateParms":false,"isBaseColor":false,"displayColor":-1}],"sharedColorCount":4,"race":"HumanMale","packedDna":[{"dnaType":"DynamicUMADna","dnaTypeHash":815443803,"packedDna":"{\"bDnaAsset\":{\"instanceID\":28382},\"bDnaAssetName\":\"HumanMaleDynamicDnaAsset\",\"bDnaSettings\":[{\"name\":\"skinGreenness\",\"value\":128},{\"name\":\"skinBlueness\",\"value\":128},{\"name\":\"skinRedness\",\"value\":128},{\"name\":\"height\",\"value\":128},{\"name\":\"headSize\",\"value\":128},{\"name\":\"headWidth\",\"value\":128},{\"name\":\"neckThickness\",\"value\":128},{\"name\":\"armLength\",\"value\":128},{\"name\":\"forearmLength\",\"value\":128},{\"name\":\"armWidth\",\"value\":128},{\"name\":\"forearmWidth\",\"value\":128},{\"name\":\"handsSize\",\"value\":128},{\"name\":\"feetSize\",\"value\":128},{\"name\":\"legSeparation\",\"value\":128},{\"name\":\"upperMuscle\",\"value\":128},{\"name\":\"lowerMuscle\",\"value\":128},{\"name\":\"upperWeight\",\"value\":128},{\"name\":\"lowerWeight\",\"value\":128},{\"name\":\"legsSize\",\"value\":128},{\"name\":\"belly\",\"value\":128},{\"name\":\"waist\",\"value\":128},{\"name\":\"gluteusSize\",\"value\":128},{\"name\":\"earsSize\",\"value\":128},{\"name\":\"earsPosition\",\"value\":128},{\"name\":\"earsRotation\",\"value\":128},{\"name\":\"noseSize\",\"value\":128},{\"name\":\"noseCurve\",\"value\":128},{\"name\":\"noseWidth\",\"value\":128},{\"name\":\"noseInclination\",\"value\":128},{\"name\":\"nosePosition\",\"value\":128},{\"name\":\"nosePronounced\",\"value\":128},{\"name\":\"noseFlatten\",\"value\":128},{\"name\":\"chinSize\",\"value\":128},{\"name\":\"chinPronounced\",\"value\":128},{\"name\":\"chinPosition\",\"value\":128},{\"name\":\"mandibleSize\",\"value\":128},{\"name\":\"jawsSize\",\"value\":128},{\"name\":\"jawsPosition\",\"value\":128},{\"name\":\"cheekSize\",\"value\":128},{\"name\":\"cheekPosition\",\"value\":128},{\"name\":\"lowCheekPronounced\",\"value\":128},{\"name\":\"lowCheekPosition\",\"value\":128},{\"name\":\"foreheadSize\",\"value\":128},{\"name\":\"foreheadPosition\",\"value\":128},{\"name\":\"lipsSize\",\"value\":128},{\"name\":\"mouthSize\",\"value\":128},{\"name\":\"eyeRotation\",\"value\":128},{\"name\":\"eyeSize\",\"value\":128},{\"name\":\"breastSize\",\"value\":128},{\"name\":\"eyeSpacing\",\"value\":128},{\"name\":\"bodyFitness\",\"value\":128}]}"}],"uvOverride":0,"wardrobeSet":[],"packedRecipeType":"Standard"}'
3838
forceKeep: 0
3939
labelLocalFiles: 0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: ac718b8ce852d1445b8fbe5c323134ac, type: 3}
13+
m_Name: DNTMask
14+
m_EditorClassIdentifier:
15+
translateSRP: 0
16+
AutoSetSRPMaterials: 1
17+
_material: {fileID: 2100000, guid: 7d8bbfbb11d67cf4b8bed9f70430f8d3, type: 2}
18+
_secondPass: {fileID: 0}
19+
srpMaterials: []
20+
materialType: 1
21+
channels:
22+
- channelType: 0
23+
textureFormat: 0
24+
materialPropertyName: _BaseMap
25+
sourceTextureName:
26+
Compression: 0
27+
DownSample: 0
28+
ConvertRenderTexture: 0
29+
NonShaderTexture: 0
30+
- channelType: 0
31+
textureFormat: 0
32+
materialPropertyName: _BumpMap
33+
sourceTextureName:
34+
Compression: 0
35+
DownSample: 0
36+
ConvertRenderTexture: 0
37+
NonShaderTexture: 0
38+
- channelType: 0
39+
textureFormat: 0
40+
materialPropertyName: _ThicknessMap
41+
sourceTextureName:
42+
Compression: 0
43+
DownSample: 0
44+
ConvertRenderTexture: 0
45+
NonShaderTexture: 0
46+
- channelType: 0
47+
textureFormat: 0
48+
materialPropertyName: _DetailMask
49+
sourceTextureName:
50+
Compression: 0
51+
DownSample: 0
52+
ConvertRenderTexture: 0
53+
NonShaderTexture: 0
54+
MipMapBias: 0
55+
AnisoLevel: 1
56+
MatFilterMode: 1
57+
Compression: 0
58+
shaderParms: []
59+
MaskWithCurrentColor: 0
60+
maskMultiplier: {r: 1, g: 1, b: 1, a: 1}
61+
MaterialName:
62+
ShaderName:

UMAProject/Assets/UMA/Content/SkinShaders/Materials/DNTMask.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)