changed: redoing grapple again, freshly started
This commit is contained in:
Chris
@@ -1,8 +1,12 @@
|
||||
using System;
|
||||
using Drawing;
|
||||
using log4net.Appender;
|
||||
using NodeCanvas.Framework;
|
||||
using ParadoxNotion.Design;
|
||||
using ParadoxNotion.Services;
|
||||
using Reset.Units;
|
||||
using Sirenix.Serialization;
|
||||
using Unity.Cinemachine;
|
||||
using UnityEngine;
|
||||
|
||||
|
||||
@@ -28,10 +32,11 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
public BBParameter<AnimationCurve> endDeaccelerationCurve;
|
||||
|
||||
private float startTime;
|
||||
|
||||
private Vector3 velocityOnStart;
|
||||
|
||||
|
||||
private Vector3 originalDirection;
|
||||
public float originalDistance;
|
||||
public Vector3 originalLocation;
|
||||
|
||||
public float breakAtDistance;
|
||||
public float breakAtDotProduct;
|
||||
@@ -40,17 +45,19 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
private Vector3 smoothedInput;
|
||||
private Vector3 smoothedInputRefVelocity;
|
||||
|
||||
private Vector3 gizmoHookPoint;
|
||||
private Vector3 gizmoCenterPoint;
|
||||
private Vector3 gizmoDirection;
|
||||
private Vector3 gizmoStartPos;
|
||||
private Vector3 gizmoEndPos;
|
||||
private Vector3 gizmoSwingDirection;
|
||||
private Vector3 gizmoPointDirection;
|
||||
private Vector3 gizmoFinalDirection;
|
||||
private Vector3 gizmosSmoothedInput;
|
||||
|
||||
private Transform camera;
|
||||
|
||||
private float referenceSpeed;
|
||||
|
||||
private Vector3 finalDirection;
|
||||
|
||||
//Use for initialization. This is called only once in the lifetime of the task.
|
||||
private float yChangeMultipler;
|
||||
|
||||
//Use for initialization. This is called only once in the lifetime of the task.
|
||||
//Return null if init was successfull. Return an error string otherwise
|
||||
protected override string OnInit(){
|
||||
|
||||
@@ -63,37 +70,57 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
protected override void OnExecute(){
|
||||
camera = Camera.main.transform;
|
||||
MonoManager.current.onLateUpdate += DrawGrappleGizmo;
|
||||
originalLocation = agent.transform.position;
|
||||
originalDirection = agent.transform.position.DirectionTo(grapplePoint.value);
|
||||
originalDistance = Vector3.Distance(agent.transform.position, grapplePoint.value);
|
||||
|
||||
// Get the current move direction
|
||||
velocityOnStart = agent.outputMoveDirection;
|
||||
|
||||
// Use the current move direciton to initialize the direction
|
||||
finalDirection = velocityOnStart;
|
||||
|
||||
startTime = Time.time;
|
||||
currentSpeed = pullSpeedCurve.value[0].value * pullSpeedRange.value.y;
|
||||
finalDirection = Vector3.zero;
|
||||
|
||||
smoothedInput = agent.GetComponent<CharacterController>().velocity.normalized.Flatten(null, 0f, 0f);
|
||||
}
|
||||
|
||||
//Called once per frame while the action is active.
|
||||
protected override void OnUpdate(){
|
||||
// Add input changes
|
||||
// Calculate input
|
||||
Vector2 rawInput = agent.GetComponent<PlayerControls>().rawMoveInput;
|
||||
Vector3 input = Quaternion.LookRotation(agent.transform.position.DirectionTo(grapplePoint.value)) * new Vector3(rawInput.x, rawInput.y, 0f);
|
||||
// input = Quaternion.LookRotation(agent.transform.position.DirectionTo(grapplePoint.value)) * (camera.rotation * input);
|
||||
|
||||
smoothedInput = Vector3.SmoothDamp(smoothedInput, input, ref smoothedInputRefVelocity, 5f * Time.deltaTime);
|
||||
Vector3 input = new Vector3(rawInput.x, rawInput.y, 0f);
|
||||
|
||||
smoothedInput = Vector3.SmoothDamp(smoothedInput, input, ref smoothedInputRefVelocity, 1f);
|
||||
|
||||
// Create the distance variables
|
||||
Vector3 dirToPoint = agent.transform.position.DirectionTo(grapplePoint.value + (smoothedInput * 6));
|
||||
float currentDist = Vector3.Distance(agent.transform.position, grapplePoint.value);
|
||||
float currentDist = Vector3.Distance(agent.transform.position, grapplePoint.value);
|
||||
|
||||
var center = agent.transform.position + agent.transform.position.DirectionTo(grapplePoint.value).normalized * 5f;
|
||||
// Calculate the direction on XZ
|
||||
Vector3 directionToPoint = agent.transform.position.DirectionTo(grapplePoint.value);
|
||||
Vector3 directionToSwing = Quaternion.LookRotation(input) * directionToPoint;
|
||||
|
||||
// finalDirection = Vector3.Slerp(finalDirection, dirToPoint, originalDistance);
|
||||
// finalDirection = Vector3.Slerp(relativeStart, relativeEnd, currentDist / 5f);
|
||||
finalDirection = Vector3.Slerp(finalDirection, dirToPoint + smoothedInput, currentDist / 5f);
|
||||
finalDirection = Vector3.Slerp(directionToPoint, directionToSwing, (elapsedTime * .6f));
|
||||
|
||||
gizmoHookPoint = grapplePoint.value + (smoothedInput * 5);
|
||||
|
||||
// Flatten it
|
||||
// finalDirection.Flatten(null, 0f); // don't wanna flatten it to use the natural y as gravity
|
||||
|
||||
// Some math for getting the Y
|
||||
yChangeMultipler = Mathf.Lerp(yChangeMultipler, 0f, elapsedTime * .5f); // Starts at 1 so that the player has more ability to change height on start of swing, then smooths to zero
|
||||
|
||||
// Add Y, this is a test
|
||||
if (Vector3.Dot(finalDirection, Vector3.down) < 0) { // This should make you go up
|
||||
float yTarget = 10f;
|
||||
|
||||
finalDirection = Vector3.Slerp(finalDirection, finalDirection.Flatten(null, yTarget), 1f * Time.deltaTime);
|
||||
} else {
|
||||
float yTarget = -10f;
|
||||
|
||||
finalDirection = Vector3.Slerp(finalDirection, finalDirection.Flatten(null, yTarget), 1f * Time.deltaTime);
|
||||
}
|
||||
|
||||
Debug.Log(Vector3.Dot(directionToSwing, Vector3.down));
|
||||
|
||||
// Speed
|
||||
float evaluatedSpeed = pullSpeedCurve.value.Evaluate(Mathf.Clamp((Time.time - startTime) / 6f, 0f, Mathf.Infinity));
|
||||
|
||||
float speedAgainstCurve = Mathf.Lerp(pullSpeedRange.value.x, pullSpeedRange.value.y, evaluatedSpeed);
|
||||
|
||||
// Find how far from 0-1 the player is from the max and minimum distance
|
||||
@@ -116,16 +143,20 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
// Soften the speed changes
|
||||
currentSpeed = Mathf.Lerp(currentSpeed, speedAgainstCurve, 10f * Time.deltaTime);
|
||||
|
||||
Debug.Log(dirToPoint);
|
||||
dirToPoint.y *= 2.5f;
|
||||
|
||||
gizmoDirection = finalDirection;
|
||||
// agent.GetComponent<CharacterController>().Move((dirToPoint.normalized + smoothedInput) * currentSpeed * Time.deltaTime);
|
||||
agent.AddToCurrentDirection(finalDirection, currentSpeed * Time.deltaTime);
|
||||
|
||||
// Debug.Log( $"{ endDeaccelerationCurve.value.Evaluate(((slowdownDistance.value - currentDist)) )}");
|
||||
|
||||
if (Vector3.Dot(originalDirection, dirToPoint) < breakAtDotProduct) {
|
||||
// Gizmos
|
||||
gizmosSmoothedInput = smoothedInput;
|
||||
gizmoPointDirection = directionToPoint;
|
||||
gizmoSwingDirection = directionToSwing;
|
||||
gizmoFinalDirection = finalDirection;
|
||||
|
||||
agent.SetNewDirection(finalDirection.normalized.Flatten(null, 0));
|
||||
agent.SetNewGravity(finalDirection.y);
|
||||
agent.SmoothToSpeed(5f, 1f * Time.deltaTime, out referenceSpeed);
|
||||
|
||||
// agent.SmoothToDirection(finalDirection.Flatten(null, 0).normalized * evaluatedSpeed, 1f * Time.deltaTime, out referenceDirection);
|
||||
// agent.SmoothToGravitation(finalDirection.y, 1f, out referenceGravity);
|
||||
|
||||
if (Vector3.Dot(velocityOnStart, directionToPoint.normalized) < breakAtDotProduct) {
|
||||
EndAction(true);
|
||||
} else if (currentDist < breakAtDistance) {
|
||||
EndAction(true);
|
||||
@@ -133,22 +164,52 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
}
|
||||
|
||||
public void DrawGrappleGizmo(){
|
||||
// Destination gizmos
|
||||
using (Draw.WithColor(Color.blue)){
|
||||
Draw.Arrow(agent.transform.position, agent.transform.position + gizmoDirection);
|
||||
Draw.SolidCircle(grapplePoint.value, grapplePoint.value.DirectionTo(camera.position), 1f);
|
||||
Vector3 offsetTowardsCamera = grapplePoint.value.DirectionTo(camera.transform.position);
|
||||
|
||||
}
|
||||
// Grapple Point
|
||||
Draw.SolidCircle(grapplePoint.value + offsetTowardsCamera, grapplePoint.value.DirectionTo(camera.transform.position), .4f);
|
||||
Draw.Label2D(grapplePoint.value + offsetTowardsCamera * 2f + Vector3.up, "Grapple Point");
|
||||
|
||||
using (Draw.WithColor(Color.yellow)) {
|
||||
Draw.Arrow(grapplePoint.value, gizmoHookPoint);
|
||||
}
|
||||
using (Draw.WithLineWidth(1.5f)) {
|
||||
// Final Direction
|
||||
Draw.Line(agent.transform.position + Vector3.up, agent.transform.position + Vector3.up + gizmoFinalDirection.normalized * 2f);
|
||||
Draw.ArrowheadArc(agent.transform.position + Vector3.up, gizmoFinalDirection.normalized, 2f, 15f);
|
||||
|
||||
Color inactiveBlue = new(0, 0, 1, .1f);
|
||||
Color swingColor = Color.Lerp(Color.blue, inactiveBlue, (elapsedTime * .6f));
|
||||
Color dirColor = Color.Lerp(inactiveBlue, Color.blue, (elapsedTime * .6f));
|
||||
|
||||
// Swing Direction
|
||||
using (Draw.WithColor(swingColor)) {
|
||||
float swingLength = 2.2f;
|
||||
Vector3 swingStart = agent.transform.position + Vector3.up * .4f;
|
||||
Vector3 swingDir = swingStart + gizmoSwingDirection.normalized * swingLength;
|
||||
Draw.DashedLine(swingStart, swingDir, .2f, .2f);
|
||||
Draw.ArrowheadArc(swingStart, gizmoSwingDirection.normalized, swingLength, 15f);
|
||||
Draw.Label2D(swingDir + Vector3.up * .4f, "Swing Direction");
|
||||
}
|
||||
|
||||
// Point Direction
|
||||
using (Draw.WithColor(dirColor)) {
|
||||
float pointLength = 1.2f;
|
||||
Vector3 pointStart = agent.transform.position + Vector3.up * .2f;
|
||||
Vector3 pointDir = pointStart + gizmoPointDirection.normalized * pointLength;
|
||||
Draw.DashedLine(pointStart, pointDir, .2f, .2f);
|
||||
Draw.ArrowheadArc(pointStart, gizmoPointDirection.normalized, pointLength, 15f);
|
||||
Draw.Label2D(pointDir + Vector3.up * .4f, "Grapple Point Direction");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Input Gizmos
|
||||
using (Draw.WithColor(Color.red)) {
|
||||
Draw.SolidCircle(gizmoCenterPoint, gizmoCenterPoint.DirectionTo(camera.position), .2f);
|
||||
}
|
||||
|
||||
using (Draw.WithColor(Color.magenta)) {
|
||||
Draw.Line(agent.transform.position, grapplePoint.value);
|
||||
// Input left and right, up and down for size
|
||||
Vector3 inputGizmoOffset = (agent.transform.position + camera.rotation * Vector3.back + Vector3.up * .5f);
|
||||
Vector3 inputGizmoPosition = inputGizmoOffset + camera.rotation * Vector3.Lerp(Vector3.left, Vector3.right, (gizmosSmoothedInput.x - 1 ) / 2f + 1f);
|
||||
Draw.Line(inputGizmoOffset + camera.rotation * Vector3.left, inputGizmoOffset + camera.rotation * Vector3.right);
|
||||
Draw.SolidCircle(inputGizmoPosition, inputGizmoPosition.DirectionTo(camera.position), Mathf.Lerp(.2f, .6f, (gizmosSmoothedInput.y - 1 ) / 2f + 1f));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user