diff --git a/CAD/stl/Omniflo/821106001_AP110.stl b/CAD/stl/Omniflo/821106001_AP110.stl index 5781662..af3199a 100644 Binary files a/CAD/stl/Omniflo/821106001_AP110.stl and b/CAD/stl/Omniflo/821106001_AP110.stl differ diff --git a/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt index 778bf35..46c6edf 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt @@ -5,26 +5,11 @@ "icon": "SSG/shapes/img/AP_32px.png", "iconBig": "SSG/shapes/img/AP_64px.png", "srcSVG": "SSG/shapes/svg/s_Gerade_AP110.xml", + "src3D": "SSG/shapes/obj/s_Gerade_AP110.stl", "width": 158.7402, "height": 3779.5276, "depth": 415.748, - "behaviour": "(NOHHSTRETCH)(NODSTRETCH)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", - "group3d": [ - { - "source": "AP 110", - "id": "s70", - "width": 158.7402, - "height": 3779.5276, - "depth": 415.748, - "x": 0.0, - "y": 0.0, - "z": 207.874, - "rotation": "0", - "data": "", - "color": "#FFFF00", - "colorOpacity": 0.5 - } - ], + "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)", "connectionPoints": [ { "id": "cp1", diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt index 9876843..c8742e5 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":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":true},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_TEFBoegen":{"expanded":true},"c_Weichen_45":{"expanded":false},"c_Weichenkoerper":{"expanded":false},"c_Weichenkombinationen":{"expanded":false},"c_OmnifloParts":{"expanded":true},"c_Boegen_90":{"expanded":true},"c_Boegen_67_5":{"expanded":false},"c_Boegen_45":{"expanded":false},"c_Boegen_22_5":{"expanded":false},"c_Boegen_180":{"expanded":false},"c25":{"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":true},"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_Weichen_45":{"expanded":false},"c_Weichenkoerper":{"expanded":false},"c_Weichenkombinationen":{"expanded":false},"c_OmnifloParts":{"expanded":true},"c_Boegen_90":{"expanded":true},"c_Boegen_67_5":{"expanded":false},"c_Boegen_45":{"expanded":false},"c_Boegen_22_5":{"expanded":false},"c_Boegen_180":{"expanded":false},"c25":{"expanded":true}},"shapes":{}} \ No newline at end of file diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 4bebd88..24c68a9 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -3597,7 +3597,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -4045,7 +4045,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -4086,8 +4086,8 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - - + + @@ -4171,15 +4171,15 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + - + - + @@ -4216,7 +4216,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) - + @@ -5290,6 +5290,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -5371,6 +5372,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -6606,6 +6608,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -20253,6 +20256,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + @@ -46232,4 +46238,4 @@ ShapeList["id="+Param.Input[1].shapeID].name - \ No newline at end of file +