diff --git a/Include/DataRefs.h b/Include/DataRefs.h index 3ac35583..30a516fe 100644 --- a/Include/DataRefs.h +++ b/Include/DataRefs.h @@ -257,7 +257,6 @@ enum dataRefsLT { DR_CFG_LND_LIGHTS_TAXI, DR_CFG_HIDE_BELOW_AGL, DR_CFG_HIDE_TAXIING, - DR_CFG_DR_LIBXPLANEMP, DR_CFG_LAST_CHECK_NEW_VER, // debug options @@ -493,7 +492,6 @@ class DataRefs int bLndLightsTaxi = false; // keep landing lights on while taxiing? (to be able to see the a/c as there is no taxi light functionality) int hideBelowAGL = 0; // if positive: a/c visible only above this height AGL int hideTaxiing = 0; // hide a/c while taxiing? - int drLibXplaneMP = 1; // CSL models: register original 'libxplanemp' dataRefs? // channel config options int rtListenPort = 10747; // port opened for RT to connect @@ -650,9 +648,6 @@ class DataRefs inline bool GetHideTaxiing() const { return hideTaxiing != 0; } inline bool IsAutoHidingActive() const { return hideBelowAGL > 0 || hideTaxiing != 0; } - inline bool GetDrLibXplaneMP() const { return drLibXplaneMP != 0; } - inline void SetDrLibXplaneMP(int i) { drLibXplaneMP = i; } - bool NeedNewVerCheck () const; void SetLastCheckedNewVerNow (); diff --git a/Include/SettingsUI.h b/Include/SettingsUI.h index 66185a2a..e5ccc06c 100644 --- a/Include/SettingsUI.h +++ b/Include/SettingsUI.h @@ -70,7 +70,6 @@ class LTSettingsUI : public TFMainWindowWidget // CSL tab enum { SETUI_CSL_PATHS=7, SETUI_CSL_ELEMS_PER_PATH=3 }; static constexpr int SETUI_CSL_PATHS_NUM_ELEMS = SETUI_CSL_PATHS * SETUI_CSL_ELEMS_PER_PATH; - TFButtonDataRef btnRegLibXPlanempDR; TFTextFieldWidget txtCSLPaths[SETUI_CSL_PATHS]; TFTextFieldWidget txtDefaultAcType, txtGroundVehicleType; diff --git a/Lib/XPMP2/XPMP2.framework/Versions/1.0/XPMP2 b/Lib/XPMP2/XPMP2.framework/Versions/1.0/XPMP2 index d6363318..056dc8e2 100644 Binary files a/Lib/XPMP2/XPMP2.framework/Versions/1.0/XPMP2 and b/Lib/XPMP2/XPMP2.framework/Versions/1.0/XPMP2 differ diff --git a/Src/DataRefs.cpp b/Src/DataRefs.cpp index e1936119..40e086b7 100644 --- a/Src/DataRefs.cpp +++ b/Src/DataRefs.cpp @@ -412,7 +412,6 @@ DataRefs::dataRefDefinitionT DATA_REFS_LT[CNT_DATAREFS_LT] = { {"livetraffic/cfg/lnd_lights_taxi", DataRefs::LTGetInt, DataRefs::LTSetCfgValue, GET_VAR, true }, {"livetraffic/cfg/hide_below_agl", DataRefs::LTGetInt, DataRefs::LTSetCfgValue, GET_VAR, true }, {"livetraffic/cfg/hide_taxiing", DataRefs::LTGetInt, DataRefs::LTSetCfgValue, GET_VAR, true }, - {"livetraffic/cfg/dr_libxplanemp", DataRefs::LTGetInt, DataRefs::LTSetCfgValue, GET_VAR, true }, {"livetraffic/cfg/last_check_new_ver", DataRefs::LTGetInt, DataRefs::LTSetCfgValue, GET_VAR, true }, // debug options @@ -469,7 +468,6 @@ void* DataRefs::getVarAddr (dataRefsLT dr) case DR_CFG_LND_LIGHTS_TAXI: return &bLndLightsTaxi; case DR_CFG_HIDE_BELOW_AGL: return &hideBelowAGL; case DR_CFG_HIDE_TAXIING: return &hideTaxiing; - case DR_CFG_DR_LIBXPLANEMP: return &drLibXplaneMP; case DR_CFG_LAST_CHECK_NEW_VER: return &lastCheckNewVer; // debug options diff --git a/Src/SettingsUI.cpp b/Src/SettingsUI.cpp index 4d3fb78b..fa001299 100644 --- a/Src/SettingsUI.cpp +++ b/Src/SettingsUI.cpp @@ -176,9 +176,6 @@ enum UI_WIDGET_IDX_T { UI_CSL_TXT_PATH_7, UI_CSL_BTN_LOAD_7, - UI_CSL_BTN_REGISTER_LIBXPLANEMP_DR, - UI_CSL_CAP_REGISTER_LIBXPLANEMP_DR, - UI_CSL_CAP_DEFAULT_AC_TYPE, UI_CSL_TXT_DEFAULT_AC_TYPE, UI_CSL_CAP_GROUND_VEHICLE_TYPE, @@ -338,8 +335,6 @@ TFWidgetCreate_t SETTINGS_UI[] = {{ 10, 150, 10, 10, 1, "", 0, UI_CSL_SUB_WND, xpWidgetClass_Button}, {{xpProperty_ButtonType, xpRadioButton}, {xpProperty_ButtonBehavior, xpButtonBehaviorCheckBox},{0,0}} }, {{ 25, 147, 300, 15, 1, "", 0, UI_CSL_SUB_WND, xpWidgetClass_TextField}, {{0,0},{0,0},{0,0}} }, {{ 330, 150, 50, 10, 1, "Load", 0, UI_CSL_SUB_WND, xpWidgetClass_Button}, {{xpProperty_ButtonType, xpPushButton}, {xpProperty_ButtonBehavior,xpButtonBehaviorPushButton},{0,0}} }, - {{ 10, 185, 10, 10, 1, "Register original libxplanemp CSL dataRefs", 0, UI_CSL_SUB_WND, xpWidgetClass_Button}, {{xpProperty_ButtonType, xpRadioButton}, {xpProperty_ButtonBehavior, xpButtonBehaviorCheckBox},{0,0}} }, - {{ 20, 200, -5, 10, 1, "(Requires restart. Read help before deactivating!)", 0, UI_CSL_SUB_WND, xpWidgetClass_Caption}, {{0,0},{0,0},{0,0}} }, {{ 5, 230, 130, 10, 1, "Default a/c type", 0, UI_CSL_SUB_WND, xpWidgetClass_Caption}, {{0,0},{0,0},{0,0}} }, {{ 135, 227, 50, 15, 1, "", 0, UI_CSL_SUB_WND, xpWidgetClass_TextField},{{xpProperty_MaxCharacters,4},{0,0},{0,0}} }, {{ 5, 250, 130, 10, 1, "Ground vehicle type", 0, UI_CSL_SUB_WND, xpWidgetClass_Caption}, {{0,0},{0,0},{0,0}} }, @@ -546,9 +541,6 @@ void LTSettingsUI::Enable() } } - btnRegLibXPlanempDR.setId(widgetIds[UI_CSL_BTN_REGISTER_LIBXPLANEMP_DR], - DATA_REFS_LT[DR_CFG_DR_LIBXPLANEMP]); - txtDefaultAcType.setId(widgetIds[UI_CSL_TXT_DEFAULT_AC_TYPE]); txtDefaultAcType.tfFormat = TFTextFieldWidget::TFF_UPPER_CASE; txtDefaultAcType.SetDescriptor(dataRefs.GetDefaultAcIcaoType()); diff --git a/docs/Notes.txt b/docs/Notes.txt index f5690f9f..7a9d85a6 100644 --- a/docs/Notes.txt +++ b/docs/Notes.txt @@ -1,12 +1,6 @@ TODO === -#13 ensure nearest a/c are shown - -Identify Vulkan/Metal and warn fatally: -sim/graphics/view/using_modern_driver - - LTApt - Instead of wasting space with all nodes supporting Dijkstra, consider a map holding Dijkstra info per visited node diff --git a/docs/readme.html b/docs/readme.html index 8d0eb20b..b466e8f8 100755 --- a/docs/readme.html +++ b/docs/readme.html @@ -64,16 +64,15 @@

Resulting Directory Structure

LiveTraffic/
- LiveTraffic/64/
- LiveTraffic/64/lin.xpl
- LiveTraffic/64/mac.xpl
- LiveTraffic/64/win.xpl
+ LiveTraffic/lin_64/LiveTraffic.xpl
+ LiveTraffic/mac_75/LiveTraffic.xpl
+ LiveTraffic/win_64/LiveTraffic.xpl
LiveTraffic/Resources/CSL/... (here follow the CSL package folders)
LiveTraffic/Resources/ShippedCSL/XCSL_CARS/... (here follow files for the ground vehicle model)
LiveTraffic/Resources/CSL2XSB.py
LiveTraffic/Resources/Doc8643.txt
LiveTraffic/Resources/FlightModels.prf
- LiveTraffic/Resources/lights.png
+ LiveTraffic/Resources/MapIcons.png
LiveTraffic/Resources/model_typecode.txt
LiveTraffic/Resources/related.txt

@@ -81,6 +80,54 @@

Resulting Directory Structure

Release Notes

The number-link refers to the issue in GitHub with (often technical) details.

+ +

v2.0

+ +

v2.00.20200414

+ + Updating from LiveTraffic v1.5: + + + Change log: + +

v1.5