OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
Fork

G42-200: Commit


Commit MetaInfo

Revisione14ce615204fae726f3771f784b12dfd0a61e9b3 (tree)
Time2017-06-13 00:00:51
Authorat0fk <kastner-masilko@at.f...>
Commiterat0fk

Log Message

Backported to old meshes

Change Summary

Incremental Difference

diff -r abeadacf3a8c -r e14ce615204f G422_ANIMATIONS.cpp
--- a/G422_ANIMATIONS.cpp Sun Jun 11 15:25:07 2017 +0200
+++ b/G422_ANIMATIONS.cpp Mon Jun 12 17:00:51 2017 +0200
@@ -317,16 +317,14 @@
317317 // cargo bay doors
318318 //
319319 UINT an_cgoBay = CreateAnimation(0.0);
320- static UINT cgoBay[5] = {MGID_BAY_DOOR_L, MGID_BAY_DOOR_INT_L, MGID_BAY_DOOR_R, MGID_BAY_DOOR_INT_R, MGID_ANT_DISH};
320+ static UINT cgoBay[4] = {MGID_BAY_DOOR_L, MGID_RADIATOR_L, MGID_BAY_DOOR_R, MGID_RADIATOR_R};
321321
322322 static MGROUP_ROTATE mgRot_bayDoor_L(mdlID_ext, cgoBay, 2, V3_BAY_DOOR_L, _Z, (float)( 180.0*RAD));
323323 static MGROUP_ROTATE mgRot_bayDoor_R(mdlID_ext, cgoBay+2, 2, V3_BAY_DOOR_R, _Z, (float)(-180.0*RAD));
324- static MGROUP_ROTATE mgRot_antenna (mdlID_ext, cgoBay+4, 1, V3_ANT_DISH, _Y, (float)( 130.0*RAD));
325-
324+
326325 AddAnimationComponent(an_cgoBay, 0.01, 0.47, &mgRot_bayDoor_L);
327326 AddAnimationComponent(an_cgoBay, 0.49, 0.95, &mgRot_bayDoor_R);
328- AddAnimationComponent(an_cgoBay, 0.96, 1.00, &mgRot_antenna);
329-
327+
330328 bayDoors = new MovingPart(an_cgoBay, 0.01, MP_LOW_DETENT, 0.0, this);
331329
332330
diff -r abeadacf3a8c -r e14ce615204f G422_DVC_DISPLAYS.cpp
--- a/G422_DVC_DISPLAYS.cpp Sun Jun 11 15:25:07 2017 +0200
+++ b/G422_DVC_DISPLAYS.cpp Mon Jun 12 17:00:51 2017 +0200
@@ -23,8 +23,6 @@
2323
2424
2525
26-const UINT pnl_mgids[6] = {MGID_EICAS_C1, MGID_EICAS_C2, MGID_EICAS_P1, MGID_EICAS_P2, MGID_EICAS_E1, MGID_EICAS_E2};
27-
2826 void G422::selEicasMode(int eicasIdx, int mode)
2927 {
3028
@@ -65,8 +63,6 @@
6563 spc.vIdx = vIdx;
6664 spc.nVtx = 4;
6765
68- oapiEditMeshGroup(GetDevMesh(visual, mdlID_dvc), pnl_mgids[eicasIdx], &spc);
69-
7066 int lMode = VC_eicas_screens[eicasIdx];
7167 VC_eicas_screens[eicasIdx] = mode;
7268
diff -r abeadacf3a8c -r e14ce615204f G422_DVC_SETUP.cpp
--- a/G422_DVC_SETUP.cpp Sun Jun 11 15:25:07 2017 +0200
+++ b/G422_DVC_SETUP.cpp Mon Jun 12 17:00:51 2017 +0200
@@ -65,9 +65,9 @@
6565 { MGID_SW3_APU_CYCLE, SW3_MID, _V(-0.0427577, 2.18791, 38.6481), _V(-0.0488396, 2.17608, 38.6452), _X },
6666 { MGID_SW3_APU_COOL, SW3_MID, _V(-0.0230871, 2.18791, 38.6481), _V(-0.0288296, 2.17608, 38.6452), _X },
6767 { MGID_SW3_APU_EXHT, SW3_MID, _V(-0.00341636, 2.18791, 38.6481), _V(-0.00912479, 2.17608, 38.6452), _X },
68- { MGID_SW2_APU_RAMX, SW2_DOWN, _V(0.0377143, 2.18791, 38.6481), _V(0.0312816, 2.17565, 38.6468), _X },
69- { MGID_SW3_APU_PACK_A, SW3_MID, _V(-0.0440604, 2.18185, 38.6091), _V(-0.0488121, 2.17154, 38.608), _X },
70- { MGID_SW3_APU_PACK_B, SW3_MID, _V(-0.0243897, 2.18185, 38.6091), _V(-0.0290738, 2.17154, 38.608), _X },
68+ { MGID_SW3_APU_START, SW2_DOWN, _V(0.0377143, 2.18791, 38.6481), _V(0.0312816, 2.17565, 38.6468), _X },
69+ { MGID_SW3_APU_CYCLE, SW3_MID, _V(-0.0440604, 2.18185, 38.6091), _V(-0.0488121, 2.17154, 38.608), _X },
70+ { MGID_SW3_APU_BOOST, SW3_MID, _V(-0.0243897, 2.18185, 38.6091), _V(-0.0290738, 2.17154, 38.608), _X },
7171 { MGID_SW3_APU_AC, SW3_MID, _V(-0.0235473, 2.18092, 38.5786), _V(-0.031135, 2.16485, 38.576), _X },
7272 { MGID_SW3_APU_BLEED, SW3_MID, _V(-0.00399457, 2.18092, 38.5786), _V(-0.011125, 2.16485, 38.576), _X },
7373 { MGID_SW3_APU_HYD, SW3_MID, _V(0.0145013, 2.18092, 38.5786), _V(0.00857984, 2.16485, 38.576), _X },
diff -r abeadacf3a8c -r e14ce615204f G422_MDL_DVC.h
--- a/G422_MDL_DVC.h Sun Jun 11 15:25:07 2017 +0200
+++ b/G422_MDL_DVC.h Mon Jun 12 17:00:51 2017 +0200
@@ -25,312 +25,302 @@
2525 #define MGID_Plane001 6
2626 #define MGID_Box007 7
2727 #define MGID_Object023 8
28-#define MGID_Object025 9
29-#define MGID_Object026 10
30-#define MGID_Object027 11
31-#define MGID_Object028 12
32-#define MGID_Object029 13
33-#define MGID_Plane002 14
34-#define MGID_Box008 15
35-#define MGID_Object048 16
36-#define MGID_MFD_6 17
37-#define MGID_MFD_4 18
38-#define MGID_MFD_KEYS 19
39-#define MGID_Object057 20
40-#define MGID_Object058 21
41-#define MGID_Object059 22
42-#define MGID_Box031 23
43-#define MGID_Object065 24
44-#define MGID_Object148 25
45-#define MGID_Object149 26
46-#define MGID_Object150 27
47-#define MGID_Box032 28
48-#define MGID_Object326 29
49-#define MGID_Cylinder004 30
50-#define MGID_Object328 31
51-#define MGID_Object329 32
52-#define MGID_Object330 33
53-#define MGID_RAMX_THR_GRIP 34
54-#define MGID_RAMX_THR_STICK 35
55-#define MGID_THR_RAMX_DETENT 36
56-#define MGID_RAMX_THR_FLAP 37
57-#define MGID_EMC_TRIGGER_COVER 38
58-#define MGID_WING_POS_LEVER 39
59-#define MGID_Cylinder006 40
60-#define MGID_THROTTLE_UNIT 41
61-#define MGID_Object336 42
62-#define MGID_Object337 43
63-#define MGID_Object338 44
64-#define MGID_Object339 45
65-#define MGID_PRK_BRK_HNDL 46
66-#define MGID_COORD_REF_KNOB 47
67-#define MGID_Object342 48
68-#define MGID_ACS_KNOB 49
69-#define MGID_RCS_KNOB 50
70-#define MGID_Object345 51
71-#define MGID_STICK_BASE 52
72-#define MGID_CTRL_STICK 53
73-#define MGID_Object350 54
74-#define MGID_Object351 55
75-#define MGID_Object352 56
76-#define MGID_MFD_1 57
77-#define MGID_MFD_2 58
78-#define MGID_MFD_3 59
79-#define MGID_Object355 60
80-#define MGID_Object357 61
81-#define MGID_VISOR_FRONT_OUT 62
82-#define MGID_VISOR_FRONT_IN 63
83-#define MGID_Object361 64
84-#define MGID_SW3_GEAR 65
85-#define MGID_SW3_CANARD 66
86-#define MGID_SW3_VISOR 67
87-#define MGID_SW3_RCS 68
88-#define MGID_Object363 69
89-#define MGID_Object364 70
90-#define MGID_Object365 71
91-#define MGID_Object1226 72
92-#define MGID_Object1228 73
93-#define MGID_Object1229 74
94-#define MGID_Object1230 75
95-#define MGID_Object1231 76
96-#define MGID_Object1232 77
97-#define MGID_Object1233 78
98-#define MGID_SW3_EMAIN_MODE 79
99-#define MGID_SW3_EMAIN_REHEAT 80
100-#define MGID_SW2_LGT_NAV 81
101-#define MGID_SW2_LGT_STB 82
102-#define MGID_SW2_LGT_BCN 83
103-#define MGID_SW2_LGT_LGR 84
104-#define MGID_SW2_LGT_LND 85
105-#define MGID_SW2_LGT_TAX 86
106-#define MGID_SW2_LGT_DCK 87
107-#define MGID_SW2_LGT_BAY 88
108-#define MGID_SW2_LGT_PNL 89
109-#define MGID_SW2_LGT_FLD 90
110-#define MGID_SW2_LGT_CSL 91
111-#define MGID_SW2_LGT_DOM 92
112-#define MGID_SW2_LGT_AMB 93
113-#define MGID_SW2_LGT_BRT 94
114-#define MGID_SW3_RAMX_DOOR 95
115-#define MGID_SW3_RAMX_IGN 96
116-#define MGID_SW3_RAMX_COOL 97
117-#define MGID_SW3_RAMX_MODE 98
118-#define MGID_SW3_EMAIN_IGN 99
119-#define MGID_SW3_EMAIN_BRNRIGN 100
120-#define MGID_SW3_STBYIGN_RCS 101
121-#define MGID_SW3_STBYIGN_OMS 102
122-#define MGID_SW2_MSFEED_C 103
123-#define MGID_SW2_MSFEED_L 104
124-#define MGID_SW2_MSFEED_R 105
125-#define MGID_SW2_SYSFEED_APU 106
126-#define MGID_SW2_SYSFEED_OMS 107
127-#define MGID_SW2_SYSFEED_RCS 108
128-#define MGID_SW3_OXYFEED_L 109
129-#define MGID_SW3_OXYFEED_R 110
130-#define MGID_SW2_THR_AUTH 111
131-#define MGID_SW2_BRKCOOL 112
132-#define MGID_SW3_APU_CYCLE 113
133-#define MGID_SW3_APU_COOL 114
134-#define MGID_SW3_APU_EXHT 115
135-#define MGID_SW2_APU_RAMX 116
136-#define MGID_SW3_APU_PACK_A 117
137-#define MGID_SW3_APU_PACK_B 118
138-#define MGID_SW3_APU_AC 119
139-#define MGID_SW3_APU_BLEED 120
140-#define MGID_SW3_APU_HYD 121
141-#define MGID_EICAS_C2 122
142-#define MGID_FLRES_DSP 123
143-#define MGID_MFD_5 124
144-#define MGID_Object1237 125
145-#define MGID_STICK_BOOT_1 126
146-#define MGID_STICK_BOOT_2 127
147-#define MGID_Object1344 128
148-#define MGID_SW2_EXTANK_L 129
149-#define MGID_SW2_EXTANK_B 130
150-#define MGID_SW2_EXTANK_R 131
151-#define MGID_Object1345 132
152-#define MGID_Object1347 133
153-#define MGID_Object1348 134
154-#define MGID_Object1349 135
155-#define MGID_Object1350 136
156-#define MGID_Object1351 137
157-#define MGID_Object1352 138
158-#define MGID_Object1353 139
159-#define MGID_Object1354 140
160-#define MGID_Object1355 141
161-#define MGID_Object1356 142
162-#define MGID_Object1357 143
163-#define MGID_Object1358 144
164-#define MGID_Object1360 145
165-#define MGID_Object1361 146
166-#define MGID_Object1362 147
167-#define MGID_Object1364 148
168-#define MGID_Object1365 149
169-#define MGID_Object1366 150
170-#define MGID_Object1367 151
171-#define MGID_Object1368 152
172-#define MGID_Object1370 153
173-#define MGID_Object1371 154
174-#define MGID_Object1372 155
175-#define MGID_Object1375 156
176-#define MGID_Object1376 157
177-#define MGID_Object1377 158
178-#define MGID_Object1378 159
179-#define MGID_ADI_RING 160
180-#define MGID_ADI_BALL 161
181-#define MGID_Object1379 162
182-#define MGID_Object1380 163
183-#define MGID_Cylinder008 164
184-#define MGID_SW3_BAY_OPENCLSE 165
185-#define MGID_SW3_BAY_LATCH 166
186-#define MGID_SW3_RADIATOR 167
187-#define MGID_Object1381 168
188-#define MGID_Object1382 169
189-#define MGID_VC_SWITCHES_OVHD_DULL001 170
190-#define MGID_VC_SWITCHES_OVHD_DULL002 171
191-#define MGID_VC_SWITCHES_OVHD_DULL003 172
192-#define MGID_VC_SWITCHES_OVHD_DULL004 173
193-#define MGID_VC_SWITCHES_OVHD_DULL005 174
194-#define MGID_VC_SWITCHES_OVHD_DULL006 175
195-#define MGID_VC_SWITCHES_OVHD_DULL007 176
196-#define MGID_VC_SWITCHES_OVHD_DULL008 177
197-#define MGID_VC_SWITCHES_OVHD_DULL009 178
198-#define MGID_VC_SWITCHES_OVHD_DULL010 179
199-#define MGID_VC_SWITCHES_OVHD_DULL011 180
200-#define MGID_VC_SWITCHES_OVHD_DULL012 181
201-#define MGID_VC_SWITCHES_OVHD_DULL013 182
202-#define MGID_VC_SWITCHES_OVHD_DULL014 183
203-#define MGID_VC_SWITCHES_OVHD_DULL015 184
204-#define MGID_VC_SWITCHES_OVHD_DULL016 185
205-#define MGID_VC_SWITCHES_OVHD_DULL017 186
206-#define MGID_VC_SWITCHES_OVHD_DULL018 187
207-#define MGID_VC_SWITCHES_OVHD_DULL019 188
208-#define MGID_VC_SWITCHES_OVHD_DULL020 189
209-#define MGID_VC_SWITCHES_OVHD_DULL021 190
210-#define MGID_VC_SWITCHES_OVHD_DULL022 191
211-#define MGID_VC_SWITCHES_OVHD_DULL023 192
212-#define MGID_VC_SWITCHES_OVHD_DULL024 193
213-#define MGID_VC_SWITCHES_OVHD_DULL025 194
214-#define MGID_VC_SWITCHES_OVHD_DULL026 195
215-#define MGID_VC_SWITCHES_OVHD_DULL027 196
216-#define MGID_VC_SWITCHES_OVHD_DULL028 197
217-#define MGID_VC_SWITCHES_OVHD_DULL029 198
218-#define MGID_VC_SWITCHES_OVHD_DULL030 199
219-#define MGID_VC_SWITCHES_OVHD_DULL031 200
220-#define MGID_VC_SWITCHES_OVHD_DULL032 201
221-#define MGID_VC_SWITCHES_OVHD_DULL033 202
222-#define MGID_VC_SWITCHES_OVHD_DULL034 203
223-#define MGID_VC_SWITCHES_OVHD_DULL035 204
224-#define MGID_VC_SWITCHES_OVHD_DULL036 205
225-#define MGID_VC_SWITCHES_OVHD_DULL037 206
226-#define MGID_VC_SWITCHES_OVHD_DULL038 207
227-#define MGID_VC_SWITCHES_OVHD_DULL039 208
228-#define MGID_VC_SWITCHES_OVHD_DULL040 209
229-#define MGID_VC_SWITCHES_OVHD_DULL041 210
230-#define MGID_VC_SWITCHES_OVHD_DULL042 211
231-#define MGID_VC_SWITCHES_OVHD_DULL043 212
232-#define MGID_VC_SWITCHES_OVHD_DULL044 213
233-#define MGID_VC_SWITCHES_OVHD_DULL045 214
234-#define MGID_VC_SWITCHES_OVHD_DULL046 215
235-#define MGID_VC_SWITCHES_OVHD_DULL047 216
236-#define MGID_VC_SWITCHES_OVHD_DULL048 217
237-#define MGID_VC_SWITCHES_OVHD_DULL049 218
238-#define MGID_VC_SWITCHES_OVHD_DULL050 219
239-#define MGID_VC_SWITCHES_OVHD_DULL051 220
240-#define MGID_VC_SWITCHES_OVHD_DULL052 221
241-#define MGID_VC_SWITCHES_OVHD_DULL053 222
242-#define MGID_VC_SWITCHES_OVHD_DULL054 223
243-#define MGID_VC_SWITCHES_OVHD_DULL055 224
244-#define MGID_VC_SWITCHES_OVHD_DULL056 225
245-#define MGID_VC_SWITCHES_OVHD_DULL057 226
246-#define MGID_VC_SWITCHES_OVHD_DULL058 227
247-#define MGID_VC_SWITCHES_OVHD_DULL059 228
248-#define MGID_VC_SWITCHES_OVHD_DULL060 229
249-#define MGID_VC_SWITCHES_OVHD_DULL061 230
250-#define MGID_VC_SWITCHES_OVHD_DULL062 231
251-#define MGID_VC_SWITCHES_OVHD_DULL063 232
252-#define MGID_VC_SWITCHES_OVHD_DULL064 233
253-#define MGID_VC_SWITCHES_OVHD_DULL065 234
254-#define MGID_VC_SWITCHES_OVHD_DULL066 235
255-#define MGID_VC_SWITCHES_OVHD_DULL067 236
256-#define MGID_VC_SWITCHES_OVHD_DULL068 237
257-#define MGID_VC_SWITCHES_OVHD_DULL069 238
258-#define MGID_VC_SWITCHES_OVHD_DULL070 239
259-#define MGID_VC_SWITCHES_OVHD_DULL071 240
260-#define MGID_VC_SWITCHES_OVHD_DULL075 241
261-#define MGID_OVHD_FIRE_SWITCHES001 242
262-#define MGID_OVHD_FIRE_SWITCHES002 243
263-#define MGID_OVHD_FIRE_SWITCHES003 244
264-#define MGID_OVHD_FIRE_SWITCHES004 245
265-#define MGID_OVHD_FIRE_SWITCHES005 246
266-#define MGID_OVHD_FIRE_SWITCHES006 247
267-#define MGID_OVHD_FIRE_SWITCHES007 248
268-#define MGID_OVHD_FIRE_SWITCHES008 249
269-#define MGID_OVHD_FIRE_SWITCHES009 250
270-#define MGID_OVHD_FIRE_SWITCHES010 251
271-#define MGID_OVHD_FIRE_SWITCHES011 252
272-#define MGID_SWITCHES_DULL001 253
273-#define MGID_SWITCHES_DULL002 254
274-#define MGID_SWITCHES_DULL003 255
275-#define MGID_SWITCHES_DULL004 256
276-#define MGID_SWITCHES_DULL005 257
277-#define MGID_SWITCHES_DULL006 258
278-#define MGID_Object1388 259
279-#define MGID_VC_SWITCHES_OVHD_DULL076 260
280-#define MGID_VC_SWITCHES_OVHD_DULL077 261
281-#define MGID_VC_SWITCHES_OVHD_DULL078 262
282-#define MGID_VC_SWITCHES_OVHD_DULL079 263
283-#define MGID_VC_SWITCHES_OVHD_DULL080 264
284-#define MGID_VC_SWITCHES_OVHD_DULL081 265
285-#define MGID_VC_SWITCHES_OVHD_DULL082 266
286-#define MGID_VC_SWITCHES_OVHD_DULL083 267
287-#define MGID_Object1389 268
288-#define MGID_SW3_DARTS 269
289-#define MGID_Object1391 270
290-#define MGID_Object1392 271
291-#define MGID_Object1393 272
292-#define MGID_GND_STEER_TILLER 273
293-#define MGID_VC_SWITCHES_OVHD_DULL084 274
294-#define MGID_VC_SWITCHES_OVHD_DULL085 275
295-#define MGID_VC_SWITCHES_OVHD_DULL086 276
296-#define MGID_VC_SWITCHES_OVHD_DULL087 277
297-#define MGID_Object1394 278
298-#define MGID_VC_SWITCHES_OVHD_DULL088 279
299-#define MGID_VC_SWITCHES_OVHD_DULL089 280
300-#define MGID_VC_SWITCHES_OVHD_DULL090 281
301-#define MGID_VC_SWITCHES_OVHD_DULL091 282
302-#define MGID_VC_SWITCHES_OVHD_DULL092 283
303-#define MGID_VC_SWITCHES_OVHD_DULL093 284
304-#define MGID_SW3_RAMX_IGN001 285
305-#define MGID_SW3_RAMX_DOOR001 286
306-#define MGID_SW3_RAMX_IGN002 287
307-#define MGID_VC_SWITCHES_OVHD_DULL094 288
308-#define MGID_VC_SWITCHES_OVHD_DULL095 289
309-#define MGID_VC_SWITCHES_OVHD_DULL096 290
310-#define MGID_VC_SWITCHES_OVHD_DULL097 291
311-#define MGID_VC_SWITCHES_OVHD_DULL098 292
312-#define MGID_VC_SWITCHES_OVHD_DULL099 293
313-#define MGID_VC_SWITCHES_OVHD_DULL100 294
314-#define MGID_VC_SWITCHES_OVHD_DULL101 295
315-#define MGID_VC_SWITCHES_OVHD_DULL102 296
316-#define MGID_VC_SWITCHES_OVHD_DULL103 297
317-#define MGID_VC_SWITCHES_OVHD_DULL104 298
318-#define MGID_VC_SWITCHES_OVHD_DULL105 299
319-#define MGID_VC_SWITCHES_OVHD_DULL106 300
320-#define MGID_VC_SWITCHES_OVHD_DULL107 301
321-#define MGID_SW3_ENGPNL_001 302
322-#define MGID_VC_SWITCHES_OVHD_DULL108 303
323-#define MGID_VC_SWITCHES_OVHD_DULL109 304
324-#define MGID_VC_SWITCHES_OVHD_DULL110 305
325-#define MGID_VC_SWITCHES_OVHD_DULL111 306
326-#define MGID_VC_SWITCHES_OVHD_DULL112 307
327-#define MGID_VC_SWITCHES_OVHD_DULL113 308
328-#define MGID_EICAS_C1 309
329-#define MGID_EICAS_P1 310
330-#define MGID_EICAS_P2 311
331-#define MGID_EICAS_E2 312
332-#define MGID_EICAS_E1 313
333-#define MGID_WINDSHIELD_THINGY 314
334-#define MGID_Object147 315
335-#define MGID_HUD 316
28+#define MGID_Object024 9
29+#define MGID_Object025 10
30+#define MGID_Object026 11
31+#define MGID_Object027 12
32+#define MGID_Object028 13
33+#define MGID_Object029 14
34+#define MGID_Plane002 15
35+#define MGID_Box008 16
36+#define MGID_Object048 17
37+#define MGID_MFD_6 18
38+#define MGID_MFD_4 19
39+#define MGID_MFD_KEYS 20
40+#define MGID_Object057 21
41+#define MGID_Object058 22
42+#define MGID_Object059 23
43+#define MGID_Box031 24
44+#define MGID_Object065 25
45+#define MGID_Object148 26
46+#define MGID_Object149 27
47+#define MGID_Object150 28
48+#define MGID_Box032 29
49+#define MGID_Object326 30
50+#define MGID_Cylinder004 31
51+#define MGID_Object328 32
52+#define MGID_Object329 33
53+#define MGID_Object330 34
54+#define MGID_RAMX_THR_GRIP 35
55+#define MGID_RAMX_THR_STICK 36
56+#define MGID_THR_RAMX_DETENT 37
57+#define MGID_RAMX_THR_FLAP 38
58+#define MGID_EMC_TRIGGER_COVER 39
59+#define MGID_WING_POS_LEVER 40
60+#define MGID_Cylinder006 41
61+#define MGID_THROTTLE_UNIT 42
62+#define MGID_Object336 43
63+#define MGID_Object337 44
64+#define MGID_Object338 45
65+#define MGID_Object339 46
66+#define MGID_Object340 47
67+#define MGID_Object341 48
68+#define MGID_Object342 49
69+#define MGID_Object343 50
70+#define MGID_Object344 51
71+#define MGID_Object345 52
72+#define MGID_STICK_BASE 53
73+#define MGID_CTRL_STICK 54
74+#define MGID_Object350 55
75+#define MGID_Object351 56
76+#define MGID_Object352 57
77+#define MGID_MFD_1 58
78+#define MGID_MFD_2 59
79+#define MGID_MFD_3 60
80+#define MGID_Object355 61
81+#define MGID_Object357 62
82+#define MGID_VISOR_FRONT_OUT 63
83+#define MGID_VISOR_FRONT_IN 64
84+#define MGID_Object361 65
85+#define MGID_SW3_GEAR 66
86+#define MGID_SW3_CANARD 67
87+#define MGID_SW3_VISOR 68
88+#define MGID_SW3_RCS 69
89+#define MGID_Object363 70
90+#define MGID_Object364 71
91+#define MGID_Object365 72
92+#define MGID_Object1226 73
93+#define MGID_Object1228 74
94+#define MGID_Object1229 75
95+#define MGID_Object1230 76
96+#define MGID_Object1231 77
97+#define MGID_Object1232 78
98+#define MGID_Object1233 79
99+#define MGID_SW3_EMAIN_MODE 80
100+#define MGID_SW3_EMAIN_REHEAT 81
101+#define MGID_SW2_LGT_NAV 82
102+#define MGID_SW2_LGT_STB 83
103+#define MGID_SW2_LGT_BCN 84
104+#define MGID_SW2_LGT_LGR 85
105+#define MGID_SW2_LGT_LND 86
106+#define MGID_SW2_LGT_TAX 87
107+#define MGID_SW2_LGT_DCK 88
108+#define MGID_SW2_LGT_BAY 89
109+#define MGID_SW2_LGT_PNL 90
110+#define MGID_SW2_LGT_FLD 91
111+#define MGID_SW2_LGT_CSL 92
112+#define MGID_SW2_LGT_DOM 93
113+#define MGID_SW2_LGT_AMB 94
114+#define MGID_SW2_LGT_BRT 95
115+#define MGID_SW3_RAMX_DOOR 96
116+#define MGID_SW3_RAMX_IGN 97
117+#define MGID_SW3_RAMX_COOL 98
118+#define MGID_SW3_RAMX_MODE 99
119+#define MGID_SW3_EMAIN_IGN 100
120+#define MGID_SW3_EMAIN_BRNRIGN 101
121+#define MGID_SW3_STBYIGN_RCS 102
122+#define MGID_SW3_STBYIGN_OMS 103
123+#define MGID_SW2_MSFEED_C 104
124+#define MGID_SW2_MSFEED_L 105
125+#define MGID_SW2_MSFEED_R 106
126+#define MGID_SW2_SYSFEED_APU 107
127+#define MGID_SW2_SYSFEED_OMS 108
128+#define MGID_SW2_SYSFEED_RCS 109
129+#define MGID_SW3_OXYFEED_L 110
130+#define MGID_SW3_OXYFEED_R 111
131+#define MGID_SW2_THR_AUTH 112
132+#define MGID_SW2_BRKCOOL 113
133+#define MGID_SW3_APU_MODE 114
134+#define MGID_SW3_APU_COOL 115
135+#define MGID_SW3_APU_EXHT 116
136+#define MGID_SW3_APU_START 117
137+#define MGID_SW3_APU_CYCLE 118
138+#define MGID_SW3_APU_BOOST 119
139+#define MGID_SW3_APU_AC 120
140+#define MGID_SW3_APU_BLEED 121
141+#define MGID_SW3_APU_HYD 122
142+#define MGID_EICAS_C 123
143+#define MGID_FLRES_DSP 124
144+#define MGID_MFD_5 125
145+#define MGID_Object1237 126
146+#define MGID_STICK_BOOT_1 127
147+#define MGID_STICK_BOOT_2 128
148+#define MGID_Object1344 129
149+#define MGID_SW2_EXTANK_L 130
150+#define MGID_SW2_EXTANK_B 131
151+#define MGID_SW2_EXTANK_R 132
152+#define MGID_Object1345 133
153+#define MGID_Object1347 134
154+#define MGID_Object1348 135
155+#define MGID_Object1349 136
156+#define MGID_Object1350 137
157+#define MGID_Object1351 138
158+#define MGID_Object1352 139
159+#define MGID_Object1353 140
160+#define MGID_Object1354 141
161+#define MGID_Object1355 142
162+#define MGID_Object1356 143
163+#define MGID_Object1357 144
164+#define MGID_Object1358 145
165+#define MGID_Object1360 146
166+#define MGID_Object1361 147
167+#define MGID_Object1362 148
168+#define MGID_Object1364 149
169+#define MGID_Object1365 150
170+#define MGID_Object1366 151
171+#define MGID_Object1367 152
172+#define MGID_Object1368 153
173+#define MGID_Object1370 154
174+#define MGID_Object1371 155
175+#define MGID_Object1372 156
176+#define MGID_Object1375 157
177+#define MGID_Object1376 158
178+#define MGID_Object1377 159
179+#define MGID_Object1378 160
180+#define MGID_ADI_RING 161
181+#define MGID_ADI_BALL 162
182+#define MGID_Object1379 163
183+#define MGID_Object1380 164
184+#define MGID_Cylinder008 165
185+#define MGID_SW3_BAY_OPENCLSE 166
186+#define MGID_SW3_BAY_LATCH 167
187+#define MGID_SW3_RADIATOR 168
188+#define MGID_Object1381 169
189+#define MGID_Object1382 170
190+#define MGID_VC_SWITCHES_OVHD_DULL001 171
191+#define MGID_VC_SWITCHES_OVHD_DULL002 172
192+#define MGID_VC_SWITCHES_OVHD_DULL003 173
193+#define MGID_VC_SWITCHES_OVHD_DULL004 174
194+#define MGID_VC_SWITCHES_OVHD_DULL005 175
195+#define MGID_VC_SWITCHES_OVHD_DULL006 176
196+#define MGID_VC_SWITCHES_OVHD_DULL007 177
197+#define MGID_VC_SWITCHES_OVHD_DULL008 178
198+#define MGID_VC_SWITCHES_OVHD_DULL009 179
199+#define MGID_VC_SWITCHES_OVHD_DULL010 180
200+#define MGID_VC_SWITCHES_OVHD_DULL011 181
201+#define MGID_VC_SWITCHES_OVHD_DULL012 182
202+#define MGID_VC_SWITCHES_OVHD_DULL013 183
203+#define MGID_VC_SWITCHES_OVHD_DULL014 184
204+#define MGID_VC_SWITCHES_OVHD_DULL015 185
205+#define MGID_VC_SWITCHES_OVHD_DULL016 186
206+#define MGID_VC_SWITCHES_OVHD_DULL017 187
207+#define MGID_VC_SWITCHES_OVHD_DULL018 188
208+#define MGID_VC_SWITCHES_OVHD_DULL019 189
209+#define MGID_VC_SWITCHES_OVHD_DULL020 190
210+#define MGID_VC_SWITCHES_OVHD_DULL021 191
211+#define MGID_VC_SWITCHES_OVHD_DULL022 192
212+#define MGID_VC_SWITCHES_OVHD_DULL023 193
213+#define MGID_VC_SWITCHES_OVHD_DULL024 194
214+#define MGID_VC_SWITCHES_OVHD_DULL025 195
215+#define MGID_VC_SWITCHES_OVHD_DULL026 196
216+#define MGID_VC_SWITCHES_OVHD_DULL027 197
217+#define MGID_VC_SWITCHES_OVHD_DULL028 198
218+#define MGID_VC_SWITCHES_OVHD_DULL029 199
219+#define MGID_VC_SWITCHES_OVHD_DULL030 200
220+#define MGID_VC_SWITCHES_OVHD_DULL031 201
221+#define MGID_VC_SWITCHES_OVHD_DULL032 202
222+#define MGID_VC_SWITCHES_OVHD_DULL033 203
223+#define MGID_VC_SWITCHES_OVHD_DULL034 204
224+#define MGID_VC_SWITCHES_OVHD_DULL035 205
225+#define MGID_VC_SWITCHES_OVHD_DULL036 206
226+#define MGID_VC_SWITCHES_OVHD_DULL037 207
227+#define MGID_VC_SWITCHES_OVHD_DULL038 208
228+#define MGID_VC_SWITCHES_OVHD_DULL039 209
229+#define MGID_VC_SWITCHES_OVHD_DULL040 210
230+#define MGID_VC_SWITCHES_OVHD_DULL041 211
231+#define MGID_VC_SWITCHES_OVHD_DULL042 212
232+#define MGID_VC_SWITCHES_OVHD_DULL043 213
233+#define MGID_VC_SWITCHES_OVHD_DULL044 214
234+#define MGID_VC_SWITCHES_OVHD_DULL045 215
235+#define MGID_VC_SWITCHES_OVHD_DULL046 216
236+#define MGID_VC_SWITCHES_OVHD_DULL047 217
237+#define MGID_VC_SWITCHES_OVHD_DULL048 218
238+#define MGID_VC_SWITCHES_OVHD_DULL049 219
239+#define MGID_VC_SWITCHES_OVHD_DULL050 220
240+#define MGID_VC_SWITCHES_OVHD_DULL051 221
241+#define MGID_VC_SWITCHES_OVHD_DULL052 222
242+#define MGID_VC_SWITCHES_OVHD_DULL053 223
243+#define MGID_VC_SWITCHES_OVHD_DULL054 224
244+#define MGID_VC_SWITCHES_OVHD_DULL055 225
245+#define MGID_VC_SWITCHES_OVHD_DULL056 226
246+#define MGID_VC_SWITCHES_OVHD_DULL057 227
247+#define MGID_VC_SWITCHES_OVHD_DULL058 228
248+#define MGID_VC_SWITCHES_OVHD_DULL059 229
249+#define MGID_VC_SWITCHES_OVHD_DULL060 230
250+#define MGID_VC_SWITCHES_OVHD_DULL061 231
251+#define MGID_VC_SWITCHES_OVHD_DULL062 232
252+#define MGID_VC_SWITCHES_OVHD_DULL063 233
253+#define MGID_VC_SWITCHES_OVHD_DULL064 234
254+#define MGID_VC_SWITCHES_OVHD_DULL065 235
255+#define MGID_VC_SWITCHES_OVHD_DULL066 236
256+#define MGID_VC_SWITCHES_OVHD_DULL067 237
257+#define MGID_VC_SWITCHES_OVHD_DULL068 238
258+#define MGID_VC_SWITCHES_OVHD_DULL069 239
259+#define MGID_VC_SWITCHES_OVHD_DULL070 240
260+#define MGID_VC_SWITCHES_OVHD_DULL071 241
261+#define MGID_VC_SWITCHES_OVHD_DULL075 242
262+#define MGID_OVHD_FIRE_SWITCHES001 243
263+#define MGID_OVHD_FIRE_SWITCHES002 244
264+#define MGID_OVHD_FIRE_SWITCHES003 245
265+#define MGID_OVHD_FIRE_SWITCHES004 246
266+#define MGID_OVHD_FIRE_SWITCHES005 247
267+#define MGID_OVHD_FIRE_SWITCHES006 248
268+#define MGID_OVHD_FIRE_SWITCHES007 249
269+#define MGID_OVHD_FIRE_SWITCHES008 250
270+#define MGID_OVHD_FIRE_SWITCHES009 251
271+#define MGID_OVHD_FIRE_SWITCHES010 252
272+#define MGID_OVHD_FIRE_SWITCHES011 253
273+#define MGID_SWITCHES_DULL001 254
274+#define MGID_SWITCHES_DULL002 255
275+#define MGID_SWITCHES_DULL003 256
276+#define MGID_SWITCHES_DULL004 257
277+#define MGID_SWITCHES_DULL005 258
278+#define MGID_SWITCHES_DULL006 259
279+#define MGID_Object1388 260
280+#define MGID_VC_SWITCHES_OVHD_DULL076 261
281+#define MGID_VC_SWITCHES_OVHD_DULL077 262
282+#define MGID_VC_SWITCHES_OVHD_DULL078 263
283+#define MGID_VC_SWITCHES_OVHD_DULL079 264
284+#define MGID_VC_SWITCHES_OVHD_DULL080 265
285+#define MGID_VC_SWITCHES_OVHD_DULL081 266
286+#define MGID_VC_SWITCHES_OVHD_DULL082 267
287+#define MGID_VC_SWITCHES_OVHD_DULL083 268
288+#define MGID_Object1389 269
289+#define MGID_SW3_DARTS 270
290+#define MGID_Object1391 271
291+#define MGID_Object1392 272
292+#define MGID_Object1393 273
293+#define MGID_GND_STEER_TILLER 274
294+#define MGID_VC_SWITCHES_OVHD_DULL084 275
295+#define MGID_VC_SWITCHES_OVHD_DULL085 276
296+#define MGID_VC_SWITCHES_OVHD_DULL086 277
297+#define MGID_VC_SWITCHES_OVHD_DULL087 278
298+#define MGID_Object1394 279
299+#define MGID_VC_SWITCHES_OVHD_DULL088 280
300+#define MGID_VC_SWITCHES_OVHD_DULL089 281
301+#define MGID_VC_SWITCHES_OVHD_DULL090 282
302+#define MGID_VC_SWITCHES_OVHD_DULL091 283
303+#define MGID_VC_SWITCHES_OVHD_DULL092 284
304+#define MGID_VC_SWITCHES_OVHD_DULL093 285
305+#define MGID_SW3_RAMX_IGN001 286
306+#define MGID_SW3_RAMX_DOOR001 287
307+#define MGID_SW3_RAMX_IGN002 288
308+#define MGID_VC_SWITCHES_OVHD_DULL094 289
309+#define MGID_VC_SWITCHES_OVHD_DULL095 290
310+#define MGID_VC_SWITCHES_OVHD_DULL096 291
311+#define MGID_VC_SWITCHES_OVHD_DULL097 292
312+#define MGID_VC_SWITCHES_OVHD_DULL098 293
313+#define MGID_VC_SWITCHES_OVHD_DULL099 294
314+#define MGID_VC_SWITCHES_OVHD_DULL100 295
315+#define MGID_VC_SWITCHES_OVHD_DULL101 296
316+#define MGID_VC_SWITCHES_OVHD_DULL102 297
317+#define MGID_VC_SWITCHES_OVHD_DULL103 298
318+#define MGID_VC_SWITCHES_OVHD_DULL104 299
319+#define MGID_VC_SWITCHES_OVHD_DULL105 300
320+#define MGID_VC_SWITCHES_OVHD_DULL106 301
321+#define MGID_VC_SWITCHES_OVHD_DULL107 302
322+#define MGID_SW3_ENGPNL_001 303
323+#define MGID_VC_SWITCHES_OVHD_DULL108 304
324+#define MGID_Object147 305
325+#define MGID_HUD 306
336326 #endif
\ No newline at end of file
diff -r abeadacf3a8c -r e14ce615204f G422_MDL_EXT.h
--- a/G422_MDL_EXT.h Sun Jun 11 15:25:07 2017 +0200
+++ b/G422_MDL_EXT.h Mon Jun 12 17:00:51 2017 +0200
@@ -137,7 +137,7 @@
137137 #define MGID_WING_WRDROP_TIP_R 2
138138 #define MGID_WING_ACS_OUT_R 3
139139 #define MGID_BAY_DOOR_R 4
140-#define MGID_BAY_DOOR_INT_R 5
140+#define MGID_RADIATOR_R 5
141141 #define MGID_VISOR_EXT_FORE 6
142142 #define MGID_Object010 7
143143 #define MGID_VISOR_EXT_AFT 8
@@ -190,19 +190,19 @@
190190 #define MGID_Object1275 55
191191 #define MGID_Object1328 56
192192 #define MGID_Object1346 57
193-#define MGID_BAY_DOOR_L 58
194-#define MGID_BAY_DOOR_INT_L 59
195-#define MGID_WINGS 60
196-#define MGID_RCS_DOOR_R 61
197-#define MGID_RCS_THRUSTERS_R 62
198-#define MGID_Object1386 63
199-#define MGID_RCS_DOOR_L 64
200-#define MGID_RCS_THRUSTERS_L 65
201-#define MGID_TAILWHEEL_DOOR_L 66
202-#define MGID_TAIL_WHEEL 67
203-#define MGID_TAILWHEEL_DOOR_R 68
204-#define MGID_ANT_DISH 69
205-#define MGID_VISOR_EXT_WINDOWS 70
206-
193+#define MGID_bay_detail 58
194+#define MGID_Cylinder007 59
195+#define MGID_BAY_DOOR_L 60
196+#define MGID_RADIATOR_L 61
197+#define MGID_WINGS 62
198+#define MGID_RCS_DOOR_R 63
199+#define MGID_RCS_THRUSTERS_R 64
200+#define MGID_Object1386 65
201+#define MGID_RCS_DOOR_L 66
202+#define MGID_RCS_THRUSTERS_L 67
203+#define MGID_TAILWHEEL_DOOR_L 68
204+#define MGID_TAIL_WHEEL 69
205+#define MGID_TAILWHEEL_DOOR_R 70
206+#define MGID_VISOR_EXT_WINDOWS 71
207207
208208 #endif
\ No newline at end of file
diff -r abeadacf3a8c -r e14ce615204f G422_SIM_CONTROLS.cpp
--- a/G422_SIM_CONTROLS.cpp Sun Jun 11 15:25:07 2017 +0200
+++ b/G422_SIM_CONTROLS.cpp Mon Jun 12 17:00:51 2017 +0200
@@ -154,8 +154,8 @@
154154 {
155155 case MGID_SW3_RAMX_IGN:
156156 case MGID_SW3_EMAIN_IGN:
157- case MGID_SW3_APU_PACK_A:
158- case MGID_SW3_APU_PACK_B:
157+ case MGID_SW3_APU_CYCLE:
158+ case MGID_SW3_APU_BOOST:
159159 // the above switches are spring-loaded only on top position...
160160 if (sw.pos != SW3_UP) return false;
161161
@@ -353,7 +353,7 @@
353353
354354
355355
356- case MGID_SW3_APU_PACK_A:
356+ case MGID_SW3_APU_CYCLE:
357357 //case MGID_SW3_APU_PACK_B:
358358
359359 if (sw.pos == SW3_UP) cueEngines(apu, APU::ENG_START);
@@ -372,7 +372,7 @@
372372
373373
374374
375- case MGID_SW2_APU_RAMX:
375+ case MGID_SW3_APU_START:
376376 if (sw.pos == SW2_UP)
377377 {
378378 engRamx.feed |= RAMCASTER::FUEL_PUMP;
diff -r abeadacf3a8c -r e14ce615204f G422_VSL_SETUP.cpp
--- a/G422_VSL_SETUP.cpp Sun Jun 11 15:25:07 2017 +0200
+++ b/G422_VSL_SETUP.cpp Mon Jun 12 17:00:51 2017 +0200
@@ -147,10 +147,10 @@
147147 //
148148
149149 SetEmptyMass(EMPTY_MASS);
150- SetSize(75);
150+ SetSize(1);
151151
152152 SetVisibilityLimit(1e-3, 2e-4);
153- SetClipRadius(35);
153+ SetClipRadius(1);
154154
155155 /*
156156 // DISUSED -- legacy bmp lookup setup for the engines
Show on old repository browser