Mgv7, mgflat, mgfractal: Tunnel generation code optimisation

[dragonfireclient.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index f5dc4ff2b80975bc03f9fdbdb44cb0baff1e48a1..9fdecf5924045cd8c9ec2b9b450f7016ec11cd95 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 paramat, Matt Gregory
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -58,7 +59,7 @@ class MapgenV7 : public Mapgen {
        BiomeManager *bmgr;
 
        int ystride;
-       int zstride;
+       int zstride_1d;
        u32 spflags;
 
        v3s16 node_min;
@@ -82,48 +83,47 @@ class MapgenV7 : public Mapgen {
 
        Noise *noise_heat;
        Noise *noise_humidity;
+       Noise *noise_heat_blend;
+       Noise *noise_humidity_blend;
 
        content_t c_stone;
-       content_t c_dirt;
-       content_t c_dirt_with_grass;
-       content_t c_sand;
        content_t c_water_source;
        content_t c_lava_source;
+       content_t c_desert_stone;
        content_t c_ice;
-       content_t c_gravel;
+       content_t c_sandstone;
+
        content_t c_cobble;
-       content_t c_desert_sand;
-       content_t c_desert_stone;
-       content_t c_mossycobble;
-       content_t c_sandbrick;
        content_t c_stair_cobble;
-       content_t c_stair_sandstone;
+       content_t c_mossycobble;
+       content_t c_sandstonebrick;
+       content_t c_stair_sandstonebrick;
 
        MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
        ~MapgenV7();
 
        virtual void makeChunk(BlockMakeData *data);
-       int getGroundLevelAtPoint(v2s16 p);
+       int getSpawnLevelAtPoint(v2s16 p);
        Biome *getBiomeAtPoint(v3s16 p);
 
-       float baseTerrainLevelAtPoint(int x, int z);
+       float baseTerrainLevelAtPoint(s16 x, s16 z);
        float baseTerrainLevelFromMap(int index);
-       bool getMountainTerrainAtPoint(int x, int y, int z);
-       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y);
+       bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
+       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
 
        void calculateNoise();
 
        virtual int generateTerrain();
-       int generateBaseTerrain();
-       int generateMountainTerrain(int ymax);
+       void generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y);
+       int generateMountainTerrain(s16 ymax);
        void generateRidgeTerrain();
 
-       bool generateBiomes(float *heat_map, float *humidity_map);
+       MgStoneType generateBiomes(float *heat_map, float *humidity_map);
        void dustTopNodes();
 
        //void addTopNodes();
 
-       void generateCaves(int max_stone_y);
+       void generateCaves(s16 max_stone_y);
 };
 
 struct MapgenFactoryV7 : public MapgenFactory {