Fix incorrect destId and destIndex when using SimpleBranch

krypciak · Aug 19, 2024 · 24b2331 · 24b2331
1 parent 1703ba6
commit 24b2331
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 26 deletions.
diff --git a/src/map-arrange/drawer.ts b/src/map-arrange/drawer.ts
@@ -89,6 +89,6 @@ export function printMapArrangeQueue(
     lastPrint = Date.now()
     const res = drawMapArrangeQueue(queue, scale, nonFinished, mapsAdd, keepInTheSamePlace, color)
     const len = res.split('\n')[0].length
-    console.clear()
+    // console.clear()
     console.log(add + ' ' + '='.repeat(Math.max(1, len - add.length - 1)) + ' ' + '\n' + res + '\n' + '='.repeat(len))
 }
diff --git a/src/map-arrange/map-picker/configurable.ts b/src/map-arrange/map-picker/configurable.ts
@@ -2,18 +2,24 @@ import { Id, BuildQueueAccesor, NextQueueEntryGenerator } from '../../build-queu
 import { MapArrangeData, TprArrange, MapArrange } from '../../map-arrange/map-arrange'
 import { Dir } from '../../util/geometry'
 import { assert } from '../../util/util'
+import { printMapArrangeQueue } from '../drawer'
 
 declare global {
     export namespace MapPickerNodeConfigs {
         export interface All {}
     }
 }
 
+export type MapPickerData = {
+    newId?: Id
+    newIndex?: number
+    nextBranch?: number
+    nextConfig?: MapPicker.ConfigNodeBuildtime
+}
 export type MapPicker = (
     id: Id,
     accesor: BuildQueueAccesor<MapArrangeData>,
-    newId?: Id,
-    nextBranch?: number
+    data?: MapPickerData
 ) => NextQueueEntryGenerator<MapArrangeData>
 
 export namespace MapPicker {
@@ -36,6 +42,8 @@ export namespace MapPicker {
             finishedWhole?: boolean
             nodeId: number
             nodeProgress?: number
+            destId: number
+            destIndex: number
         }
     ) => NextQueueEntryGenerator<MapArrangeData>
     export type NodeBuilderRecord = { [key in ConfigTypes]: NodeBuilder<key> }
@@ -94,17 +102,15 @@ export function mapPickerConfigurable(_config: MapPicker.Config): MapPicker {
     const mapPicker = (
         id: Id,
         accesor: BuildQueueAccesor<MapArrangeData>,
-        newId = id + 1,
-        nextBranch?: number,
-        nextConfig?: MapPicker.ConfigNodeBuildtime
+        { newId = id + 1, newIndex = 0, nextBranch, nextConfig }: MapPickerData = {}
     ): NextQueueEntryGenerator<MapArrangeData> => {
         const last = id == -1 ? undefined : (accesor.get(id) as MapArrange)
-        // {
-        //     const push = accesor.globalPushCount
-        //     const pop = accesor.globalPopCount
-        //     const str = `push: ${push}, pop: ${pop}, len: ${accesor.queue.length}, ratio: ${(accesor.queue.length / pop).toPrecision(4)}`
-        //     printQueue(accesor, true, undefined, true, true, str)
-        // }
+        {
+            const push = accesor.globalPushCount
+            const pop = accesor.globalPopCount
+            const str = `push: ${push}, pop: ${pop}, len: ${accesor.queue.length}, ratio: ${(accesor.queue.length / pop).toPrecision(4)}`
+            printMapArrangeQueue(accesor, 16, true, undefined, true, true, str)
+        }
 
         const lastTpr = last
             ? (last.restTprs.find(t => t.destId == newId)! as TprArrange)
@@ -131,7 +137,7 @@ export function mapPickerConfigurable(_config: MapPicker.Config): MapPicker {
                 assert(config.followedBy)
                 const nextConfig = config.followedBy as MapPicker.ConfigNodeBuildtime
 
-                return mapPicker(id, accesor, newId, undefined, nextConfig)
+                return mapPicker(id, accesor, { newId, nextConfig })
             } else {
                 const branchDone = !config.followedBy && config.count - 1 <= nodeProgress
                 const finishedWhole = branchDone && nodeId == lastNodeId
@@ -144,6 +150,8 @@ export function mapPickerConfigurable(_config: MapPicker.Config): MapPicker {
                     nodeId,
                     nodeProgress: nodeProgress + 1,
                     finishedWhole,
+                    destId: id,
+                    destIndex: newIndex,
                 })
             }
         }
@@ -152,10 +160,16 @@ export function mapPickerConfigurable(_config: MapPicker.Config): MapPicker {
             if (nextBranch !== undefined) {
                 assert(last?.createNextBranch)
                 const nextConfig = config.branches[nextBranch] as MapPicker.ConfigNodeBuildtime
-                return mapPicker(id, accesor, newId, undefined, nextConfig)
+                return mapPicker(id, accesor, { newId, nextConfig, newIndex })
             }
             const generator = nodeConfigs[config.type]
-            return generator(config as any, { exitTpr: lastTpr, mapPicker, nodeId: nodeId })
+            return generator(config as any, {
+                exitTpr: lastTpr,
+                mapPicker,
+                nodeId: nodeId,
+                destId: id,
+                destIndex: newIndex,
+            })
         }
 
         assert(false)

diff --git a/src/map-arrange/map-picker/simple.ts b/src/map-arrange/map-picker/simple.ts
@@ -6,7 +6,7 @@ import { printMapArrangeQueue } from '../drawer'
 import { simpleMapArrange } from '../../maps/simple'
 import { simpleMapBranchTunnelArrange } from '../../maps/simple-branch'
 import { simpleMapTunnelArrange } from '../../maps/simple-tunnel'
-import { MapPicker } from './configurable'
+import { MapPicker, MapPickerData } from './configurable'
 
 export function mapPickerSimpleSeedRandomSize(count: number) {
     const mapPicker: MapPicker = (id, accesor) => {
@@ -22,6 +22,8 @@ export function mapPickerSimpleSeedRandomSize(count: number) {
             size,
             randomizeDirTryOrder: true,
             finishedWhole: id + 2 >= count,
+            destId: id,
+            destIndex: 0,
         })
         return roomGen
     }
@@ -43,6 +45,8 @@ export function mapPickerSimpleTunnelSeedRandomSize(count: number, tunnelSize =
             tunnelSize,
             randomizeDirTryOrder: true,
             finishedWhole: id + 2 >= count,
+            destId: id,
+            destIndex: 0,
         })
         return roomGen
     }
@@ -58,7 +62,11 @@ export function mapPickerSimpleTunnelBranch(branchCount: 1 | 2 | 3) {
     }
 
     const tunnelSize = { x: 1, y: 1 }
-    const mapPicker: MapPicker = (id, accesor, newId = id + 1): NextQueueEntryGenerator<MapArrangeData> => {
+    const mapPicker: MapPicker = (
+        id,
+        accesor,
+        { newId = id + 1 }: MapPickerData = {}
+    ): NextQueueEntryGenerator<MapArrangeData> => {
         const last = id == -1 ? undefined : (accesor.get(id) as MapArrange)
 
         if (last?.branchDone) {
@@ -87,6 +95,8 @@ export function mapPickerSimpleTunnelBranch(branchCount: 1 | 2 | 3) {
                 tunnelSize,
                 branchCount,
                 randomizeDirTryOrder: false,
+                destId: id,
+                destIndex: 0,
             })
         } else {
             const rand = 3 //randomInt(3, 5) * 2
@@ -101,6 +111,8 @@ export function mapPickerSimpleTunnelBranch(branchCount: 1 | 2 | 3) {
                 tunnelSize,
                 randomizeDirTryOrder: false,
                 branchDone,
+                destId: id,
+                destIndex: 0,
             })
         }
     }

diff --git a/src/maps/simple-branch.ts b/src/maps/simple-branch.ts
@@ -1,4 +1,4 @@
-import { NextQueueEntryGenerator, QueueEntry } from '../build-queue/build-queue'
+import { Id, NextQueueEntryGenerator, QueueEntry } from '../build-queue/build-queue'
 import {
     TprArrange,
     MapArrangeData,
@@ -38,6 +38,8 @@ export function simpleMapBranchTunnelArrange({
     roomSize,
     tunnelSize,
     branchCount,
+    destId,
+    destIndex,
     randomizeDirTryOrder,
     nodeId,
 }: {
@@ -46,6 +48,8 @@ export function simpleMapBranchTunnelArrange({
     roomSize: Vec2
     tunnelSize: Vec2
     branchCount: 1 | 2 | 3
+    destId: Id
+    destIndex: number
     randomizeDirTryOrder?: boolean
     nodeId?: number
 }): NextQueueEntryGenerator<MapArrangeData> {
@@ -54,9 +58,10 @@ export function simpleMapBranchTunnelArrange({
             dir: DirU.flip(exitTpr.dir),
             x: exitTpr.x,
             y: exitTpr.y,
-            destId: id - 1,
+            destId,
+            destIndex,
         }
-        const map: MapArrange = { type: 'Simple', rects: [], restTprs: [], id, entranceTprs: [tpr], nodeId }
+        const map: MapArrange = { type: 'SimpleBranch', rects: [], restTprs: [], id, entranceTprs: [tpr], nodeId }
 
         let tunnelEntrance: RoomArrange
         {
@@ -108,7 +113,8 @@ export function simpleMapBranchTunnelArrange({
 
                         branch: 0,
                         branchCount: 1,
-                        getNextQueueEntryGenerator: () => mapPicker(id, accesor, prevId, currentBranch),
+                        getNextQueueEntryGenerator: () =>
+                            mapPicker(id, accesor, { newId: prevId, nextBranch: currentBranch }),
                     }
                 }
                 const dir = dirs[currentBranch]
@@ -143,7 +149,8 @@ export function simpleMapBranchTunnelArrange({
 
                     branch: 0,
                     branchCount: 1,
-                    getNextQueueEntryGenerator: () => mapPicker(id, accesor, newId, currentBranch),
+                    getNextQueueEntryGenerator: () =>
+                        mapPicker(id, accesor, { newId, nextBranch: currentBranch, newIndex: currentBranch }),
                 }
             }
 

diff --git a/src/maps/simple-tunnel.ts b/src/maps/simple-tunnel.ts
@@ -1,4 +1,4 @@
-import { NextQueueEntryGenerator, QueueEntry } from '../build-queue/build-queue'
+import { Id, NextQueueEntryGenerator, QueueEntry } from '../build-queue/build-queue'
 import {
     TprArrange,
     MapArrangeData,
@@ -35,6 +35,8 @@ export function simpleMapTunnelArrange({
     exitTpr,
     roomSize,
     tunnelSize,
+    destId,
+    destIndex,
     randomizeDirTryOrder,
     finishedWhole,
     forceExit,
@@ -46,6 +48,8 @@ export function simpleMapTunnelArrange({
     exitTpr: TprArrange
     roomSize: Vec2
     tunnelSize: Vec2
+    destId: Id
+    destIndex: number
     randomizeDirTryOrder?: boolean
     finishedWhole?: boolean
     forceExit?: Dir
@@ -58,7 +62,8 @@ export function simpleMapTunnelArrange({
             dir: DirU.flip(exitTpr.dir),
             x: exitTpr.x,
             y: exitTpr.y,
-            destId: id - 1,
+            destId,
+            destIndex,
         }
         const map: MapArrange = {
             type: 'SimpleTunnel',

diff --git a/src/maps/simple.spec.ts b/src/maps/simple.spec.ts
@@ -24,6 +24,8 @@ export class Test_SimpleMapPicker {
                 size: { x: 2, y: 2 },
                 randomizeDirTryOrder: false,
                 finishedWhole: id >= 5,
+                destId: id,
+                destIndex: 0,
             })
             return roomGen
         }
@@ -48,6 +50,8 @@ export class Test_SimpleMapPicker {
                 size: { x: 2, y: 2 },
                 randomizeDirTryOrder: true,
                 finishedWhole: id >= 5,
+                destId: id,
+                destIndex: 0,
             })
             return roomGen
         }
@@ -69,6 +73,8 @@ export class Test_SimpleMapPicker {
                     randomizeDirTryOrder: false,
                     finishedWhole: false,
                     forceExit: Dir.EAST,
+                    destId: id,
+                    destIndex: 0,
                 })
             if (id == 0)
                 return simpleMapArrange({
@@ -78,6 +84,8 @@ export class Test_SimpleMapPicker {
                     randomizeDirTryOrder: false,
                     finishedWhole: true,
                     forceExit: Dir.EAST,
+                    destId: id,
+                    destIndex: 0,
                 })
             assert(false)
         }
@@ -101,6 +109,8 @@ export class Test_SimpleMapPicker {
                 tunnelSize: { x: 1, y: 2 },
                 randomizeDirTryOrder: true,
                 finishedWhole: id >= 5,
+                destId: id,
+                destIndex: 0,
             })
             return roomGen
         }

diff --git a/src/maps/simple.ts b/src/maps/simple.ts
@@ -1,5 +1,5 @@
 import { Vec2 } from '../util/vec2'
-import { NextQueueEntryGenerator, QueueEntry } from '../build-queue/build-queue'
+import { Id, NextQueueEntryGenerator, QueueEntry } from '../build-queue/build-queue'
 import {
     TprArrange,
     MapArrangeData,
@@ -42,6 +42,8 @@ export function simpleMapArrange({
     mapPicker,
     exitTpr,
     size,
+    destId,
+    destIndex,
     randomizeDirTryOrder,
     finishedWhole,
     forceExit,
@@ -52,6 +54,8 @@ export function simpleMapArrange({
     mapPicker: MapPicker
     exitTpr: TprArrange
     size: Vec2
+    destId: Id
+    destIndex: number
     randomizeDirTryOrder?: boolean
     finishedWhole?: boolean
     forceExit?: Dir
@@ -64,7 +68,8 @@ export function simpleMapArrange({
             x: exitTpr.x,
             y: exitTpr.y,
             dir: DirU.flip(exitTpr.dir),
-            destId: id - 1,
+            destId,
+            destIndex,
         }
         const map: MapArrange = {
             type: 'Simple',