diff --git a/src/drivers/simplix/simplix_trb1/car1-trb1/alpine-1.xml b/src/drivers/simplix/simplix_trb1/car1-trb1/alpine-1.xml
new file mode 100644
index 000000000..c4bba670f
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car1-trb1/alpine-1.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car1-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car1-trb1/e-track-4.xml
new file mode 100644
index 000000000..0e55aebf9
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car1-trb1/e-track-4.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/Corkscrew.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/Corkscrew.xml
new file mode 100644
index 000000000..3f03a2daa
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/Corkscrew.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/alpine-1.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/alpine-1.xml
new file mode 100644
index 000000000..cb56961a1
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/alpine-1.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml
index 9b30b2ef8..6c3370ac4 100644
--- a/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/default.xml
@@ -56,7 +56,7 @@
diff --git a/src/drivers/simplix/simplix_trb1/car2-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car2-trb1/e-track-4.xml
new file mode 100644
index 000000000..65eb647d9
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car2-trb1/e-track-4.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car3-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car3-trb1/e-track-4.xml
new file mode 100644
index 000000000..f413fd9f7
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car3-trb1/e-track-4.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car4-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car4-trb1/e-track-4.xml
new file mode 100644
index 000000000..2e850729d
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car4-trb1/e-track-4.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-2.xml b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-2.xml
new file mode 100644
index 000000000..47230384d
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-2.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-4.xml
new file mode 100644
index 000000000..a54a081ee
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car5-trb1/e-track-4.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-2.xml b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-2.xml
new file mode 100644
index 000000000..519e1cfbd
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-2.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-4.xml
new file mode 100644
index 000000000..868a7e0ce
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car6-trb1/e-track-4.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/car7-trb1/e-track-4.xml b/src/drivers/simplix/simplix_trb1/car7-trb1/e-track-4.xml
new file mode 100644
index 000000000..057f0e860
--- /dev/null
+++ b/src/drivers/simplix/simplix_trb1/car7-trb1/e-track-4.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml b/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml
index b0a237265..02185fd5a 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/Corkscrew.xml
@@ -23,10 +23,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml b/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml
index 8ecff5520..1eeb7b94e 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/alpine-1.xml
@@ -2,7 +2,7 @@
@@ -23,11 +23,11 @@
-
+
-
+
diff --git a/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml b/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml
index 982dcbb5d..d1752d954 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/alpine-2.xml
@@ -2,7 +2,7 @@
@@ -23,10 +23,10 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml b/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml
index 8ea5c9b4e..b5ac4dd64 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/e-track-1.xml
@@ -2,7 +2,7 @@
@@ -24,10 +24,10 @@
-
-
+
+
-
-
+
+
diff --git a/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml b/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml
index 73545eb47..9116bd632 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/e-track-2.xml
@@ -2,7 +2,7 @@
@@ -30,6 +30,6 @@
-
+
diff --git a/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml b/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml
index 116cc0ff3..92b4f92eb 100644
--- a/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml
+++ b/src/drivers/simplix/simplix_trb1/tracks/e-track-3.xml
@@ -23,11 +23,11 @@
-
+
-
+
diff --git a/src/drivers/simplix/src/unitclothoid.cpp b/src/drivers/simplix/src/unitclothoid.cpp
index 3248926b9..059b3c76d 100644
--- a/src/drivers/simplix/src/unitclothoid.cpp
+++ b/src/drivers/simplix/src/unitclothoid.cpp
@@ -9,7 +9,7 @@
//
// File : unitclothoid.cpp
// Created : 2007.11.25
-// Last changed : 2009.02.13
+// Last changed : 2009.12.03
// Copyright : © 2007-2009 Wolf-Dieter Beelitz
// eMail : wdb@wdbee.de
// Version : 2.00.000
@@ -558,6 +558,7 @@ void TClothoidLane::OptimisePath
TPathPt* L4 = &oPathPoints[0];
TPathPt* L5 = &oPathPoints[Step];
TPathPt* L6 = &oPathPoints[2 * Step];
+ TPathPt* LFly;
// Go forwards
int K = 3 * Step;
@@ -571,20 +572,25 @@ void TClothoidLane::OptimisePath
L4 = L5;
L5 = L6;
L6 = &oPathPoints[K];
+ LFly = L3;
int Index = (K + Count - 3 * Step) % Count;
+ double Factor = 1.016f;
- if (BumpMod == 2 && L3->FlyHeight > 0.1)
+ if (LFly->FlyHeight > 0.035)
+ {
+ Optimise(Factor/100, L3, L0, L1, L2, L4, L5, L6, BumpMod);
+ }
+ else if (BumpMod == 2 && L3->FlyHeight > 0.1)
{
//GfOut("OptimiseLine Index: %d\n",Index);
OptimiseLine(Index, Step, 0.1, L3, L2, L4);
}
else
{
-// Optimise(1.015, L3, L0, L1, L2, L4, L5, L6, BumpMod);
- Optimise(1.016, L3, L0, L1, L2, L4, L5, L6, BumpMod);
+ Optimise(Factor, L3, L0, L1, L2, L4, L5, L6, BumpMod);
}
-
+ //K = (K + Step) % Count;
K += Step;
if (K >= Count)
K = 0;