Skip to content

Commit c8fd232

Browse files
kwolekrkwolekr
committedMay 28, 2016
Dungeongen: Remove dependency on Mapgen
1 parent fd0efb2 commit c8fd232

File tree

4 files changed

+45
-24
lines changed

4 files changed

+45
-24
lines changed
 

Diff for: ‎src/dungeongen.cpp

+23-14
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,27 @@ NoiseParams nparams_dungeon_density(0.0, 1.0, v3f(2.5, 2.5, 2.5), 0, 2, 1.4, 2.0
3838
///////////////////////////////////////////////////////////////////////////////
3939

4040

41-
DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams)
41+
DungeonGen::DungeonGen(INodeDefManager *ndef,
42+
GenerateNotifier *gennotify, DungeonParams *dparams)
4243
{
43-
this->mg = mapgen;
44-
this->vm = mapgen->vm;
44+
assert(ndef);
45+
46+
this->ndef = ndef;
47+
this->gennotify = gennotify;
4548

4649
#ifdef DGEN_USE_TORCHES
47-
c_torch = mg->ndef->getId("default:torch");
50+
c_torch = ndef->getId("default:torch");
4851
#endif
4952

5053
if (dparams) {
5154
memcpy(&dp, dparams, sizeof(dp));
5255
} else {
53-
dp.c_water = mg->ndef->getId("mapgen_water_source");
54-
dp.c_cobble = mg->ndef->getId("mapgen_cobble");
55-
dp.c_moss = mg->ndef->getId("mapgen_mossycobble");
56-
dp.c_stair = mg->ndef->getId("mapgen_stair_cobble");
56+
dp.seed = 0;
57+
58+
dp.c_water = ndef->getId("mapgen_water_source");
59+
dp.c_cobble = ndef->getId("mapgen_cobble");
60+
dp.c_moss = ndef->getId("mapgen_mossycobble");
61+
dp.c_stair = ndef->getId("mapgen_stair_cobble");
5762

5863
dp.diagonal_dirs = false;
5964
dp.mossratio = 3.0;
@@ -67,18 +72,21 @@ DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams)
6772
}
6873

6974
// For mapgens using river water
70-
dp.c_river_water = mg->ndef->getId("mapgen_river_water_source");
75+
dp.c_river_water = ndef->getId("mapgen_river_water_source");
7176
if (dp.c_river_water == CONTENT_IGNORE)
72-
dp.c_river_water = mg->ndef->getId("mapgen_water_source");
77+
dp.c_river_water = ndef->getId("mapgen_water_source");
7378
}
7479

7580

76-
void DungeonGen::generate(u32 bseed, v3s16 nmin, v3s16 nmax)
81+
void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
7782
{
83+
assert(vm);
84+
7885
//TimeTaker t("gen dungeons");
79-
if (NoisePerlin3D(&dp.np_rarity, nmin.X, nmin.Y, nmin.Z, mg->seed) < 0.2)
86+
if (NoisePerlin3D(&dp.np_rarity, nmin.X, nmin.Y, nmin.Z, dp.seed) < 0.2)
8087
return;
8188

89+
this->vm = vm;
8290
this->blockseed = bseed;
8391
random.seed(bseed + 2);
8492

@@ -109,7 +117,7 @@ void DungeonGen::generate(u32 bseed, v3s16 nmin, v3s16 nmax)
109117
u32 i = vm->m_area.index(nmin.X, y, z);
110118
for (s16 x = nmin.X; x <= nmax.X; x++) {
111119
if (vm->m_data[i].getContent() == dp.c_cobble) {
112-
float wetness = NoisePerlin3D(&dp.np_wetness, x, y, z, mg->seed);
120+
float wetness = NoisePerlin3D(&dp.np_wetness, x, y, z, dp.seed);
113121
float density = NoisePerlin3D(&dp.np_density, x, y, z, blockseed);
114122
if (density < wetness / dp.mossratio)
115123
vm->m_data[i].setContent(dp.c_moss);
@@ -187,7 +195,8 @@ void DungeonGen::makeDungeon(v3s16 start_padding)
187195
makeRoom(roomsize, roomplace);
188196

189197
v3s16 room_center = roomplace + v3s16(roomsize.X / 2, 1, roomsize.Z / 2);
190-
mg->gennotify.addEvent(dp.notifytype, room_center);
198+
if (gennotify)
199+
gennotify->addEvent(dp.notifytype, room_center);
191200

192201
#ifdef DGEN_USE_TORCHES
193202
// Place torch at room center (for testing)

Diff for: ‎src/dungeongen.h

+13-6
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ int dir_to_facedir(v3s16 d);
3939

4040

4141
struct DungeonParams {
42+
int seed;
43+
4244
content_t c_water;
4345
content_t c_river_water;
4446
content_t c_cobble;
@@ -59,25 +61,30 @@ struct DungeonParams {
5961
class DungeonGen {
6062
public:
6163
MMVManip *vm;
62-
Mapgen *mg;
64+
INodeDefManager *ndef;
65+
GenerateNotifier *gennotify;
66+
6367
u32 blockseed;
6468
PseudoRandom random;
6569
v3s16 csize;
6670

6771
content_t c_torch;
6872
DungeonParams dp;
6973

70-
//RoomWalker
74+
// RoomWalker
7175
v3s16 m_pos;
7276
v3s16 m_dir;
7377

74-
DungeonGen(Mapgen *mg, DungeonParams *dparams);
75-
void generate(u32 bseed, v3s16 full_node_min, v3s16 full_node_max);
78+
DungeonGen(INodeDefManager *ndef,
79+
GenerateNotifier *gennotify, DungeonParams *dparams);
80+
81+
void generate(MMVManip *vm, u32 bseed,
82+
v3s16 full_node_min, v3s16 full_node_max);
7683

7784
void makeDungeon(v3s16 start_padding);
7885
void makeRoom(v3s16 roomsize, v3s16 roomplace);
7986
void makeCorridor(v3s16 doorplace, v3s16 doordir,
80-
v3s16 &result_place, v3s16 &result_dir);
87+
v3s16 &result_place, v3s16 &result_dir);
8188
void makeDoor(v3s16 doorplace, v3s16 doordir);
8289
void makeFill(v3s16 place, v3s16 size, u8 avoid_flags, MapNode n, u8 or_flags);
8390
void makeHole(v3s16 place);
@@ -86,7 +93,7 @@ class DungeonGen {
8693
bool findPlaceForRoomDoor(v3s16 roomsize, v3s16 &result_doorplace,
8794
v3s16 &result_doordir, v3s16 &result_roomplace);
8895

89-
void randomizeDir()
96+
inline void randomizeDir()
9097
{
9198
m_dir = rand_ortho_dir(random, dp.diagonal_dirs);
9299
}

Diff for: ‎src/mapgen.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -639,10 +639,13 @@ void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
639639

640640
DungeonParams dp;
641641

642+
dp.seed = seed;
643+
642644
dp.np_rarity = nparams_dungeon_rarity;
643645
dp.np_density = nparams_dungeon_density;
644646
dp.np_wetness = nparams_dungeon_wetness;
645647
dp.c_water = c_water_source;
648+
646649
switch (stone_type) {
647650
default:
648651
case MGSTONE_STONE:
@@ -680,8 +683,8 @@ void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
680683
break;
681684
}
682685

683-
DungeonGen dgen(this, &dp);
684-
dgen.generate(blockseed, full_node_min, full_node_max);
686+
DungeonGen dgen(ndef, &gennotify, &dp);
687+
dgen.generate(vm, blockseed, full_node_min, full_node_max);
685688
}
686689

687690

Diff for: ‎src/mapgen_v6.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@ void MapgenV6::makeChunk(BlockMakeData *data)
559559
if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
560560
DungeonParams dp;
561561

562+
dp.seed = seed;
563+
562564
dp.np_rarity = nparams_dungeon_rarity;
563565
dp.np_density = nparams_dungeon_density;
564566
dp.np_wetness = nparams_dungeon_wetness;
@@ -585,8 +587,8 @@ void MapgenV6::makeChunk(BlockMakeData *data)
585587
dp.notifytype = GENNOTIFY_DUNGEON;
586588
}
587589

588-
DungeonGen dgen(this, &dp);
589-
dgen.generate(blockseed, full_node_min, full_node_max);
590+
DungeonGen dgen(ndef, &gennotify, &dp);
591+
dgen.generate(vm, blockseed, full_node_min, full_node_max);
590592
}
591593

592594
// Add top and bottom side of water to transforming_liquid queue

0 commit comments

Comments
 (0)