From 91cfc450539a04b17f303d47813f8732f3769f9c Mon Sep 17 00:00:00 2001 From: iobyte Date: Fri, 9 Feb 2024 03:27:38 +0000 Subject: [PATCH] trackeditor: fix split segment tangents git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9316 30fe4595-0a0c-4342-8851-515496e4dcbd --- src/tools/trackeditor/utils/Properties.java | 2 +- src/tools/trackeditor/utils/SegmentVector.java | 13 ++++++++++++- src/tools/trackeditor/utils/TrackData.java | 4 +--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java index 3c004bb49..05584bea0 100644 --- a/src/tools/trackeditor/utils/Properties.java +++ b/src/tools/trackeditor/utils/Properties.java @@ -34,7 +34,7 @@ public class Properties private static Properties instance = new Properties(); private Vector propertiesListeners = new Vector(); public final String title = "sd2-trackeditor"; - public final String version = "1.4.39"; + public final String version = "1.4.40"; private String path; private double imageScale = 1; diff --git a/src/tools/trackeditor/utils/SegmentVector.java b/src/tools/trackeditor/utils/SegmentVector.java index 5362bde0c..6d51ec630 100644 --- a/src/tools/trackeditor/utils/SegmentVector.java +++ b/src/tools/trackeditor/utils/SegmentVector.java @@ -134,7 +134,18 @@ public class SegmentVector extends Vector get(i).dump(indent + " "); } } - + + public void dumpCalculated(String indent) + { + System.out.println(indent + "Track Segments"); + + for (int i = 0; i < size(); i++) + { + System.out.println(indent + " segment[" + i + "]"); + get(i).dump(indent + " ", true, false, false, false); + } + } + public void dumpLinks() { for (int i = 0; i < size(); i++) diff --git a/src/tools/trackeditor/utils/TrackData.java b/src/tools/trackeditor/utils/TrackData.java index be5cebeeb..96a6fde9e 100644 --- a/src/tools/trackeditor/utils/TrackData.java +++ b/src/tools/trackeditor/utils/TrackData.java @@ -293,16 +293,14 @@ public final class TrackData segment.setCalculatedBankingStart(previous.getCalculatedBankingEnd()); segment.setCalculatedBankingEnd(previous.getCalculatedBankingEnd()); + segment.setCalculatedStartTangent(previous.getCalculatedEndTangent()); segment.setCalculatedStartTangentLeft(previous.getCalculatedEndTangentLeft()); segment.setCalculatedStartTangentRight(previous.getCalculatedEndTangentRight()); if (hasSpline) { - segment.setCalculatedStartTangent(previous.getCalculatedStartTangent()); segment.setCalculatedEndTangent(previous.getCalculatedEndTangent()); - segment.setCalculatedStartTangentLeft(previous.getCalculatedStartTangentLeft()); segment.setCalculatedEndTangentLeft(previous.getCalculatedEndTangentLeft()); - segment.setCalculatedStartTangentRight(previous.getCalculatedStartTangentRight()); segment.setCalculatedEndTangentRight(previous.getCalculatedEndTangentRight()); } }