Removed support for registering original DR root, updated readme for …

…v2.0
TwinFan · Apr 14, 2020 · 0f2e052 · 0f2e052
1 parent 7a38210
commit 0f2e052
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 27 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -64,23 +64,70 @@ <h3>Resulting Directory Structure</h3>
 
     <P>
         <code>LiveTraffic/</code><br>
-        <code>LiveTraffic/64/</code><br>
-        <code>LiveTraffic/64/lin.xpl</code><br>
-        <code>LiveTraffic/64/mac.xpl</code><br>
-        <code>LiveTraffic/64/win.xpl</code><br>
+        <code>LiveTraffic/lin_64/LiveTraffic.xpl</code><br>
+        <code>LiveTraffic/mac_75/LiveTraffic.xpl</code><br>
+        <code>LiveTraffic/win_64/LiveTraffic.xpl</code><br>
         <code>LiveTraffic/Resources/CSL/...</code> (here follow the CSL package folders)<br>
         <code>LiveTraffic/Resources/ShippedCSL/XCSL_CARS/...</code> (here follow files for the ground vehicle model)<br>
         <code>LiveTraffic/Resources/CSL2XSB.py</code><br>
         <code>LiveTraffic/Resources/Doc8643.txt</code><br>
         <code>LiveTraffic/Resources/FlightModels.prf</code><br>
-        <code>LiveTraffic/Resources/lights.png</code><br>
+        <code>LiveTraffic/Resources/MapIcons.png</code><br>
         <code>LiveTraffic/Resources/model_typecode.txt</code><br>
         <code>LiveTraffic/Resources/related.txt</code><br>
     </P>
 
     <h1>Release Notes</h1>
 
     <p>The number-link refers to the issue in GitHub with (often technical) details.</p>
+
+    <h2>v2.0</h2>
+
+    <h3>v2.00.20200414</h3>
+
+    <strong>Updating from LiveTraffic v1.5</strong>:
+    <ul>
+        <li>Replace all files with the new ones from the ZIP archive downloaded here.</li>
+        <li>Remove the no longer needed <code>64/</code> folder including its binaries.
+            New binaries are now in the <code>lin/mac/win_64/</code> folders.</li>
+        <li>Remove <code>Resources/lights.png</code>.</li>
+        <li>If you had run <code>CSL2XSB</code> before using the
+            <a href="https://twinfan.gitbook.io/livetraffic/setup/installation/csl2xsb#making-csl-packages-unique-to-livetraffic">Making CSL Packages unique</a>
+            option, then you <strong>must</strong> run <code>CSL2XSB</code> again,
+            now <i>without</i> selecting "make...unique".
+            If you forget this step then plane models will not
+            show any animations.</li>
+    </ul>
+
+    Change log:
+
+    <ul>
+        <li><strong>Supports X-Plane 11 only.</strong> No longer compatible with X-Plane 10.</li>
+        <li>Now uses latest plugin directory structure: Binaries are in
+            <code>lin/mac/win_64/</code> subdirectories, each containing
+            one <code>LiveTraffic.xpl</code> file.
+        <li>ADDED <strong>support for Vulkan/Metal</strong>, re-implemented the core library,
+            now using <a href="https://github.com/TwinFan/XPMP2">XPMP2</a>.
+            This means complete reimplementation of (and potentially new bugs in):
+            <ul>
+                <li>Reading CSL models.<br>
+                    <strong>NOTE:</strong> Only OBJ8 models
+                    are now supported! See <code>Log.txt</code> for unaccepted
+                    models.</li>
+                <li>Model matching.</li>
+                <li>AI/multiplayer support.</li>
+            </ul>
+            But also means a new feature:
+            <ul>
+                <li>ADDED a map layer "LiveTraffic" to X-Plane's internal map
+                    showing <i>all</i> aircraft under LiveTraffic's control.</li>
+            </ul>
+        <li>REMOVED option <i>Register original libxplanemp CSL dataRefs</i>
+            from <a href="https://twinfan.gitbook.io/livetraffic/setup/configuration/settings-csl">CSL Settings</a>.
+            <a href="https://twinfan.gitbook.io/livetraffic/setup/installation/csl2xsb#making-csl-packages-unique-to-livetraffic">Making CSL Packages unique to LiveTraffic"</a>
+            is neither support nor needed any longer.
+            The "Missing Gear" issue is history when using instancing.</li>
+    </ul>
 
     <h2>v1.5</h2>