Compare commits
3 Commits
30afcc15d2
...
3499e33953
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3499e33953 | ||
|
|
81bc5da2c0 | ||
|
|
f1d58aa9fe |
File diff suppressed because it is too large
Load Diff
@@ -97,7 +97,7 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
Vector3 input = new(rawInput.x, rawInput.y, 0f);
|
||||
|
||||
smoothedInput = Vector3.SmoothDamp(smoothedInput, input, ref smoothedInputRefVelocity, 1f);
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Smoothed Input", smoothedInput.ToString());
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Smoothed Input", smoothedInput);
|
||||
|
||||
// The swing angle needs to change for the downwards swing, based on distance to the ground
|
||||
Physics.Raycast(agent.transform.position, Vector3.down, out RaycastHit hit);
|
||||
@@ -110,7 +110,7 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
float outwardsAngle = Mathf.Lerp(0f, -60f, currentDist / 15f);
|
||||
float outputAngle = inwardsAngle + outwardsAngle;
|
||||
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Output Angle", outputAngle.ToString() + $"({inwardsAngle.ToString()} + {outwardsAngle.ToString()})");
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Output Angle", outputAngle + $"({inwardsAngle} + {outwardsAngle})");
|
||||
|
||||
// Calculate the swing direction.
|
||||
// Vector3 swingDirection = Quaternion.LookRotation(smoothedInput) * directionToPoint * smoothedInput.magnitude; // Old
|
||||
@@ -190,8 +190,8 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
Quaternion.LookRotation(directionToPoint) * -directionToPoint.Flatten(null, null, 0).normalized
|
||||
);
|
||||
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Horizontal Dot", xzDot.ToString());
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Vertical Dot", yDot.ToString());
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Horizontal Dot", xzDot);
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Vertical Dot", yDot);
|
||||
|
||||
// Check if done
|
||||
if (xzDot < horizontalDotBreak || yDot < verticalDotBreak) {
|
||||
@@ -219,7 +219,7 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
float outwardsAngle = Mathf.Lerp(0f, -60f, currentDist / 15f);
|
||||
float outputAngle = inwardsAngle + outwardsAngle;
|
||||
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Output Angle", outputAngle.ToString() + $"({inwardsAngle.ToString()} + {outwardsAngle.ToString()})");
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "Output Angle", outputAngle + $"({inwardsAngle} + {outwardsAngle})");
|
||||
|
||||
Vector3 pointDirectionXZStable = agent.transform.position.DirectionTo(grapplePoint.value.Flatten(null, agent.transform.position.y));
|
||||
Vector3 rightSwingDirectin = Quaternion.AngleAxis(100f + outputAngle, Vector3.up) * pointDirectionXZStable; // Working
|
||||
@@ -253,7 +253,7 @@ namespace NodeCanvas.Tasks.Actions {
|
||||
Vector3 xAxisTargetDirection = Vector3.Lerp(rightSwingDirectin, leftSwingDirectin, Mathf.Abs((input.x - 1f) / 2f));
|
||||
targetSwingDirection = Vector3.Slerp(targetSwingDirection, xAxisTargetDirection, Mathf.Abs((input.x)));
|
||||
// targetSwingDirection = xAxisTargetDirection;
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "LR Input Dot", Mathf.Abs((input.x - 1f) / 2f).ToString());
|
||||
DebugOverlayDrawer.ChangeValue("Grapple", "LR Input Dot", Mathf.Abs((input.x - 1f) / 2f));
|
||||
}
|
||||
|
||||
return targetSwingDirection.normalized;
|
||||
|
||||
@@ -73,7 +73,7 @@ namespace Reset.Core.Tools{
|
||||
GameObject thisPageObject = null;
|
||||
bool alreadyExisted = false;
|
||||
|
||||
// This checks for a gameobject with the page name. Sets it if it finds it
|
||||
// This checks for a page with the gameobject's name. Sets it if it finds it
|
||||
foreach (var page in Instance.Pages) {
|
||||
if (page.Key.name == $"{Instance.pageNamePrefix}{pageName}") {
|
||||
thisPageObject = page.Key;
|
||||
@@ -82,7 +82,7 @@ namespace Reset.Core.Tools{
|
||||
}
|
||||
}
|
||||
|
||||
// Otherwise, this will make a new one and add it
|
||||
// Otherwise, this will make a new GameObject/page and add it
|
||||
UIDocument thisDocument;
|
||||
|
||||
if (thisPageObject == null) {
|
||||
@@ -92,7 +92,7 @@ namespace Reset.Core.Tools{
|
||||
// Add it to the list of page objects and set it's transform
|
||||
KeyValuePair<GameObject, List<string>> newPage = new(thisPageObject, new List<string>());
|
||||
Instance.Pages.Add(newPage.Key, newPage.Value);
|
||||
thisPageObject.transform.SetParent(Instance.canvasRootGameObject.transform);
|
||||
thisPageObject.transform.SetParent(Instance.root.transform);
|
||||
|
||||
// Add a UI Document for it, give it the base template
|
||||
thisDocument = thisPageObject.AddComponent<UIDocument>();
|
||||
@@ -138,18 +138,16 @@ namespace Reset.Core.Tools{
|
||||
}
|
||||
|
||||
// Publicly accessible method to change the value
|
||||
public static void ChangeValue(string pageName, string sourceName, string newValue){
|
||||
try {
|
||||
Instance.values[$"{pageName}/{sourceName}"].text = newValue;
|
||||
} catch (Exception e) {
|
||||
public static void ChangeValue(string pageName, string sourceName, object newValue){
|
||||
try {
|
||||
if (Instance.values.ContainsKey($"{pageName}/{sourceName}")) {
|
||||
Instance.values[$"{pageName}/{sourceName}"].text = newValue.ToString();
|
||||
} else {
|
||||
AddOnOverlay(pageName, sourceName);
|
||||
Instance.values[$"{pageName}/{sourceName}"].text = newValue;
|
||||
throw;
|
||||
} catch (Exception exception) {
|
||||
Debug.LogError($"Failed to both update an existing or create a new debug overlay: {exception.Message}" );
|
||||
throw;
|
||||
Instance.values[$"{pageName}/{sourceName}"].text = newValue.ToString();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Debug.LogError($"Failed to both update an existing or create a new debug overlay: {e.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user