Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove collisions between box colliders and sphere colliders #202

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
92 changes: 78 additions & 14 deletions Ecosystem/Assets/Resources/Prefabs/Animals/EcoBear.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 544792022124337019}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7401787944804568421
MonoBehaviour:
Expand Down Expand Up @@ -873,6 +873,68 @@ Transform:
m_Father: {fileID: 4843140740582838852}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0.00000023362128, y: -0.0000006520363, z: -29.483406}
--- !u!1 &4143898090840446108
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1989219069708907523}
- component: {fileID: 6099936823869748466}
- component: {fileID: 5332121943505842391}
m_Layer: 15
m_Name: CollisionBody
m_TagString: Bear
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1989219069708907523
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4143898090840446108}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 544792022124337019}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &6099936823869748466
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4143898090840446108}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!136 &5332121943505842391
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4143898090840446108}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4817363271471425423
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1454,6 +1516,7 @@ Transform:
m_Children:
- {fileID: 6202726201221624531}
- {fileID: 6806383843864788235}
- {fileID: 1989219069708907523}
- {fileID: 4209797981683069471}
- {fileID: 5745841613518323677}
- {fileID: 9072426238585536074}
Expand Down Expand Up @@ -1560,6 +1623,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b65414bb43209374c86329675bc191ee, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &7509506793630284121
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1651,7 +1715,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 544792022124337019}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &6405190242370463797
SphereCollider:
Expand Down Expand Up @@ -1962,7 +2026,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -2047,6 +2111,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
m_PrefabInstance: {fileID: 1599429246770187842}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3410853300184415869 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4136443473164136511, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
m_PrefabInstance: {fileID: 1599429246770187842}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0f33f2c7a1419e740be5570d71daa2bf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8610027635385015251 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7011725190466901393, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
Expand Down Expand Up @@ -2091,14 +2166,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 920e87bfe7fe9274dbe2c10fc8c06029, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3410853300184415869 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4136443473164136511, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
m_PrefabInstance: {fileID: 1599429246770187842}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0f33f2c7a1419e740be5570d71daa2bf, type: 3}
m_Name:
m_EditorClassIdentifier:
70 changes: 67 additions & 3 deletions Ecosystem/Assets/Resources/Prefabs/Animals/EcoDeer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3350421026760717125}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1611194173291749041
MonoBehaviour:
Expand Down Expand Up @@ -4830,7 +4830,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3350421026760717125}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &6776153342693034266
SphereCollider:
Expand Down Expand Up @@ -5587,6 +5587,68 @@ Transform:
m_Father: {fileID: 7297888203524714111}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: -12.396441, y: 15.353037, z: -1.154628}
--- !u!1 &5587942226253188095
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2482981478392024048}
- component: {fileID: 6163810713771259581}
- component: {fileID: 2450439116839188765}
m_Layer: 16
m_Name: CollisionBody
m_TagString: Deer
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2482981478392024048
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5587942226253188095}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3350421026760717125}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &6163810713771259581
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5587942226253188095}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!136 &2450439116839188765
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5587942226253188095}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &5652333481777833550
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7323,6 +7385,7 @@ Transform:
- {fileID: 4704647009540235580}
- {fileID: 4898058360673817619}
- {fileID: 2612359751320925015}
- {fileID: 2482981478392024048}
- {fileID: 1583206724766175299}
- {fileID: 4284669953163483551}
- {fileID: 497818961259405540}
Expand Down Expand Up @@ -7429,6 +7492,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9414ef04b79fdc7498427d2db88290e7, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &7167050597269155267
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -9983,7 +10047,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
propertyPath: m_LocalPosition.x
Expand Down
80 changes: 72 additions & 8 deletions Ecosystem/Assets/Resources/Prefabs/Animals/EcoRabbit.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 831424744415161892}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5874587009778383877
MonoBehaviour:
Expand Down Expand Up @@ -924,6 +924,7 @@ Transform:
m_Children:
- {fileID: 6466567423500765419}
- {fileID: 1601967919905564320}
- {fileID: 301250397837998360}
- {fileID: 6132990314379234639}
- {fileID: 7268078574618211150}
- {fileID: 2093779445486166218}
Expand Down Expand Up @@ -1002,6 +1003,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 722870adf75749399b54d4edf4c101cf, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!114 &2656864231929346077
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1418,6 +1420,68 @@ Transform:
m_Father: {fileID: 8709122171180440129}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4604134742077945277
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 301250397837998360}
- component: {fileID: 6294318335166490769}
- component: {fileID: 4441774290197562035}
m_Layer: 17
m_Name: CollisionBody
m_TagString: Rabbit
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &301250397837998360
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4604134742077945277}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.6119344, y: -0.40502945, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 831424744415161892}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &6294318335166490769
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4604134742077945277}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!136 &4441774290197562035
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4604134742077945277}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4673196777752908634
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2097,7 +2161,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 831424744415161892}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!135 &7194725648983189641
SphereCollider:
Expand Down Expand Up @@ -2361,7 +2425,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -2441,6 +2505,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
--- !u!4 &2093779445486166218 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
m_PrefabInstance: {fileID: 8564565261024153794}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5745726529469456637 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4136443473164136511, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
Expand Down Expand Up @@ -2496,8 +2565,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 920e87bfe7fe9274dbe2c10fc8c06029, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &2093779445486166218 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7770376172294729736, guid: b11869fe3d5ecbf4b912f33fa4a312db, type: 3}
m_PrefabInstance: {fileID: 8564565261024153794}
m_PrefabAsset: {fileID: 0}
Loading