From 1e9850b141f0d300ed7d9bf46f62ffc9a43363b3 Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Mon, 14 Oct 2024 16:08:57 +0200 Subject: [PATCH 1/5] c_Sessions.xml als lokale Session Datei aus Repository entfernt --- .../SSG/shapes/palettes/c_Session.xml | 77 ------------------- 1 file changed, 77 deletions(-) delete mode 100644 Editor2DLibrary/SSG/shapes/palettes/c_Session.xml diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Session.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Session.xml deleted file mode 100644 index 821ff47..0000000 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Session.xml +++ /dev/null @@ -1,77 +0,0 @@ -
Strecke :1
-
Strecke :2
-
Strecke :3
-
Strecke :4
-
Strecke :1
-
Strecke :2
-
Strecke :3
-
Strecke :4
-
Strecke :1
-
Strecke :2
-
Strecke :3
-
Strecke :1
-
Strecke :1
-
Strecke :2
-
Gefaellestrecke :1
-
Gefaellestrecke :2
-
Strecke :3
-
Strecke :4
-
Strecke :5
-
Strecke :6
-
Strecke :7
-
Strecke :8
-
Strecke :9
-
Strecke :1
-
Strecke :2
-
Strecke :3
-
Strecke :4
-
Strecke :5
-
Strecke :6
-
Strecke :1
-
Strecke :2
-
Strecke :3
-
Strecke :4
-
Strecke :5
-
Strecke :6
-
Strecke :7
-
Strecke :8
-
Strecke :9
-
Strecke :1
-
Strecke :2
-
Strecke :3
-
Strecke :4
-
Strecke :5
-
Strecke :6
-
Strecke :7
-
Strecke :8
-
Strecke :9
-
Strecke :10
-
Strecke :11
-
Strecke :12
-
Strecke :13
-
Strecke :14
-
Strecke :15
-
Strecke :16
-
Strecke :17
-
Gefaellestrecke :1
-
Strecke :18
-
Strecke :19
-
Strecke :20
-
Strecke :21
-
Strecke :22
-
Strecke :23
-
Strecke :24
-
Strecke :25
-
Strecke :26
-
Strecke :27
-
Strecke :28
-
Strecke :29
-
Strecke :30
-
Strecke :31
-
Strecke :32
-
Strecke :33
-
Strecke :34
-
Strecke :35
-
Strecke :36
-
Strecke :37
-
\ No newline at end of file From 5533df10d1cb22113b168a3d4b072bf52d10155c Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 15 Oct 2024 09:57:10 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Kurve=20hat=20jetzt=20HoeheOben=20und=20Hoe?= =?UTF-8?q?heUnten=20anstatt=20von=20H0=20und=20H1,=20da=20ansonsten=20Ric?= =?UTF-8?q?htung=20und=20Rechts/links=20nicht=20korrekt=20zugeordnet=20wer?= =?UTF-8?q?den=20k=C3=B6nnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 65 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 2310af2..b4c90fc 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,10 +1,10 @@  - + - + @@ -17,7 +17,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -1008,7 +1008,6 @@ - @@ -19823,10 +19822,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -20052,10 +20051,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -20171,14 +20170,14 @@ ShapeList["id="+Param.Input[1].shapeID].name - - + + - - + + @@ -20906,7 +20905,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -20915,13 +20914,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -20929,7 +20928,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -20938,13 +20937,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -22185,10 +22184,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - 0]]> + 0]]> - 0]]> + 0]]> @@ -22664,7 +22663,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -22673,13 +22672,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -22687,7 +22686,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -22696,13 +22695,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -22812,11 +22811,11 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -29172,4 +29171,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - \ No newline at end of file + From 73a7ff7c097fa16d5745ee80377ce563952b9a21 Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 15 Oct 2024 11:03:09 +0200 Subject: [PATCH 3/5] Kurve hat jetzt ein Anfang und ein Ende, damit Rechts/links nicht verwechselt wird --- MAIN_SSG.rdx | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index b4c90fc..a51a4ef 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -12846,10 +12846,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - Shape_Prototype.KurveDefinition.HoeheOben]]> + Shape_Prototype.KurveDefinition.H_Anfang]]> - Shape_Prototype.KurveDefinition.HoeheUnten]]> + Shape_Prototype.KurveDefinition.H_Ende]]> @@ -12857,10 +12857,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + - + @@ -19822,10 +19822,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -20051,10 +20051,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -20170,14 +20170,14 @@ ShapeList["id="+Param.Input[1].shapeID].name - - + + - - + + @@ -20905,7 +20905,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -20914,13 +20914,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -20928,7 +20928,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -20937,13 +20937,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -22184,10 +22184,10 @@ ShapeList["id="+Param.Input[1].shapeID].name - 0]]> + 0]]> - 0]]> + 0]]> @@ -22663,7 +22663,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -22672,13 +22672,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -22686,7 +22686,7 @@ ShapeList["id="+Param.Input[1].shapeID].name - + @@ -22695,13 +22695,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -22811,11 +22811,11 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + From beb1a2b663e0b338ec9d857c1b1601000809768f Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 15 Oct 2024 11:53:27 +0200 Subject: [PATCH 4/5] KurveMerkmaleType ebenfalls in H_Anfang und H_Ende umbenannt --- MAIN_SSG.rdx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index a51a4ef..8782fee 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -80,13 +80,13 @@ - - + + - + @@ -125,7 +125,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -784,7 +784,7 @@ - + @@ -28068,6 +28068,8 @@ ShapeList["id="+Param.Input[1].shapeID].name + + @@ -29171,4 +29173,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - + \ No newline at end of file From 25be8cff07802c8449dc3aa969920d662b10ed4b Mon Sep 17 00:00:00 2001 From: mistangl Date: Tue, 15 Oct 2024 12:48:06 +0200 Subject: [PATCH 5/5] =?UTF-8?q?H=C3=B6henberechnung=20korrgiiert.=20in=20d?= =?UTF-8?q?er=20Oberfl=C3=A4che=20waren=20die=20Variablen=20f=C3=BCr=20die?= =?UTF-8?q?=20Kurve=20noch=20nicht=20korrigiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MAIN_SSG.rdx | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 8782fee..28d22f2 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -76,7 +76,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -784,7 +784,7 @@ - + @@ -15871,13 +15871,13 @@ me.x + - @@ -20915,13 +20915,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -20938,13 +20938,13 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + @@ -22183,11 +22183,17 @@ ShapeList["id="+Param.Input[1].shapeID].name + + ShapeList[shapeList_idx].KurveDefinition.H_Ende]]> + - 0]]> + - 0]]> + + + + @@ -27260,14 +27266,14 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + - + @@ -27315,14 +27321,14 @@ ShapeList["id="+Param.Input[1].shapeID].name - + - + - +