Skip to content

Commit e2b41fc

Browse files
committed
set height variants to deprecated and update demo airport accordingly
1 parent 9151d5d commit e2b41fc

4 files changed

Lines changed: 88 additions & 74 deletions

File tree

Binary file not shown.

openSAM-pkg/openSAM_Library/dev-tools/OSJW_openSAM_demo_airport/Earth nav data/apt.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
I
2-
1200 Generated by WorldEditor 2.6.0r2
2+
1200 Generated by WorldEditor 2.7.0-r1
33

44
1 0 0 0 OSJW openSAM demo
55
1302 gui_label 3D

openSAM-pkg/openSAM_Library/dev-tools/OSJW_openSAM_demo_airport/earth.wed.xml

Lines changed: 81 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- written by WED 2.6.0r2 -->
2+
<!-- written by WED 2.7.0-r1 -->
33
<doc>
44
<objects>
5+
<object class="WED_RampPosition" id="65" parent_id="87">
6+
<children/>
7+
<hierarchy name="A2 3 library jetways, class E" locked="0" hidden="0"/>
8+
<point latitude="47.801532248" longitude="13.011511656" heading="67.55"/>
9+
<ramp_start type="Tie-Down" traffic="14" width="E" ramp_op_type="None" airlines=""/>
10+
</object>
11+
<object class="WED_Root" id="1" parent_id="0">
12+
<children>
13+
<child id="2"/>
14+
<child id="3"/>
15+
<child id="4"/>
16+
</children>
17+
<hierarchy name="root"/>
18+
</object>
519
<object class="WED_SimpleBoundaryNode" id="73" parent_id="69">
620
<children/>
721
<hierarchy name="Node 3" locked="0" hidden="0"/>
@@ -16,35 +30,24 @@
1630
</children>
1731
<hierarchy name="Polygon 1 Outer Ring" locked="0" hidden="0"/>
1832
</object>
19-
<object class="WED_RampPosition" id="65" parent_id="87">
33+
<object class="WED_Select" id="2" parent_id="1">
2034
<children/>
21-
<hierarchy name="A2 3 library jetways, class E" locked="0" hidden="0"/>
22-
<point latitude="47.801532248" longitude="13.011511656" heading="67.55"/>
23-
<ramp_start type="Tie-Down" traffic="14" width="E" ramp_op_type="None" airlines=""/>
24-
</object>
25-
<object class="WED_Root" id="1" parent_id="0">
26-
<children>
27-
<child id="2"/>
28-
<child id="3"/>
29-
<child id="4"/>
30-
</children>
31-
<hierarchy name="root"/>
35+
<hierarchy name="selection"/>
36+
<selection>
37+
<sel id="117"/>
38+
<sel id="118"/>
39+
</selection>
3240
</object>
3341
<object class="WED_SimpleBoundaryNode" id="74" parent_id="69">
3442
<children/>
3543
<hierarchy name="Node 4" locked="0" hidden="0"/>
3644
<point latitude="47.813069996" longitude="13.009708682"/>
3745
</object>
38-
<object class="WED_Select" id="2" parent_id="1">
39-
<children/>
40-
<hierarchy name="selection"/>
41-
<selection/>
42-
</object>
4346
<object class="WED_ObjPlacement" id="75" parent_id="88">
4447
<children/>
45-
<hierarchy name="Safedock-T2_5.0m.obj" locked="0" hidden="0"/>
48+
<hierarchy name="Safedock-T2-24.obj" locked="0" hidden="0"/>
4649
<point latitude="47.801626318" longitude="13.011808964" heading="67.00"/>
47-
<obj_placement custom_msl="0" msl="0.0" resource="openSAM/dgs/Safedock-T2_5.0m.obj" show_level="1 Default"/>
50+
<obj_placement custom_msl="set_AGL" msl="5.000" resource="openSAM/dgs/Safedock-T2-24.obj" show_level="1 Default"/>
4851
</object>
4952
<object class="WED_SimpleBezierBoundaryNode" id="11" parent_id="9">
5053
<children/>
@@ -58,12 +61,6 @@
5861
<key name="airport" id="36"/>
5962
</keys>
6063
</object>
61-
<object class="WED_ObjPlacement" id="76" parent_id="88">
62-
<children/>
63-
<hierarchy name="Safedock-T2_4.0m.obj" locked="0" hidden="0"/>
64-
<point latitude="47.802134519" longitude="13.011503768" heading="67.00"/>
65-
<obj_placement custom_msl="0" msl="0.0" resource="openSAM/dgs/Safedock-T2_4.0m.obj" show_level="1 Default"/>
66-
</object>
6764
<object class="WED_SimpleBezierBoundaryNode" id="12" parent_id="9">
6865
<children/>
6966
<hierarchy name="Node 2" locked="0" hidden="0"/>
@@ -113,22 +110,16 @@
113110
<point latitude="47.795082781" longitude="13.015767364" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
114111
<facade_node wall_type="Wall 1"/>
115112
</object>
116-
<object class="WED_FacadeNode" id="19" parent_id="15">
117-
<children/>
118-
<hierarchy name="Node 3" locked="0" hidden="0"/>
119-
<point latitude="47.795771776" longitude="13.018303174" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
120-
<facade_node wall_type="Wall 1"/>
121-
</object>
122113
<object class="WED_ObjPlacement" id="83" parent_id="86">
123114
<children/>
124115
<hierarchy name="parking_stripe.obj" locked="0" hidden="0"/>
125116
<point latitude="47.802086924" longitude="13.011257312" heading="247.00"/>
126117
<obj_placement custom_msl="0" msl="0.0" resource="lib/airport/markings/parking_stripe.obj" show_level="1 Default"/>
127118
</object>
128-
<object class="WED_FacadeNode" id="20" parent_id="15">
119+
<object class="WED_FacadeNode" id="19" parent_id="15">
129120
<children/>
130-
<hierarchy name="Node 4" locked="0" hidden="0"/>
131-
<point latitude="47.803686381" longitude="13.013537323" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
121+
<hierarchy name="Node 3" locked="0" hidden="0"/>
122+
<point latitude="47.795771776" longitude="13.018303174" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
132123
<facade_node wall_type="Wall 1"/>
133124
</object>
134125
<object class="WED_ObjPlacement" id="84" parent_id="86">
@@ -137,14 +128,11 @@
137128
<point latitude="47.801532248" longitude="13.011511656" heading="247.00"/>
138129
<obj_placement custom_msl="0" msl="0.0" resource="lib/airport/markings/parking_stripe.obj" show_level="1 Default"/>
139130
</object>
140-
<object class="WED_FacadeRing" id="21" parent_id="22">
141-
<children>
142-
<child id="23"/>
143-
<child id="24"/>
144-
<child id="25"/>
145-
<child id="26"/>
146-
</children>
147-
<hierarchy name="Facade 3 outer ring" locked="0" hidden="0"/>
131+
<object class="WED_FacadeNode" id="20" parent_id="15">
132+
<children/>
133+
<hierarchy name="Node 4" locked="0" hidden="0"/>
134+
<point latitude="47.803686381" longitude="13.013537323" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
135+
<facade_node wall_type="Wall 1"/>
148136
</object>
149137
<object class="WED_Group" id="85" parent_id="36">
150138
<children>
@@ -163,12 +151,14 @@
163151
</children>
164152
<hierarchy name="openSAM library Jetways" locked="0" hidden="0"/>
165153
</object>
166-
<object class="WED_FacadePlacement" id="22" parent_id="86">
154+
<object class="WED_FacadeRing" id="21" parent_id="22">
167155
<children>
168-
<child id="21"/>
156+
<child id="23"/>
157+
<child id="24"/>
158+
<child id="25"/>
159+
<child id="26"/>
169160
</children>
170-
<hierarchy name="term_building_Levels_01.fac" locked="0" hidden="0"/>
171-
<facade_placement height="10" resource="lib/airport/Modern_Airports/Terminal_kit/term_building_Levels_01.fac" pick_walls="1" show_level="1 Default"/>
161+
<hierarchy name="Facade 3 outer ring" locked="0" hidden="0"/>
172162
</object>
173163
<object class="WED_Group" id="86" parent_id="36">
174164
<children>
@@ -183,11 +173,12 @@
183173
</children>
184174
<hierarchy name="Buildings + Ground" locked="0" hidden="0"/>
185175
</object>
186-
<object class="WED_FacadeNode" id="23" parent_id="21">
187-
<children/>
188-
<hierarchy name="Node 1" locked="0" hidden="0"/>
189-
<point latitude="47.803086593" longitude="13.010935411" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
190-
<facade_node wall_type="Wall 3"/>
176+
<object class="WED_FacadePlacement" id="22" parent_id="86">
177+
<children>
178+
<child id="21"/>
179+
</children>
180+
<hierarchy name="term_building_Levels_01.fac" locked="0" hidden="0"/>
181+
<facade_placement height="10" resource="lib/airport/Modern_Airports/Terminal_kit/term_building_Levels_01.fac" pick_walls="1" show_level="1 Default"/>
191182
</object>
192183
<object class="WED_Group" id="87" parent_id="36">
193184
<children>
@@ -197,23 +188,24 @@
197188
</children>
198189
<hierarchy name="Stands" locked="0" hidden="0"/>
199190
</object>
200-
<object class="WED_FacadeNode" id="24" parent_id="21">
191+
<object class="WED_FacadeNode" id="23" parent_id="21">
201192
<children/>
202-
<hierarchy name="Node 2" locked="0" hidden="0"/>
203-
<point latitude="47.795021505" longitude="13.015778585" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
204-
<facade_node wall_type="Wall 1"/>
193+
<hierarchy name="Node 1" locked="0" hidden="0"/>
194+
<point latitude="47.803086593" longitude="13.010935411" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
195+
<facade_node wall_type="Wall 3"/>
205196
</object>
206197
<object class="WED_Group" id="88" parent_id="36">
207198
<children>
208199
<child id="75"/>
209-
<child id="76"/>
200+
<child id="118"/>
201+
<child id="117"/>
210202
</children>
211203
<hierarchy name="VDGS" locked="0" hidden="0"/>
212204
</object>
213-
<object class="WED_FacadeNode" id="25" parent_id="21">
205+
<object class="WED_FacadeNode" id="24" parent_id="21">
214206
<children/>
215-
<hierarchy name="Node 3" locked="0" hidden="0"/>
216-
<point latitude="47.795753964" longitude="13.018448396" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
207+
<hierarchy name="Node 2" locked="0" hidden="0"/>
208+
<point latitude="47.795021505" longitude="13.015778585" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
217209
<facade_node wall_type="Wall 1"/>
218210
</object>
219211
<object class="WED_Taxiway" id="89" parent_id="86">
@@ -223,10 +215,10 @@
223215
<hierarchy name="plain.pol" locked="1" hidden="0"/>
224216
<taxiway surface="Asphalt Plain" roughness="0.25" heading="0.0"/>
225217
</object>
226-
<object class="WED_FacadeNode" id="26" parent_id="21">
218+
<object class="WED_FacadeNode" id="25" parent_id="21">
227219
<children/>
228-
<hierarchy name="Node 4" locked="0" hidden="0"/>
229-
<point latitude="47.803785978" longitude="13.013621997" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
220+
<hierarchy name="Node 3" locked="0" hidden="0"/>
221+
<point latitude="47.795753964" longitude="13.018448396" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
230222
<facade_node wall_type="Wall 1"/>
231223
</object>
232224
<object class="WED_AirportChain" id="90" parent_id="89">
@@ -239,6 +231,12 @@
239231
<hierarchy name="unnamed entity" locked="0" hidden="0"/>
240232
<airport_chain closed="1"/>
241233
</object>
234+
<object class="WED_FacadeNode" id="26" parent_id="21">
235+
<children/>
236+
<hierarchy name="Node 4" locked="0" hidden="0"/>
237+
<point latitude="47.803785978" longitude="13.013621997" split="0" ctrl_latitude_lo="0.0" ctrl_longitude_lo="0.0" ctrl_latitude_hi="0.0" ctrl_longitude_hi="0.0"/>
238+
<facade_node wall_type="Wall 1"/>
239+
</object>
242240
<object class="WED_Airport" id="36" parent_id="4">
243241
<children>
244242
<child id="86"/>
@@ -547,6 +545,18 @@
547545
<point latitude="47.801845514" longitude="13.011385253" heading="-168.81"/>
548546
<obj_placement custom_msl="0" msl="0.0" resource="openSAM/MisterX/libjw/Jetway_Steel_Modern_7m.obj" show_level="1 Default"/>
549547
</object>
548+
<object class="WED_ObjPlacement" id="117" parent_id="88">
549+
<children/>
550+
<hierarchy name="Safedock-T2-24.obj" locked="0" hidden="0"/>
551+
<point latitude="47.802142199" longitude="13.011500733" heading="68.00"/>
552+
<obj_placement custom_msl="set_AGL" msl="4.000" resource="openSAM/dgs/Safedock-T2-24.obj" show_level="1 Default"/>
553+
</object>
554+
<object class="WED_ObjPlacement" id="118" parent_id="88">
555+
<children/>
556+
<hierarchy name="marshaller_high.agp" locked="0" hidden="0"/>
557+
<point latitude="47.800908269" longitude="13.012217150" heading="68.00"/>
558+
<obj_placement custom_msl="0" msl="0.0" resource="openSAM/dgs/marshaller_high.agp" show_level="1 Default"/>
559+
</object>
550560
</objects>
551561
<prefs>
552562
<pref name="PropertyPane0/Closed">
@@ -558,17 +568,17 @@
558568
<pref name="doc/export_target" value="7"/>
559569
<pref name="doc/xml_compatibility" value="205"/>
560570
<pref name="export/last" value="+40+010/+47+013.dsf"/>
561-
<pref name="map/east" value="13.012223"/>
571+
<pref name="map/east" value="13.014847"/>
562572
<pref name="map/navaid_map_vis" value="0"/>
563-
<pref name="map/north" value="47.802177"/>
573+
<pref name="map/north" value="47.802147"/>
564574
<pref name="map/obj_density" value="6"/>
565575
<pref name="map/pavement_alpha" value="2"/>
566576
<pref name="map/preview_vis" value="1"/>
567577
<pref name="map/real_lines_vis" value="1"/>
568578
<pref name="map/slippy_vis" value="2"/>
569-
<pref name="map/south" value="47.801189"/>
579+
<pref name="map/south" value="47.799690"/>
570580
<pref name="map/vertices_vis" value="1"/>
571-
<pref name="map/west" value="13.010345"/>
581+
<pref name="map/west" value="13.010174"/>
572582
<pref name="map/world_map_vis" value="1"/>
573583
<pref name="map_Airport Beacon_Kind" value="133"/>
574584
<pref name="map_Autogen_Autogen Height" value="10.000000"/>
@@ -594,7 +604,7 @@
594604
<pref name="map_Light Fixture_Approach Angle" value="3.000000"/>
595605
<pref name="map_Light Fixture_Fixture Type" value="63"/>
596606
<pref name="map_Lines_Resource" value="lib/airport/markings/roads/zebra_3m.lin"/>
597-
<pref name="map_Objects_Object" value="openSAM/MisterX/libjw/Jetway_Steel_Modern_7m.obj"/>
607+
<pref name="map_Objects_Object" value="openSAM/dgs/marshaller_high.agp"/>
598608
<pref name="map_Objects_Show with" value="810"/>
599609
<pref name="map_Objects_max Heading" value="0.000000"/>
600610
<pref name="map_Objects_min Heading" value="0.000000"/>
@@ -650,6 +660,7 @@
650660
<pref name="map_Truck Destination_Truck Types" value=""/>
651661
<pref name="map_Truck Parking_." value="3"/>
652662
<pref name="map_Truck Parking_Truck Type" value="216"/>
663+
<pref name="map_Vertex_Show Node Numbers" value="0"/>
653664
<pref name="map_Vertex_Snap To Vertices" value="1"/>
654665
<pref name="map_Windsock_Lit" value="0"/>
655666
<pref name="map_preview_window/camera_agl" value="330.299922"/>
@@ -665,8 +676,8 @@
665676
<pref name="window/height" value="1193"/>
666677
<pref name="window/main_split" value="402"/>
667678
<pref name="window/main_split2" value="1960"/>
668-
<pref name="window/prev_split" value="516"/>
669-
<pref name="window/prop_split" value="803"/>
679+
<pref name="window/prev_split" value="526"/>
680+
<pref name="window/prop_split" value="813"/>
670681
<pref name="window/width" value="2369"/>
671682
<pref name="window/x_loc" value="133"/>
672683
<pref name="window/y_loc" value="26"/>

openSAM-pkg/openSAM_Library/library.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ REGION default
2222
# openSAM native
2323
EXPORT openSAM/dgs/marshaller.agp dgs/marshaller.agp
2424
EXPORT openSAM/dgs/marshaller_high.agp dgs/marshaller_high.agp
25+
EXPORT openSAM/dgs/Safedock-T2-24.obj dgs/Safedock-T2-24_0.0m.obj
26+
EXPORT openSAM/dgs/Safedock-T2-24_pole.obj dgs/Safedock-T2-24_0.0m_pole.obj
27+
28+
# stuff below should not show up in WED
29+
DEPRECATED
30+
2531
EXPORT openSAM/dgs/Safedock-T2_2.5m.obj dgs/Safedock-T2-24_2.5m.obj
2632
EXPORT openSAM/dgs/Safedock-T2_3.0m.obj dgs/Safedock-T2-24_3.0m.obj
2733
EXPORT openSAM/dgs/Safedock-T2_3.5m.obj dgs/Safedock-T2-24_3.5m.obj
@@ -52,9 +58,6 @@ EXPORT openSAM/MisterX/libjw/Tunnel_Steel_Modern_7m.fac MisterX/libjw/Tunnel_Ste
5258
EXPORT openSAM/MisterX/libjw/Tunnel_Steel_Old_4m.fac MisterX/libjw/Tunnel_Steel_Old_4m.fac
5359
EXPORT openSAM/MisterX/libjw/Tunnel_Steel_Old_5m.fac MisterX/libjw/Tunnel_Steel_Old_5m.fac
5460

55-
# stuff below should not show up in WED
56-
DEPRECATED
57-
5861
# SAM3
5962

6063
# DOCKINGS

0 commit comments

Comments
 (0)