Skip to content

Adjust raycast math #2

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.

Sign up for GitHub

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

Open
yolanother wants to merge 36 commits into
base: main
Choose a base branch
from
Open

Adjust raycast math #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
55eb37c
Removed Sensor Toolkit Steering rig (still have a minor dependency on…
rgardler-msft Jan 29, 2022
14c34da
Allow individual sensors to have custom sensitivities. Remove the sep…
rgardler-msft Jan 30, 2022
50558e1
Remove over-zealous removal of avoidance length, this should be globa…
rgardler-msft Jan 30, 2022
7dc256f
Only update the sensors on a round robin for perf reasons... no notic…
rgardler-msft Jan 30, 2022
386fdfe
Improved debug message
rgardler-msft Jan 30, 2022
df6469d
Add some smoothing to direction changes
rgardler-msft Jan 30, 2022
07bd611
Remove time based smooting, didn't work well. Use avoidance strength …
rgardler-msft Jan 30, 2022
6fbaf41
Take off works, not landing yet. Replace waypoints code, thus allowin…
rgardler-msft Jan 31, 2022
5d6a00e
Revert "Take off works, not landing yet. Replace waypoints code, thus…
rgardler-msft Jan 31, 2022
727dda9
revert previous commit that was completely messed up. Redo removal of…
rgardler-msft Jan 31, 2022
52eb05d
Ensure the test scene works with the flying camera setup
rgardler-msft Jan 31, 2022
7385e93
Add take off back in
rgardler-msft Jan 31, 2022
39902ec
Better handling of take-off prep for landing
rgardler-msft Jan 31, 2022
5038f03
Some take off and landing tweaks
rgardler-msft Jan 31, 2022
eaf9a9f
Improved take-off mechanic. Move all state tracking into the animator.
rgardler-msft Feb 1, 2022
cc514f1
Aborted attempt to improve as part of Messy Game Jam
rgardler-msft Feb 19, 2022
079971d
Fixes to the dragon controller,
rgardler-msft Feb 21, 2022
51ee230
Some fine tuning of the dragon flight mechanics.
rgardler-msft Feb 21, 2022
3b32cd7
Land and stay on the ground for a minimum amount of time.
rgardler-msft Feb 21, 2022
a894e03
Landing and Take off now works - polish needed
rgardler-msft Feb 22, 2022
c83d285
A little more tuning of dragon navigation and take off/landing
rgardler-msft Feb 22, 2022
96966cb
Smooth out the flight a little - less jerking upwards when gravity is…
rgardler-msft Feb 22, 2022
d45ab21
If body starts in the air we need to start flying
rgardler-msft Feb 22, 2022
63429f1
Ensure we never spawn waypoints below ground
rgardler-msft Feb 23, 2022
649b95e
use the destination height relative to the terrain for calculating la…
rgardler-msft Feb 23, 2022
69a72c1
Debounce wingflaps
rgardler-msft Feb 24, 2022
bdb3ee7
A whole bunch of tuning on the dragon flight... getting much closer now.
rgardler-msft Mar 5, 2022
799c649
Smooth the repulson over time, now we are looking really good!
rgardler-msft Mar 5, 2022
e8500f4
Add speed controller to the animations
rgardler-msft Mar 5, 2022
688b3c0
More tilt when turning
rgardler-msft Mar 5, 2022
cf1fc28
Fix the landing and simplify some of the flight/landing phsyics
rgardler-msft Mar 6, 2022
1ceeafa
Handle landing on surfaces that are not at y == 0
rgardler-msft Mar 6, 2022
4571ca9
More simplification of the interim flight destination.
rgardler-msft Mar 7, 2022
5545628
Minor Refactorings
rgardler-msft Apr 7, 2022
e81ccd2
Protect against a null reference
rgardler-msft Apr 9, 2022
338ce33
Adjust ray calculations
yolanother Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,224 changes: 1,039 additions & 185 deletions Animations/DragonController.controller
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions Animations/Placeholders/Fly Backwards.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fly Backwards
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
0 ...ns/Placeholders/UpFly Backwards.anim.meta → ...ions/Placeholders/Fly Backwards.anim.meta
View file
Open in desktop
File renamed without changes.
53 changes: 53 additions & 0 deletions Animations/Placeholders/Fly Down Forward L.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fly Down Forward L
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
0 ...aceholders/UpFly Down Forward L.anim.meta → ...Placeholders/Fly Down Forward L.anim.meta
View file
Open in desktop
File renamed without changes.
53 changes: 53 additions & 0 deletions Animations/Placeholders/Fly Down Forward R.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fly Down Forward R
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
0 ...aceholders/UpFly Down Forward R.anim.meta → ...Placeholders/Fly Down Forward R.anim.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Animations/Placeholders/UpFly Up.anim → Animations/Placeholders/Fly Down.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UpFly Up
m_Name: Fly Down
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
Expand Down
0 Animations/Placeholders/UpFly Down.anim.meta → Animations/Placeholders/Fly Down.anim.meta
View file
Open in desktop
File renamed without changes.
53 changes: 53 additions & 0 deletions Animations/Placeholders/Fly Hover.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fly Hover
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
0 ...ations/Placeholders/UpFly Stand.anim.meta → Animations/Placeholders/Fly Hover.anim.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Animations/Placeholders/UpFly.anim → Animations/Placeholders/Fly L.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UpFly
m_Name: Fly L
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
Expand Down
0 Animations/Placeholders/UpFly L.anim.meta → Animations/Placeholders/Fly L.anim.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Animations/Placeholders/UpGlide.anim → Animations/Placeholders/Fly R.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UpGlide
m_Name: Fly R
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
Expand Down
0 Animations/Placeholders/UpFly R.anim.meta → Animations/Placeholders/Fly R.anim.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Animations/Placeholders/UpFly Down.anim → Animations/Placeholders/Fly Strafe L.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UpFly Down
m_Name: Fly Strafe L
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
Expand Down
0 ...ons/Placeholders/UpFly Strafe L.anim.meta → ...tions/Placeholders/Fly Strafe L.anim.meta
View file
Open in desktop
File renamed without changes.
53 changes: 53 additions & 0 deletions Animations/Placeholders/Fly Strafe R.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fly Strafe R
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
0 ...ons/Placeholders/UpFly Strafe R.anim.meta → ...tions/Placeholders/Fly Strafe R.anim.meta
View file
Open in desktop
File renamed without changes.
53 changes: 53 additions & 0 deletions Animations/Placeholders/Fly Up Turn L.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fly Up Turn L
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
0 ...ns/Placeholders/UpFly Up Turn L.anim.meta → ...ions/Placeholders/Fly Up Turn L.anim.meta
View file
Open in desktop
File renamed without changes.
Loading