Skip to content

Commit 6e2c39e

Browse files
committed
Remade colliding functions and more help boxes in inspector
1 parent 8b2db05 commit 6e2c39e

File tree

85 files changed

+5029
-4602
lines changed

Some content is hidden

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

85 files changed

+5029
-4602
lines changed

ClothPhysics/Assets/Mats/DebugMat1.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: DebugMat1
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_Shader: {fileID: 4800000, guid: 576cfbdd163223b41b16d880d957fb31, type: 3}
1212
m_ShaderKeywords:
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0

ClothPhysics/Assets/Mats/DebugMat2.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: DebugMat2
11-
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_Shader: {fileID: 4800000, guid: 576cfbdd163223b41b16d880d957fb31, type: 3}
1212
m_ShaderKeywords:
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0

ClothPhysics/Assets/Scenes/SampleScene.unity

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ MonoBehaviour:
260260
m_Texture: {fileID: 2800000, guid: b0c4f64a0ff6e024ca5aa5d2ef473308, type: 3}
261261
m_Fixers:
262262
- {fileID: 0}
263-
m_CollidingObjects: []
263+
m_CollidingSpheres: []
264+
m_CollidingPlanes: []
265+
m_PenaltyDamping: 10
264266
--- !u!64 &780510720
265267
MeshCollider:
266268
m_ObjectHideFlags: 0
@@ -376,13 +378,13 @@ Transform:
376378
m_PrefabInstance: {fileID: 0}
377379
m_PrefabAsset: {fileID: 0}
378380
m_GameObject: {fileID: 798968756}
379-
m_LocalRotation: {x: -0, y: 0.121595055, z: -0, w: 0.9925798}
381+
m_LocalRotation: {x: -0, y: 0.553467, z: -0, w: 0.83287114}
380382
m_LocalPosition: {x: 28.3, y: 3.93, z: -5.44}
381383
m_LocalScale: {x: 1, y: 1, z: 1}
382384
m_Children: []
383385
m_Father: {fileID: 0}
384386
m_RootOrder: 3
385-
m_LocalEulerAnglesHint: {x: 0, y: 13.968, z: 0}
387+
m_LocalEulerAnglesHint: {x: 0, y: 67.21, z: 0}
386388
--- !u!1001 &951092855
387389
PrefabInstance:
388390
m_ObjectHideFlags: 0
@@ -616,8 +618,8 @@ Transform:
616618
m_PrefabAsset: {fileID: 0}
617619
m_GameObject: {fileID: 1549091143}
618620
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
619-
m_LocalPosition: {x: 40.38, y: 11.48, z: -3}
620-
m_LocalScale: {x: 2.424123, y: 2.424123, z: 2.424123}
621+
m_LocalPosition: {x: 40.29, y: 11.48, z: -1.86}
622+
m_LocalScale: {x: 2.5603, y: 2.5603, z: 2.5603}
621623
m_Children: []
622624
m_Father: {fileID: 0}
623625
m_RootOrder: 7
@@ -654,20 +656,22 @@ MonoBehaviour:
654656
m_Script: {fileID: 11500000, guid: 64ea09637adbe6041bed55d9f421aca4, type: 3}
655657
m_Name:
656658
m_EditorClassIdentifier:
657-
m_SolvingMethod: 1
659+
m_SolvingMethod: 3
658660
m_TimeStep: 0.02
659661
m_Substeps: 5
660662
m_Paused: 1
661-
m_AffectedByWind: 1
663+
m_AffectedByWind: 0
662664
m_FixingByTexture: 0
663665
m_CanCollide: 1
664666
m_WindFriction: 0.5
665667
m_WindSolverPrecission: 1
666668
m_Texture: {fileID: 2800000, guid: b0c4f64a0ff6e024ca5aa5d2ef473308, type: 3}
667669
m_Fixers:
668670
- {fileID: 1864401386}
669-
m_CollidingObjects:
671+
m_CollidingSpheres:
670672
- {fileID: 1549091143}
673+
m_CollidingPlanes: []
674+
m_PenaltyDamping: 10
671675
--- !u!64 &1711547926
672676
MeshCollider:
673677
m_ObjectHideFlags: 0
@@ -914,5 +918,6 @@ MonoBehaviour:
914918
m_WindSolverPrecission: 1
915919
m_Texture: {fileID: 2800000, guid: 036676216064c4948ab8b486600cd74b, type: 3}
916920
m_Fixers: []
917-
m_CollidingObjects:
918-
- {fileID: 1549091143}
921+
m_CollidingSpheres: []
922+
m_CollidingPlanes: []
923+
m_PenaltyDamping: 10

0 commit comments

Comments
 (0)