Skip to content

Commit

Permalink
Friction Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@LarsZauberer
LarsZauberer committed Feb 10, 2021
1 parent 42d4c38 commit 34817ce
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 194 deletions.
11 changes: 11 additions & 0 deletions Assets/Friction.physicsMaterial2D
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!62 &6200000
PhysicsMaterial2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Friction
friction: 100
bounciness: 0
8 changes: 8 additions & 0 deletions Assets/Friction.physicsMaterial2D.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

310 changes: 116 additions & 194 deletions Assets/Scenes/SampleScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,136 +151,6 @@ Transform:
m_Father: {fileID: 1551824127}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &106896668
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 106896672}
- component: {fileID: 106896671}
- component: {fileID: 106896670}
- component: {fileID: 106896669}
m_Layer: 0
m_Name: UnstaticRect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!50 &106896669
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 106896668}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!61 &106896670
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 106896668}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 2, y: 2}
newSize: {x: 2, y: 2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2, y: 2}
m_EdgeRadius: 0
--- !u!212 &106896671
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 106896668}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 5d8670f5eb7eb8047adfad154907fa04, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &106896672
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 106896668}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.87, y: 0.99, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &352210817
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1448,62 +1318,50 @@ CompositeCollider2D:
m_ColliderPaths:
- m_Collider: {fileID: 768009925}
m_ColliderPaths:
- - X: 29999900
Y: 41
- X: 29999900
Y: -9799900
- X: 29799959
Y: -9799900
- X: 29799900
Y: -9799959
- X: 29799900
- - X: 110000000
Y: -50000000
- X: 110000000
Y: -10000000
- X: 110048072
Y: -10000000
- X: 110048072
Y: 0
- X: 30000000
Y: 0
- X: 30000000
Y: -29775000
- X: 29800000
Y: -29775000
- X: 29800000
Y: -30000000
- X: -89799992
Y: -30000000
- X: -89799992
Y: 50200000
- X: -100200008
Y: 50200000
- X: -100200008
Y: 50196080
- X: -110196072
Y: 50196080
- X: -110196072
Y: -50196080
- X: 110196072
Y: -50196080
- X: 110196072
Y: -40196180
- X: 110196113
Y: -40196180
- X: 110196172
Y: -40196121
- X: 110196172
Y: -9803881
- X: 110196113
Y: -9803822
- X: 110048172
Y: -9803822
- X: 110048172
Y: 41
- X: 110048113
Y: 100
- X: 29999959
Y: 100
Y: -29800000
- X: -90000000
Y: -29800000
- X: -90000000
Y: 50000000
- X: -110000000
Y: 50000000
- X: -110000000
Y: -50000000
m_CompositePaths:
m_Paths:
- - {x: 11.019578, y: -5.019608}
- {x: 11.019583, y: -0.9803822}
- {x: 11.004818, y: -0.9803528}
- {x: 11.004783, y: 0.00001}
- {x: 2.99999, y: -0.0000252}
- {x: 2.9999607, y: -0.97999}
- {x: 2.97999, y: -0.98002523}
- {x: 2.9799607, y: -3}
- - {x: 10.99997, y: -5}
- {x: 11.00003, y: -1}
- {x: 11.004807, y: -0.99997073}
- {x: 11.004778, y: 0}
- {x: 3, y: -0.000029300001}
- {x: 2.9999707, y: -2.9775}
- {x: 2.98, y: -2.9775293}
- {x: 2.9799707, y: -3}
- {x: -8.98, y: -2.9999707}
- {x: -8.980029, y: 5.02}
- {x: -11.019608, y: 5.019579}
- {x: -11.019578, y: -5.019608}
- {x: -8.980029, y: -2.98}
- {x: -9, y: -2.9799707}
- {x: -9.00003, y: 5}
- {x: -11, y: 4.999971}
- {x: -10.99997, y: -5}
m_VertexDistance: 0.0005
m_OffsetDistance: 0.00005
--- !u!50 &768009927
Expand Down Expand Up @@ -1717,37 +1575,27 @@ Rigidbody2D:
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 2.5
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: d0815cf0bda0c6645ba682eebb6e8628, type: 2}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!61 &1551824125
BoxCollider2D:
--- !u!70 &1551824125
CapsuleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1551824121}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_Material: {fileID: 6200000, guid: d0815cf0bda0c6645ba682eebb6e8628, type: 2}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 2.51, y: 3.8}
newSize: {x: 2.51, y: 3.8}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 2.51, y: 3.8}
m_EdgeRadius: 0
m_Direction: 0
--- !u!212 &1551824126
SpriteRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2311,3 +2159,77 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d4bdf011d4d149f42b5a06977a02fdab, type: 3}
--- !u!1001 &9039277333824966215
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 9039277333789250393, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250395, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_Name
value: UnstaticRect
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalPosition.x
value: 4.87
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.99
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9039277333789250407, guid: f1b637442ecec244bab0518128285747,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f1b637442ecec244bab0518128285747, type: 3}
11 changes: 11 additions & 0 deletions Assets/nullFriction.physicsMaterial2D
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!62 &6200000
PhysicsMaterial2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: nullFriction
friction: 0
bounciness: 0
8 changes: 8 additions & 0 deletions Assets/nullFriction.physicsMaterial2D.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 34817ce

Please sign in to comment.