Automatic merge of T1.5.1-684-gc6e0de1c4 and 7 pull requests

openrails-bot · openrails-bot · commit fd0d0367c0eb · 2023-10-21T16:07:37.000+01:00
- Pull request #570 at c59c788: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #874 at f8dbeab: Dynamic brake controller refactoring - Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #878 at 076cd04: Implement Polach Adhesion - Pull request #883 at aac4d3f: SwitchPanel disconnect/connect handling
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel/index2.css b/Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel/index2.css
@@ -69,3 +69,17 @@ label {
     min-width: 1px;
 }
 
+#overlay {
+    position: fixed; /* Sit on top of the page content */
+    display: none; /* Hidden by default */
+    width: 100%; /* Full width (cover the whole page) */
+    height: 100%; /* Full height (cover the whole page) */
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0,0,0,0.6); /* Black background with opacity */
+    z-index: 2; /* Specify a stack order in case you're using a different order for other elements */
+    cursor: pointer; /* Add a pointer on hover */
+}
+
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel/index2.html b/Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel/index2.html
@@ -25,6 +25,7 @@
     </head>
 
     <body style="background-color: white">
+        <div id="overlay"></div>
         <table id="tableSwitchPanel"></table>
         <script src="index2.js"></script>
     </body>
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel/index2.js b/Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel/index2.js
@@ -30,12 +30,14 @@ function createSocket() {
     const connection = new WebSocket(uri, "json");
 
     connection.onopen = function (evt) {
-        console.log("websocket opened: " + evt.type);
+        console.log("Websocket opened: " + evt.type);
+        // connected, turn off the dark overlay
+        document.getElementById("overlay").style.display = "none"; 
     };
 
     connection.onmessage = function (evt) {
         const json = JSON.parse(evt.data);
-        console.log("websocket message received: ", json);
+        console.log("Websocket message received: ", json);
         if (initStillToBeDone) {
             if (json.type == "init") {
                 initReceived(json.data);
@@ -48,13 +50,28 @@ function createSocket() {
     }
 
     connection.onerror = function (evt) {
-        console.error("websocket error: ", evt.type);
+        console.error("Websocket error: ", evt.type);
+        // this will also fire the onclose after this
     }
 
     connection.onclose = function (evt) {
-        console.log("WebSocket is closed now: " + evt.type);
+        console.log("WebSocket is closed: ", evt.type);
+        // dark overlay displayed so that it's clear the connection has gone
+        document.getElementById("overlay").style.display = "block"; 
+        // try to reconnect after 1 second
+        setTimeout(function () {
+            websocket = createSocket();
+        }, 1000);
     };
 
+    setTimeout(function () {
+        // close the socket if no connection established after 1 second
+        // otherwise it will wait with the reconnect after a timeout of 2 minutes
+        if (websocket.readyState != 1) {
+            websocket.close();
+        }
+    }, 1000);
+
     return connection;
 }
 
