Skip to content

Commit 1bd917f

Browse files
committed
Inspector bug fixed.
1 parent ecfb8b1 commit 1bd917f

File tree

144 files changed

+1292
-2267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+1292
-2267
lines changed

ClothPhysics/Assets/Mats/Materials.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.
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Malaga
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 2800000, guid: afdaec41b0f209743962508c2a7d6916, type: 3}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _GlossMapScale: 1
64+
- _Glossiness: 0.5
65+
- _GlossyReflections: 1
66+
- _Metallic: 0
67+
- _Mode: 0
68+
- _OcclusionStrength: 1
69+
- _Parallax: 0.02
70+
- _SmoothnessTextureChannel: 0
71+
- _SpecularHighlights: 1
72+
- _SrcBlend: 1
73+
- _UVSec: 0
74+
- _ZWrite: 1
75+
m_Colors:
76+
- _Color: {r: 1, g: 1, b: 1, a: 1}
77+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
78+
m_BuildTextureStacks: []

ClothPhysics/Assets/Mats/Materials/Malaga.mat.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.

ClothPhysics/Assets/Prefabs/Flag.prefab

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ MeshRenderer:
6060
m_RenderingLayerMask: 1
6161
m_RendererPriority: 0
6262
m_Materials:
63-
- {fileID: 2100000, guid: 70b576430eb833b40a55b76283e3161b, type: 2}
63+
- {fileID: 2100000, guid: 516756ee5f1086b41bd4f251528122b4, type: 2}
6464
m_StaticBatchInfo:
6565
firstSubMesh: 0
6666
subMeshCount: 0
@@ -98,6 +98,12 @@ MonoBehaviour:
9898
m_TimeStep: 0.02
9999
m_Substeps: 5
100100
m_Paused: 1
101+
m_Gravity: {x: 0, y: -9.81, z: 0}
102+
m_NodeMass: 0.03
103+
m_NodeDamping: 0.3
104+
m_SpringDamping: 0.3
105+
m_TractionStiffness: 20
106+
m_FlexionStiffness: 15
101107
m_AffectedByWind: 1
102108
m_FixingByTexture: 0
103109
m_CanCollide: 1

ClothPhysics/Assets/Prefabs/SampleWarrior.prefab

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,6 +2077,12 @@ MonoBehaviour:
20772077
m_TimeStep: 0.02
20782078
m_Substeps: 5
20792079
m_Paused: 0
2080+
m_Gravity: {x: 0, y: -9.81, z: 0}
2081+
m_NodeMass: 0.03
2082+
m_NodeDamping: 1
2083+
m_SpringDamping: 1
2084+
m_TractionStiffness: 40
2085+
m_FlexionStiffness: 30
20802086
m_AffectedByWind: 0
20812087
m_FixingByTexture: 1
20822088
m_CanCollide: 1

ClothPhysics/Assets/Scenes/ClothSampleScene.unity

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,12 @@ MonoBehaviour:
598598
m_TimeStep: 0.02
599599
m_Substeps: 5
600600
m_Paused: 1
601+
m_Gravity: {x: 0, y: -9.81, z: 0}
602+
m_NodeMass: 0.03
603+
m_NodeDamping: 0.3
604+
m_SpringDamping: 0.3
605+
m_TractionStiffness: 20
606+
m_FlexionStiffness: 15
601607
m_AffectedByWind: 0
602608
m_FixingByTexture: 1
603609
m_CanCollide: 0
@@ -1120,6 +1126,12 @@ MonoBehaviour:
11201126
m_TimeStep: 0.007
11211127
m_Substeps: 1
11221128
m_Paused: 1
1129+
m_Gravity: {x: 0, y: -9.81, z: 0}
1130+
m_NodeMass: 0.03
1131+
m_NodeDamping: 0.3
1132+
m_SpringDamping: 0.3
1133+
m_TractionStiffness: 20
1134+
m_FlexionStiffness: 15
11231135
m_AffectedByWind: 0
11241136
m_FixingByTexture: 1
11251137
m_CanCollide: 1
@@ -1390,13 +1402,25 @@ PrefabInstance:
13901402
propertyPath: m_LocalEulerAnglesHint.z
13911403
value: 0
13921404
objectReference: {fileID: 0}
1405+
- target: {fileID: 7945908319452971428, guid: c8bb9f24a9ed08541a45b7bc699dacc0, type: 3}
1406+
propertyPath: Mass
1407+
value: 0.82
1408+
objectReference: {fileID: 0}
13931409
- target: {fileID: 7945908319452971428, guid: c8bb9f24a9ed08541a45b7bc699dacc0, type: 3}
13941410
propertyPath: m_Substeps
13951411
value: 1
13961412
objectReference: {fileID: 0}
13971413
- target: {fileID: 7945908319452971428, guid: c8bb9f24a9ed08541a45b7bc699dacc0, type: 3}
13981414
propertyPath: m_TimeStep
1399-
value: 0.0087
1415+
value: 0.007
1416+
objectReference: {fileID: 0}
1417+
- target: {fileID: 7945908319452971428, guid: c8bb9f24a9ed08541a45b7bc699dacc0, type: 3}
1418+
propertyPath: m_NodeMassProxy
1419+
value: -0.06
1420+
objectReference: {fileID: 0}
1421+
- target: {fileID: 7945908319452971428, guid: c8bb9f24a9ed08541a45b7bc699dacc0, type: 3}
1422+
propertyPath: m_SolvingMethod
1423+
value: 1
14001424
objectReference: {fileID: 0}
14011425
- target: {fileID: 7945908319452971428, guid: c8bb9f24a9ed08541a45b7bc699dacc0, type: 3}
14021426
propertyPath: m_CollidingMeshes.Array.size

0 commit comments

Comments
 (0)