feat: Parse and render segments

Hypfer · May 19, 2020 · 386c344 · 386c344
1 parent cd42a7e
commit 386c344
Show file tree

Hide file tree

Showing 3 changed files with 11,599 additions and 2 deletions.
diff --git a/client/zone/js-modules/map-drawer.js b/client/zone/js-modules/map-drawer.js
@@ -26,6 +26,14 @@ export function MapDrawer() {
     function draw(mapData) {
         const freeColor = hexToRgb(getComputedStyle(document.documentElement).getPropertyValue("--map-free") || "#0076ff");
         const occupiedColor = hexToRgb(getComputedStyle(document.documentElement).getPropertyValue("--map-occupied") || "#52aeff");
+        const segmentColors = [
+            "#19A1A1",
+            "#7AC037",
+            "#DF5618",
+            "#F7C841"
+        ].map(function(e) {
+            return hexToRgb(e);
+        });
 
         mapCtx.clearRect(0, 0, mapCanvas.width, mapCanvas.height);
         const imgData = mapCtx.createImageData(mapCanvas.width, mapCanvas.height);
@@ -45,6 +53,18 @@ export function MapDrawer() {
                         break;
                 }
 
+                if (!color) {
+                    if (key.indexOf("segment_") === 0) {
+                        const id = parseInt(key.split("_")[1]);
+
+                        color = segmentColors[((id-1) % segmentColors.length)];
+                    } else {
+                        console.error("Missing color for " + key);
+                        color = {r: 0, g: 0, b: 0};
+                    }
+
+                }
+
                 mapData.pixels[key].forEach(function(px){
                     const imgDataOffset = (px[0] + mapData.position.left + (px[1] + mapData.position.top) * mapCanvas.width) * 4;
 

diff --git a/lib/RRMapParser.js b/lib/RRMapParser.js
@@ -171,6 +171,7 @@ class RRMapParser {
             pixels: {}
         };
         let view;
+        let mayContainSegments = false;
 
         switch (block.header_length) {
             case 24:
@@ -181,6 +182,7 @@ class RRMapParser {
                 //Everything else stays at the same relative offsets so we can just throw those additional bytes away
                 view = block.view.slice(4);
                 parsedBlock.segments.count = view.readInt32LE(0x04);
+                mayContainSegments = true;
                 break;
 
             default:
@@ -224,9 +226,20 @@ class RRMapParser {
                             imageData.obstacle_strong.push(coords);
                             break;
                         default: {
-                            // TODO: define map structure with segments
-                            //let segment = (val & 0b11111000) >> 3;
                             imageData.floor.push(coords);
+
+                            if (mayContainSegments) {
+                                let segmentId = (val & 0b11111000) >> 3;
+
+                                if (segmentId !== 0) {
+                                    if (!imageData["segment_" + segmentId]) {
+                                        imageData["segment_" + segmentId] = [];
+                                    }
+
+                                    imageData["segment_" + segmentId].push(coords);
+                                }
+                            }
+
                             break;
                         }
                     }