Skip to content

Commit abaa19e

Browse files
committed
Finished welcome. Added all sorts of project scanning to verify setup
1 parent 281a095 commit abaa19e

36 files changed

+4190
-2387
lines changed
Binary file not shown.
Binary file not shown.

UMAProject/Assets/UMA/Content/Contrib/Materials/UMA_Mesh_Hair_DoubleSided.asset

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,14 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
translateSRP: 1
1616
AutoSetSRPMaterials: 1
17-
_material: {fileID: 2100000, guid: 9f64d6a59b10e1a4db966cf484f49622, type: 2}
18-
_secondPass: {fileID: 0}
19-
srpMaterials:
20-
- SRP: 1
21-
material: {fileID: 2100000, guid: 9f64d6a59b10e1a4db966cf484f49622, type: 2}
22-
secondPass: {fileID: 0}
23-
alternateKeywords:
24-
- _MainTex
25-
- _BumpMap
26-
- SRP: 2
27-
material: {fileID: 2100000, guid: 9cbdf960da83ce848b6fa53141ca2fe7, type: 2}
28-
secondPass: {fileID: 2100000, guid: 8146edb8bb821c34f956f820090a2adb, type: 2}
29-
alternateKeywords:
30-
- _BaseMap
31-
- _BumpMap
32-
- SRP: 3
33-
material: {fileID: 2100000, guid: 8146edb8bb821c34f956f820090a2adb, type: 2}
34-
secondPass: {fileID: 0}
35-
alternateKeywords:
36-
- _BaseMap
37-
- _BumpMap
17+
_material: {fileID: 2100000, guid: 9cbdf960da83ce848b6fa53141ca2fe7, type: 2}
18+
_secondPass: {fileID: 2100000, guid: 8146edb8bb821c34f956f820090a2adb, type: 2}
19+
srpMaterials: []
3820
materialType: 8
3921
channels:
4022
- channelType: 3
4123
textureFormat: 0
42-
materialPropertyName: _MainTex
24+
materialPropertyName: _BaseMap
4325
sourceTextureName:
4426
Compression: 0
4527
DownSample: 0

UMAProject/Assets/UMA/Content/Contrib/Materials/UMA_Mesh_Hair_DoubleSided_Alpha.mat

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Material:
1010
m_Name: UMA_Mesh_Hair_DoubleSided_Alpha
1111
m_Shader: {fileID: -6465566751694194690, guid: ab87b81d084dd6047b63be46465e63c2,
1212
type: 3}
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
1315
m_ValidKeywords: []
1416
m_InvalidKeywords:
1517
- _ALPHABLEND_ON
@@ -21,15 +23,16 @@ Material:
2123
m_CustomRenderQueue: -1
2224
stringTagMap: {}
2325
disabledShaderPasses: []
26+
m_LockedProperties:
2427
m_SavedProperties:
2528
serializedVersion: 3
2629
m_TexEnvs:
2730
- _BaseMap:
28-
m_Texture: {fileID: 2800000, guid: 80801db820717d041b8eecbdd95b02a5, type: 3}
31+
m_Texture: {fileID: 2800000, guid: 829395992e81a8b4c8d2bfd98851e39a, type: 3}
2932
m_Scale: {x: 1, y: 1}
3033
m_Offset: {x: 0, y: 0}
3134
- _BumpMap:
32-
m_Texture: {fileID: 2800000, guid: 6af2d89646650ec4fa747db84d299b99, type: 3}
35+
m_Texture: {fileID: 2800000, guid: c59b45917b12a5548bd5f02fa00d8cdc, type: 3}
3336
m_Scale: {x: 1, y: 1}
3437
m_Offset: {x: 0, y: 0}
3538
- _DetailAlbedoMap:
@@ -102,7 +105,7 @@ Material:
102105
- _MetallicModulation: 0
103106
- _MetallicStrength: 0
104107
- _Mode: 2
105-
- _NormalStrength: 1
108+
- _NormalStrength: 0.6
106109
- _OcclusionStrength: 1
107110
- _Parallax: 0.02
108111
- _Richness: 0.721

UMAProject/Assets/UMA/Content/Contrib/Materials/UMA_Mesh_Hair_DoubleSided_Cutout.mat

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Material:
1010
m_Name: UMA_Mesh_Hair_DoubleSided_Cutout
1111
m_Shader: {fileID: -6465566751694194690, guid: 29a5769127ec3494b916662d265737e1,
1212
type: 3}
13+
m_Parent: {fileID: 0}
14+
m_ModifiedSerializedProperties: 0
1315
m_ValidKeywords: []
1416
m_InvalidKeywords:
1517
- _ALPHATEST_ON
@@ -21,11 +23,12 @@ Material:
2123
m_CustomRenderQueue: -1
2224
stringTagMap: {}
2325
disabledShaderPasses: []
26+
m_LockedProperties:
2427
m_SavedProperties:
2528
serializedVersion: 3
2629
m_TexEnvs:
2730
- _BaseMap:
28-
m_Texture: {fileID: 2800000, guid: f4efbb243ca57b3448809bfbb51735dc, type: 3}
31+
m_Texture: {fileID: 2800000, guid: 34b880e2682c67a47b3ef6f89ff68e72, type: 3}
2932
m_Scale: {x: 1, y: 1}
3033
m_Offset: {x: 0, y: 0}
3134
- _BumpMap:
@@ -82,7 +85,7 @@ Material:
8285
m_Offset: {x: 0, y: 0}
8386
m_Ints: []
8487
m_Floats:
85-
- _AlphaClip: 0.42
88+
- _AlphaClip: 0.5
8689
- _BumpScale: 0.35
8790
- _BumpStrength: 0.344
8891
- _ColorModulation: 1.299
@@ -102,7 +105,7 @@ Material:
102105
- _MetallicModulation: 0
103106
- _MetallicStrength: 0
104107
- _Mode: 1
105-
- _NormalStrength: 1
108+
- _NormalStrength: 0.6
106109
- _OcclusionStrength: 1
107110
- _Parallax: 0.02
108111
- _Richness: 0.721

UMAProject/Assets/UMA/Content/Core/HumanFemale/Recipes/Base Recipes/HumanFemale Base Recipe.asset

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.
Binary file not shown.

UMAProject/Assets/UMA/Core/Editor/Scripts/GUIHelper.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,27 @@ public static Rect ShrinkRect(Rect rect, float inset, float xinset = -1)
140140
return new Rect(rect.x + xinset, rect.y + inset, rect.width - xinset * 2, rect.height - inset * 2);
141141
}
142142

143-
public static void BeginInsetArea(Color backgroundColor, Rect rect, float inset, float vertpadding, float xinset = -1)
143+
public static void BeginInsetArea(Color backgroundColor, Rect rect, float inset, float vertpadding, float xinset = -1, GUIStyle theStyle = null)
144144
{
145+
if (theStyle == null)
146+
{
147+
theStyle = EditorStyles.textField;
148+
}
149+
145150
if (xinset < 0)
146151
{
147152
xinset = inset;
148153
}
149-
EditorGUI.DrawRect(ShrinkRect(rect, inset, xinset), backgroundColor);
150-
GUILayout.BeginArea(ShrinkRect(rect, inset*2, xinset));
154+
//EditorGUI.DrawRect(ShrinkRect(rect, inset, xinset), backgroundColor);
155+
GUILayout.BeginArea(ShrinkRect(rect, inset/*2*/, xinset),theStyle);
151156
GUILayout.Space(vertpadding);
152157
}
153158

159+
public static void BeginInsetArea(Color backgroundColor, Rect rect, float inset)
160+
{
161+
EditorGUI.DrawRect(ShrinkRect(rect, inset, inset), backgroundColor);
162+
GUILayout.BeginArea(ShrinkRect(rect, inset*2, inset));
163+
}
154164

155165
public static void EndInsetArea()
156166
{

UMAProject/Assets/UMA/Core/Editor/Scripts/UMAWelcomeScenesEditor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public override void OnInspectorGUI()
5757
GUILayout.Space(20);
5858

5959
int delme = -1;
60+
float currentWidth = EditorGUIUtility.currentViewWidth;
6061
for (int i=0;i< uws.umaScenes.Count; i++)
6162
{
6263
GUILayout.BeginHorizontal();
@@ -98,7 +99,7 @@ public override void OnInspectorGUI()
9899
}
99100
uws.umaScenes[i].shortName = EditorGUILayout.TextField(uws.umaScenes[i].shortName, GUILayout.Width(120));
100101
uws.umaScenes[i].sceneTexture = (Texture2D)EditorGUILayout.ObjectField(uws.umaScenes[i].sceneTexture, typeof(Texture2D), false, GUILayout.Width(48), GUILayout.Height(48));
101-
uws.umaScenes[i].sceneDescription = EditorGUILayout.TextArea(uws.umaScenes[i].sceneDescription, GUILayout.ExpandWidth(true),GUILayout.Height(48));
102+
uws.umaScenes[i].sceneDescription = EditorGUILayout.TextArea(uws.umaScenes[i].sceneDescription,description, GUILayout.Width(360),GUILayout.Height(48));
102103
if(GUILayout.Button("X", GUILayout.Width(20)))
103104
{
104105
delme = i;

0 commit comments

Comments
 (0)