feat: multi species support #2

aresrpg · Jun 20, 2024 · c791100 · c791100
1 parent d4317e1
commit c791100
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/procgen/BlocksMapping.ts b/src/procgen/BlocksMapping.ts
@@ -13,6 +13,7 @@ export enum BlockType {
   WATER,
   TREE_TRUNK,
   TREE_FOLIAGE,
+  TREE_FOLIAGE_2,
   SAND,
   GRASS,
   MUD,

diff --git a/src/procgen/Vegetation.ts b/src/procgen/Vegetation.ts
@@ -66,8 +66,8 @@ export class Vegetation {
         treeBuffer = new Array(count).fill(BlockType.NONE)
         // tree foliage
         for (let y = -treeRadius; y < treeRadius; y++) {
-          const isFoliage = TreeGenerators[treeType](xzProj, y, treeRadius)//TreeGenerator.AppleTree(xzProj, y, treeRadius)
-          treeBuffer.push(isFoliage ? BlockType.TREE_FOLIAGE : BlockType.NONE)
+          const blockType = TreeGenerators[treeType](xzProj, y, treeRadius)//TreeGenerator.AppleTree(xzProj, y, treeRadius)
+          treeBuffer.push(blockType)
         }
       } else {
         try {

diff --git a/src/tools/TreeGenerator.ts b/src/tools/TreeGenerator.ts
@@ -1,4 +1,6 @@
-export type TreeGenerator = (xzProj: number, y: number, range: number) => Boolean
+import { BlockType } from "../index"
+
+export type TreeGenerator = (xzProj: number, y: number, range: number) => BlockType
 
 export enum TreeType {
     PineTree = 'pine_tree',
@@ -8,13 +10,13 @@ export enum TreeType {
 const AppleTree = (xzProj: number, y: number, range: number) => {
     const dist = Math.sqrt(Math.pow(xzProj, 2) + Math.pow(y, 2))
     const isFoliage = dist <= range
-    return isFoliage
+    return isFoliage? BlockType.TREE_FOLIAGE: BlockType.NONE
 }
 
 const PineTree = (xzProj: number, y: number, range: number) => {
     const dist = xzProj // xzProj*(y+radius)
     const isFoliage = dist <= range * (1 - 0.35 * (y + range) / range)
-    return isFoliage
+    return isFoliage? BlockType.TREE_FOLIAGE_2: BlockType.NONE
 }
 
 export const TreeGenerators: Record<TreeType, TreeGenerator> = {