aboutsummaryrefslogtreecommitdiff
path: root/JamHelper/Assets/JamTools/FPSControllerVelocity
diff options
context:
space:
mode:
Diffstat (limited to 'JamHelper/Assets/JamTools/FPSControllerVelocity')
-rw-r--r--JamHelper/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity65
-rw-r--r--JamHelper/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs12
2 files changed, 57 insertions, 20 deletions
diff --git a/JamHelper/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity b/JamHelper/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
index c44bd18..139d3fa 100644
--- a/JamHelper/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
+++ b/JamHelper/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
@@ -749,7 +749,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh28150
+ m_Name: pb_Mesh35256
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -907,6 +907,35 @@ Mesh:
offset: 0
size: 0
path:
+--- !u!1 &148244777 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7739210602112578987, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ m_PrefabInstance: {fileID: 6879717249385526193}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &148244782
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 148244777}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 60e373202cc879c4a8e781f92dbdcb48, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &148244783
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 148244777}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 63b841e9c9589044db9f0b7edfca90bd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &153808474
GameObject:
m_ObjectHideFlags: 0
@@ -1696,7 +1725,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh28166
+ m_Name: pb_Mesh35268
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -2110,7 +2139,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh28062
+ m_Name: pb_Mesh35188
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7040,7 +7069,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh27806
+ m_Name: pb_Mesh34970
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7204,7 +7233,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh28264
+ m_Name: pb_Mesh35352
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7550,7 +7579,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh27956
+ m_Name: pb_Mesh35090
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7745,7 +7774,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh28220
+ m_Name: pb_Mesh35318
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7909,7 +7938,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh27976
+ m_Name: pb_Mesh35102
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -8754,7 +8783,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh28114
+ m_Name: pb_Mesh35232
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -14056,7 +14085,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh27938
+ m_Name: pb_Mesh35062
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -14332,7 +14361,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh27846
+ m_Name: pb_Mesh35002
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -14496,7 +14525,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh28126
+ m_Name: pb_Mesh35244
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -16072,6 +16101,14 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 685442961}
+ - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_MoveSmooth
+ value: 0.2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LookSensitive
+ value: 1200
+ objectReference: {fileID: 0}
- target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
propertyPath: m_RootOrder
value: 13
@@ -16116,6 +16153,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578985, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_Interpolate
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 7739210602112578987, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
propertyPath: m_Name
value: Player_Velocity
diff --git a/JamHelper/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs b/JamHelper/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs
index c51fffc..cbb3bf0 100644
--- a/JamHelper/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs
+++ b/JamHelper/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs
@@ -128,6 +128,8 @@ namespace JamTools
float mouseX = Input.GetAxis("Mouse X");
float mouseY = Input.GetAxis("Mouse Y");
+ //mouseX = -0.1f; // test jittery
+
m_CameraRotation -= mouseY * Time.deltaTime * m_LookSensitive;
m_CameraRotation = Mathf.Clamp(m_CameraRotation, -90, 90);
Quaternion rot = Quaternion.Euler(m_CameraRotation, 0, 0);
@@ -186,7 +188,7 @@ namespace JamTools
float vy = m_Rigidbody.velocity.y;
Vector3 velocity = new Vector3(m_MoveDirection.x * Time.deltaTime * m_MoveSpeed, vy, m_MoveDirection.z * Time.deltaTime * m_MoveSpeed);
- m_Rigidbody.velocity = Vector3.Lerp(m_Rigidbody.velocity, velocity, m_MoveSmooth);
+ m_Rigidbody.velocity = Vector3.Slerp(m_Rigidbody.velocity, velocity, m_MoveSmooth);
}
void MoveInAirUpdate()
@@ -367,7 +369,6 @@ namespace JamTools
private void Update()
{
- LookAround();
MoveAroundUpdate();
MoveInAirUpdate();
Jump();
@@ -381,6 +382,7 @@ namespace JamTools
private void FixedUpdate()
{
+ LookAround();
MoveAroundFixedUpdate();
MoveInAirFixedUpdate();
DodgeFixed();
@@ -389,11 +391,5 @@ namespace JamTools
WallJumpFixedUpdate();
}
- private void OnDrawGizmos()
- {
-
- }
-
}
-
}
generated by cgit v1.1-26-g67d0 at 2025-05-23 06:44:59 +0000