diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt index bdb0253..8668e3d 100644 --- a/Editor2DLibrary/SSG/shapes/categories.txt +++ b/Editor2DLibrary/SSG/shapes/categories.txt @@ -1 +1 @@ -[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true},{"id":"c_Boegen_67_5","name":"Bögen 67.5°","hasShapes":true},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":true},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":true},{"id":"c_Boegen_180","name":"Bögen 180°","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true}]}] \ No newline at end of file +[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_TEFBoegen","name":"TEF Bögen","hasShapes":true}]},{"id":"c_OmnifloParts","name":"Omniflo Parts","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":false},{"id":"c_Boegen_67_5","name":"Bögen 67.5°","hasShapes":false},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":true},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":false},{"id":"c_Boegen_180","name":"Bögen 180°","hasShapes":false}]}] \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_32px.png b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_32px.png index 4e2337f..d0e8e16 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_32px.png and b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_64px.png b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_64px.png index 58ff93d..7a1e995 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_64px.png and b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_22_5_84_821104025_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png index f9cc69e..b62b4cc 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png and b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_32px.png differ diff --git a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_64px.png b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_64px.png index 9734d1f..8459f07 100644 Binary files a/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_64px.png and b/Editor2DLibrary/SSG/shapes/img/APB_110_R550_67_5_432_821104027_64px.png differ diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Boegen.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen.xml new file mode 100644 index 0000000..07f616e --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen.xml @@ -0,0 +1,6 @@ +
APB 110 R 630/90 800/800
+
APB 110 R 550/67.5 432
+
APB 110 R 630/45 400
+
APB 110 R 550/22.5 84
+
APB 110 R 650/180 L=150
+ \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_45.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_45.xml index 0d0da5d..9d65632 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_45.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Boegen_45.xml @@ -1,3 +1,2 @@ 
APB 110 R 400/45 400
-
APB 110 R 630/45 400
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_TEFBoegen.xml b/Editor2DLibrary/SSG/shapes/palettes/c_TEFBoegen.xml new file mode 100644 index 0000000..82a55b9 --- /dev/null +++ b/Editor2DLibrary/SSG/shapes/palettes/c_TEFBoegen.xml @@ -0,0 +1,2 @@ +
APB 110 R 630/90 800/800 mit TEF Aussen
+ \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml index 685b401..1f114b5 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml @@ -1,2 +1,2 @@ -
Einfach 90° 800/800 Rechts M
+
Einfach 90° 700/700 Rechts M
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/821104025.txt b/Editor2DLibrary/SSG/shapes/props/821104025.txt index 9897a11..8559ef2 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104025.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104025.txt @@ -13,25 +13,6 @@ { "id": "cp1", "x": 0.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 248.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, "y": 0.0, "z": 0.0, "xMin": "", @@ -43,7 +24,26 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 90.0, + "direction": 270.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 1000.0, + "y": 1000.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 112.0, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/821104027.txt b/Editor2DLibrary/SSG/shapes/props/821104027.txt index 5bda1c0..77649eb 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104027.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104027.txt @@ -13,25 +13,6 @@ { "id": "cp1", "x": 0.0, - "y": 1000.0, - "z": 0.0, - "xMin": "", - "xMax": "", - "xStep": "", - "yMin": "", - "yMax": "", - "yStep": "", - "zMin": "", - "zMax": "", - "zStep": "", - "direction": 206.0, - "linkClass": "Omniflo", - "label": "", - "isDimension": true - }, - { - "id": "cp2", - "x": 1000.0, "y": 0.0, "z": 0.0, "xMin": "", @@ -43,7 +24,26 @@ "zMin": "", "zMax": "", "zStep": "", - "direction": 90.0, + "direction": 270.0, + "linkClass": "Omniflo", + "label": "", + "isDimension": true + }, + { + "id": "cp2", + "x": 1000.0, + "y": 1000.0, + "z": 0.0, + "xMin": "", + "xMax": "", + "xStep": "", + "yMin": "", + "yMax": "", + "yStep": "", + "zMin": "", + "zMax": "", + "zStep": "", + "direction": 158.0, "linkClass": "Omniflo", "label": "", "isDimension": true diff --git a/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt b/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt index cc10c46..7441e79 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104033+0_B10040.txt @@ -1,6 +1,6 @@ { "shapeMode": 0, - "name": "APB 110 R 630/90 800/800 mit TEF", + "name": "APB 110 R 630/90 800/800 mit TEF Aussen", "family": "OFBogen", "icon": "SSG/shapes/img/APB_110_R630_90_800_800_821104033_mit_TEF_R725_32px.png", "iconBig": "SSG/shapes/img/APB_110_R630_90_800_800_821104033_mit_TEF_R725_64px.png", @@ -13,7 +13,7 @@ { "id": "cp1", "x": 0.0, - "y": 130.184, + "y": 130.19, "z": 0.0, "xMin": "", "xMax": "", @@ -31,7 +31,7 @@ }, { "id": "cp2", - "x": 869.816, + "x": 869.81, "y": 1000.0, "z": 0.0, "xMin": "", @@ -50,7 +50,7 @@ }, { "id": "cp3", - "x": 21.694, + "x": 21.69, "y": 0.0, "z": 0.0, "xMin": "", @@ -70,7 +70,7 @@ { "id": "cp4", "x": 1000.0, - "y": 978.306, + "y": 978.31, "z": 0.0, "xMin": "", "xMax": "", diff --git a/Editor2DLibrary/SSG/shapes/props/821104043.txt b/Editor2DLibrary/SSG/shapes/props/821104043.txt index 0ec1eff..cb2540c 100644 --- a/Editor2DLibrary/SSG/shapes/props/821104043.txt +++ b/Editor2DLibrary/SSG/shapes/props/821104043.txt @@ -5,8 +5,8 @@ "icon": "SSG/shapes/img/APB_110_R650_180_L_150_821104043_32px.png", "iconBig": "SSG/shapes/img/APB_110_R650_180_L_150_821104043_64px.png", "srcSVG": "SSG/shapes/svg/821104043.xml", - "width": 3023.622, - "height": 4913.3858, + "width": 2456.6929, + "height": 1511.811, "depth": 415.748, "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ diff --git a/Editor2DLibrary/SSG/shapes/props/834372030.txt b/Editor2DLibrary/SSG/shapes/props/834372030.txt index b89c59b..d68a288 100644 --- a/Editor2DLibrary/SSG/shapes/props/834372030.txt +++ b/Editor2DLibrary/SSG/shapes/props/834372030.txt @@ -1,6 +1,6 @@ { "shapeMode": 0, - "name": "Einfach 90° 800/800 Rechts M", + "name": "Einfach 90° 700/700 Rechts M", "family": "OFBogen", "icon": "SSG/shapes/img/Weiche_90_700_700_L_M_834372030_32px.png", "iconBig": "SSG/shapes/img/Weiche_90_700_700_L_M_834372030_64px.png", diff --git a/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt index 9a126b0..2d419f0 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt @@ -25,6 +25,7 @@ "zMax": "", "zStep": "", "direction": 0.0, + "linkClass": "Omniflo", "label": "", "isDimension": true }, @@ -43,6 +44,7 @@ "zMax": "", "zStep": "", "direction": 180.0, + "linkClass": "Omniflo", "label": "", "isDimension": true } diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index 9458466..d5c0bbf 100644 --- a/Editor2DLibrary/SSG/shapes/settings.txt +++ b/Editor2DLibrary/SSG/shapes/settings.txt @@ -1 +1 @@ -{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":false},"c_Background":{"expanded":false},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen_90":{"expanded":true},"c_Boegen_67_5":{"expanded":true},"c_Boegen_45":{"expanded":true},"c_Boegen_22_5":{"expanded":true},"c_Boegen_180":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true}},"shapes":{}} \ No newline at end of file +{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":false},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_TEFBoegen":{"expanded":true},"c_OmnifloParts":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_Boegen_67_5":{"expanded":false},"c_Boegen_45":{"expanded":true},"c_Boegen_22_5":{"expanded":false},"c_Boegen_180":{"expanded":false}},"shapes":{}} \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104021.xml b/Editor2DLibrary/SSG/shapes/svg/821104021.xml index f1264e9..61c18e7 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104021.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104021.xml @@ -1,8 +1,8 @@  - - - + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104025.xml b/Editor2DLibrary/SSG/shapes/svg/821104025.xml index df48147..025230e 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104025.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104025.xml @@ -1,10 +1,8 @@  - - - - - + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104027.xml b/Editor2DLibrary/SSG/shapes/svg/821104027.xml index 4bbe71b..7d92463 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104027.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104027.xml @@ -1,10 +1,8 @@  - - - - - + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104031.xml b/Editor2DLibrary/SSG/shapes/svg/821104031.xml index 7dc89fc..4b10992 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104031.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104031.xml @@ -1,10 +1,8 @@  - - - - - + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml b/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml index fb9a62f..af8cf84 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104033+0_B10040.xml @@ -2,10 +2,8 @@ - - - - - + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104033.xml b/Editor2DLibrary/SSG/shapes/svg/821104033.xml index 7cf5908..a393f6c 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104033.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104033.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/821104043.xml b/Editor2DLibrary/SSG/shapes/svg/821104043.xml index dd2e002..35959c5 100644 --- a/Editor2DLibrary/SSG/shapes/svg/821104043.xml +++ b/Editor2DLibrary/SSG/shapes/svg/821104043.xml @@ -1,10 +1,8 @@  - - - - - + + + \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/svg/834372030.xml b/Editor2DLibrary/SSG/shapes/svg/834372030.xml index 195aaea..cfe08ae 100644 --- a/Editor2DLibrary/SSG/shapes/svg/834372030.xml +++ b/Editor2DLibrary/SSG/shapes/svg/834372030.xml @@ -2,9 +2,7 @@ - - - - + + \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index a5f49dc..7acf3f5 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -167,7 +167,7 @@ - + @@ -1384,7 +1384,7 @@ - + @@ -41646,4 +41646,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - + \ No newline at end of file