Debug basin

Author: hacktoon

src/model/tilemap/worldmap/index.js

@@ -60,6 +60,7 @@ export class WorldTileMap extends TileMap {
         // set a global struct for world
         const world = {
             rect,
+            seed: this.seed,
             size: rect.width
         }
         const context = {

src/model/tilemap/worldmap/world/basin/index.js

@@ -53,14 +53,18 @@ export class BasinLayer {
         const {canvas, canvasPoint, tileSize, tilePoint} = props
         const basin = this.get(tilePoint)
         const isWater = this.#world.surface.isWater(tilePoint)
+        if (! basin.id) {
+            canvas.rect(canvasPoint, tileSize, WaterBasin.color.toHex())
+            return
+        }
         const basinColor = isWater ? WaterBasin.color : basin.type.color
         const color = basin.isDivide ? basinColor.brighten(20) : basinColor
         canvas.rect(canvasPoint, tileSize, color.toHex())
         if (params.get('showErosion')) {
-            const text = basin.erosion.symbol
-            const textColor = color.invert().toHex()
-            // canvas.text(canvasPoint, tileSize, text, textColor)
             this.#drawErosionPath(props, basin)
+            // const text = basin.erosion.symbol
+            // const textColor = color.invert().toHex()
+            // canvas.text(canvasPoint, tileSize, text, textColor)
         }
     }
 

src/model/tilemap/worldmap/world/basin/model.js

@@ -75,7 +75,7 @@ function buildBasinGrid(context) {
             const type = detectLandBasinType(world, survey)
             surveyMap.set(basinId, survey)
             model.type.set(basinId, type.id)
-            landFillMap.set(basinId, {origin: point})
+            landFillMap.set(basinId, {origin: point, type})
             basinId++
         } else if (isBorder && world.surface.isWater(point)) {
             const type = WaterBasin
@@ -157,7 +157,10 @@ class LandBasinFill extends ConcurrentFill {
         if (basinGrid.get(fillPoint) !== EMPTY) return false
         // avoid erosion flow on land borders
         if (world.surface.isBorder(fillPoint)) return false
-        if (fill.level >= basin.reach) return false
+        if (fill.level >= basin.reach) {
+            // basinGrid.set(fillPoint, fill.id)
+            return false
+        }
         const target = world.surface.get(fillPoint)
         const parent = world.surface.get(parentPoint)
         // avoid fill if different types
@@ -189,13 +192,10 @@ class WaterBasinFill extends ConcurrentFill {
         basinGrid.set(fillPoint, fill.id)  // basin id is the same as fill id
         // discover adjacent river and water tiles
         Point.adjacents(fillPoint, (sidePoint, direction) => {
-            const sideId = basinGrid.get(sidePoint)
-            const sideType = Basin.parse(model.type.get(sideId))
-            const isLand = world.surface.isLand(sidePoint)
-            if (isLand) {
+            if (world.surface.isLand(sidePoint)) {
                 const sideDirection = Direction.fromId(model.erosion.get(sidePoint))
                 const mouth = Point.atDirection(sidePoint, sideDirection)
-                if (sideType.hasRivers && Point.equals(mouth, fillPoint)) {
+                if (Point.equals(mouth, fillPoint)) {
                     model.directionBitmask.add(fillPoint, direction)
                     model.erosion.set(fillPoint, direction.id)
                 }
@@ -220,14 +220,14 @@ class WaterBasinFill extends ConcurrentFill {
 
     onFill(fill, fillPoint, parentPoint) {
         const { world, model, basinGrid } = fill.context
+        const upstream = Point.directionBetween(fillPoint, parentPoint)
+        model.erosion.set(fillPoint, upstream.id)
+        // calculate downstream directions
         Point.adjacents(fillPoint, (sidePoint, direction) => {
             if (world.surface.isWater(sidePoint)) {
                 model.directionBitmask.add(fillPoint, direction)
             }
         })
-        const upstream = Point.directionBetween(fillPoint, parentPoint)
-        // model.directionBitmask.add(parentPoint, downstream)
-        model.erosion.set(fillPoint, upstream.id)
         basinGrid.set(fillPoint, fill.id)
     }
 }

src/model/tilemap/worldmap/world/basin/type.js

@@ -2,8 +2,6 @@ import { Color } from '/src/lib/color'
 
 
 export class Basin {
-    static color = Color.fromHex('#8c8c8c')
-
     static parse(id) {
         return BASIN_MAP[id]
     }
@@ -14,7 +12,6 @@ export class ExorheicBasin extends Basin {
     static id = 0
     static name = 'Exorheic river'
     static reach = Infinity
-    static hasRivers = true
     static color = Color.fromHex('#38a378')
 }
 
@@ -23,7 +20,6 @@ export class EndorheicSeaBasin extends Basin {
     static id = 1
     static name = 'Endorheic sea'
     static reach = 1
-    static hasRivers = true
     static color = Color.fromHex('#7fc3c5')
 }
 
@@ -32,7 +28,6 @@ export class EndorheicLakeBasin extends Basin {
     static id = 2
     static name = 'Endorheic lake'
     static reach = 0
-    static hasRivers = true
     static color = Color.fromHex('#6caca1')
 }
 
@@ -41,7 +36,6 @@ export class WaterBasin extends Basin {
     static id = 3
     static name = 'Water'
     static reach = Infinity
-    static hasRivers = false
     static color = Color.fromHex('#285879')
 }
 

src/model/tilemap/worldmap/world/relief/index.js

@@ -43,7 +43,7 @@ export class ReliefLayer {
     #detectLandType(world, point) {
         const grainedNoise = world.noise.get4DGrained(this.rect, point)
         const basin = world.basin.get(point)
-        if (basin.type.hasRivers && basin.isDivide) {
+        if (basin.isDivide) {
             if (grainedNoise >= MOUNTAIN_RATIO) return Relief.MOUNTAIN
             if (grainedNoise < HILL_RATIO) return Relief.HILL
             return Relief.PLAIN

src/model/tilemap/worldmap/world/river/model.js

@@ -23,9 +23,8 @@ export function buildRiverModel(context) {
     const estuaries = new PointSet(rect)
     const riverGrid = Grid.fromRect(rect, point => {
         const basin = world.basin.get(point)
-        const isDivide = basin.type.hasRivers && basin.isDivide
         const rainsEnough = world.rain.canCreateRiver(point)
-        if (isDivide && rainsEnough) {
+        if (basin.isDivide && rainsEnough) {
             riverSources.push(point)
         }
         return null