Skip to content

Commit c24f3b0

Browse files
paramatparamat
committedNov 23, 2015
Mgfractal: Move julia set selection into formula parameter
Improve default parameters Update and improve documentation Unhide mapgen, but is still unstable
·
5.11.00.4.14
1 parent a4e3ed0 commit c24f3b0

File tree

5 files changed

+65
-50
lines changed

5 files changed

+65
-50
lines changed
 

‎builtin/settingtypes.txt

+20-16
Original file line numberDiff line numberDiff line change
@@ -970,29 +970,33 @@ mgflat_np_cave2 (Mapgen flat cave2 noise parameters) noise_params 0, 12, (128, 1
970970

971971
[***Mapgen fractal]
972972

973-
# Map generation attributes specific to Mapgen fractal.
974-
# The 'julia' flag results in the corresponding julia set being generated.
975-
# Flags that are not specified in the flag string are not modified from the default.
976-
# Flags starting with "no" are used to explicitly disable them.
977-
mgfractal_spflags (Mapgen fractal flags) flags nojulia julia,nojulia
978-
979-
# Choice of 4 mandelbrot set variations.
980-
# 1 = 4D "Roundy" mandelbrot set, 2 = 4D "Squarry" mandelbrot set,
981-
# 3 = 4D "Mandy Cousin" mandelbrot set, 4 = 4D mandelbrot set variation.
982-
mgfractal_formula (Mapgen fractal formula) int 1 1 4
973+
# Choice of 8 4-dimensional fractals.
974+
# 1 = "Roundy" mandelbrot set.
975+
# 2 = "Roundy" julia set.
976+
# 3 = "Squarry" mandelbrot set.
977+
# 4 = "Squarry" julia set.
978+
# 5 = "Mandy Cousin" mandelbrot set.
979+
# 6 = "Mandy Cousin" julia set.
980+
# 7 = "Variation" mandelbrot set.
981+
# 8 = "Variation" julia set.
982+
mgfractal_formula (Mapgen fractal formula) int 1 1 8
983983

984984
# Iterations of the recursive function.
985985
# Controls scale of finest detail.
986-
mgfractal_iterations (Mapgen fractal iterations) int 9
986+
mgfractal_iterations (Mapgen fractal iterations) int 11
987987

988-
# Approximate (X,Y,Z) scales in nodes.
989-
mgfractal_scale (Mapgen fractal scale) v3f (1024.0, 256.0, 1024.0)
988+
# Approximate (X,Y,Z) scale of fractal in nodes.
989+
mgfractal_scale (Mapgen fractal scale) v3f (4096.0, 1024.0, 4096.0)
990990

991-
# (X,Y,Z) offsets from world centre.
992-
# Range roughly -2 to 2, multiply by 'scale' for offsets in nodes.
993-
mgfractal_offset (Mapgen fractal offset) v3f (1.75, 0.0, 0.0)
991+
# (X,Y,Z) offset of fractal from world centre.
992+
# Used to move a suitable spawn area of low land close to (0, 0).
993+
# The default is suitable for mandelbrot sets, it needs to be edited for julia sets,
994+
# do this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0).
995+
# Range roughly -2 to 2. Multiply by 'scale' for offset in nodes.
996+
mgfractal_offset (Mapgen fractal offset) v3f (1.79, 0.0, 0.0)
994997

995998
# W co-ordinate of the generated 3D slice of the 4D shape.
999+
# Alters the generated 3D shape.
9961000
# Range roughly -2 to 2.
9971001
mgfractal_slice_w (Mapgen fractal slice w) float 0.0
9981002

‎minetest.conf.example

+32-17
Original file line numberDiff line numberDiff line change
@@ -1234,44 +1234,59 @@
12341234

12351235
#### Mapgen fractal
12361236

1237-
# Map generation attributes specific to Mapgen fractal.
1238-
# The 'julia' flag results in the corresponding julia set being generated.
1239-
# Flags that are not specified in the flag string are not modified from the default.
1240-
# Flags starting with "no" are used to explicitly disable them.
1241-
# type: flags possible values: julia, nojulia
1242-
# mgfractal_spflags = nojulia
1243-
1244-
# Choice of 4 mandelbrot set variations.
1245-
# 1 = 4D "Roundy" mandelbrot set, 2 = 4D "Squarry" mandelbrot set,
1246-
# 3 = 4D "Mandy Cousin" mandelbrot set, 4 = 4D mandelbrot set variation.
1237+
# Choice of 8 4-dimensional fractals.
1238+
# 1 = "Roundy" mandelbrot set.
1239+
# 2 = "Roundy" julia set.
1240+
# 3 = "Squarry" mandelbrot set.
1241+
# 4 = "Squarry" julia set.
1242+
# 5 = "Mandy Cousin" mandelbrot set.
1243+
# 6 = "Mandy Cousin" julia set.
1244+
# 7 = "Variation" mandelbrot set.
1245+
# 8 = "Variation" julia set.
12471246
# type: int
12481247
# mgfractal_formula = 1
12491248

12501249
# Iterations of the recursive function.
12511250
# Controls scale of finest detail.
12521251
# type: int
1253-
# mgfractal_iterations = 9
1252+
# mgfractal_iterations = 11
12541253

1255-
# Approximate (X,Y,Z) scales in nodes.
1254+
# Approximate (X,Y,Z) scale of fractal in nodes.
12561255
# type: v3f
1257-
# mgfractal_scale = (1024.0, 256.0, 1024.0)
1256+
# mgfractal_scale = (4096.0, 1024.0, 4096.0)
12581257

1259-
# (X,Y,Z) offsets from world centre.
1260-
# Range roughly -2 to 2, multiply by 'scale' for offsets in nodes.
1258+
# (X,Y,Z) offset of fractal from world centre.
1259+
# Used to move a suitable spawn area of low land close to (0, 0).
1260+
# The default is suitable for mandelbrot sets, it needs to be edited for julia sets,
1261+
# do this by greatly reducing 'scale' and setting 'offset' initially to (0, 0, 0).
1262+
# Range roughly -2 to 2. Multiply by 'scale' for offset in nodes.
12611263
# type: v3f
1262-
# mgfractal_offset = (1.75, 0.0, 0.0)
1264+
# mgfractal_offset = (1.79, 0.0, 0.0)
12631265

12641266
# W co-ordinate of the generated 3D slice of the 4D shape.
1267+
# Alters the generated 3D shape.
12651268
# Range roughly -2 to 2.
12661269
# type: float
12671270
# mgfractal_slice_w = 0.0
12681271

1269-
# Julia set only: 4 values determining the 4D shape.
1272+
# Julia set only: X value determining the 4D shape.
12701273
# Range roughly -2 to 2.
12711274
# type: float
12721275
# mgfractal_julia_x = 0.33
1276+
1277+
# Julia set only: Y value determining the 4D shape.
1278+
# Range roughly -2 to 2.
1279+
# type: float
12731280
# mgfractal_julia_y = 0.33
1281+
1282+
# Julia set only: Z value determining the 4D shape.
1283+
# Range roughly -2 to 2.
1284+
# type: float
12741285
# mgfractal_julia_z = 0.33
1286+
1287+
# Julia set only: W value determining the 4D shape.
1288+
# Range roughly -2 to 2.
1289+
# type: float
12751290
# mgfractal_julia_w = 0.33
12761291

12771292
# type: noise_params

‎src/emerge.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ MapgenDesc g_reg_mapgens[] = {
107107
{"v6", new MapgenFactoryV6, true},
108108
{"v7", new MapgenFactoryV7, true},
109109
{"flat", new MapgenFactoryFlat, false},
110-
{"fractal", new MapgenFactoryFractal, false},
110+
{"fractal", new MapgenFactoryFractal, true},
111111
{"singlenode", new MapgenFactorySinglenode, false},
112112
};
113113

‎src/mapgen_fractal.cpp

+12-13
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2828
#include "content_sao.h"
2929
#include "nodedef.h"
3030
#include "voxelalgorithms.h"
31-
#include "profiler.h" // For TimeTaker
31+
//#include "profiler.h" // For TimeTaker
3232
#include "settings.h" // For g_settings
3333
#include "emerge.h"
3434
#include "dungeongen.h"
@@ -41,7 +41,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
4141

4242

4343
FlagDesc flagdesc_mapgen_fractal[] = {
44-
{"julia", MGFRACTAL_JULIA},
4544
{NULL, 0}
4645
};
4746

@@ -143,9 +142,9 @@ MapgenFractalParams::MapgenFractalParams()
143142
spflags = 0;
144143

145144
formula = 1;
146-
iterations = 9;
147-
scale = v3f(1024.0, 256.0, 1024.0);
148-
offset = v3f(1.75, 0.0, 0.0);
145+
iterations = 11;
146+
scale = v3f(4096.0, 1024.0, 4096.0);
147+
offset = v3f(1.79, 0.0, 0.0);
149148
slice_w = 0.0;
150149

151150
julia_x = 0.33;
@@ -236,7 +235,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
236235
this->generating = true;
237236
this->vm = data->vmanip;
238237
this->ndef = data->nodedef;
239-
TimeTaker t("makeChunk");
238+
//TimeTaker t("makeChunk");
240239

241240
v3s16 blockpos_min = data->blockpos_min;
242241
v3s16 blockpos_max = data->blockpos_max;
@@ -319,7 +318,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
319318
// Sprinkle some dust on top after everything else was generated
320319
dustTopNodes();
321320

322-
printf("makeChunk: %dms\n", t.stop());
321+
//printf("makeChunk: %dms\n", t.stop());
323322

324323
updateLiquid(&data->transforming_liquid, full_node_min, full_node_max);
325324

@@ -369,7 +368,7 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z)
369368
{
370369
float cx, cy, cz, cw, ox, oy, oz, ow;
371370

372-
if (spflags & MGFRACTAL_JULIA) { // Julia set
371+
if (formula % 2 == 0) { // Julia sets, formula = 2, 4, 6, 8
373372
cx = julia_x;
374373
cy = julia_y;
375374
cz = julia_z;
@@ -378,7 +377,7 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z)
378377
oy = (float)y / scale.Y - offset.Y;
379378
oz = (float)z / scale.Z - offset.Z;
380379
ow = slice_w;
381-
} else { // Mandelbrot set
380+
} else { // Mandelbrot sets, formula = 1, 3, 5, 7
382381
cx = (float)x / scale.X - offset.X;
383382
cy = (float)y / scale.Y - offset.Y;
384383
cz = (float)z / scale.Z - offset.Z;
@@ -395,22 +394,22 @@ bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z)
395394
float nz = 0.0f;
396395
float nw = 0.0f;
397396

398-
if (formula == 1) { // 4D "Roundy" Mandelbrot Set
397+
if (formula == 1 || formula == 2) { // 4D "Roundy" Mandelbrot/Julia Set
399398
nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
400399
ny = 2.0f * (ox * oy + oz * ow) + cy;
401400
nz = 2.0f * (ox * oz + oy * ow) + cz;
402401
nw = 2.0f * (ox * ow + oy * oz) + cw;
403-
} else if (formula == 2) { // 4D "Squarry" Mandelbrot Set
402+
} else if (formula == 3 || formula == 4) { // 4D "Squarry" Mandelbrot/Julia Set
404403
nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
405404
ny = 2.0f * (ox * oy + oz * ow) + cy;
406405
nz = 2.0f * (ox * oz + oy * ow) + cz;
407406
nw = 2.0f * (ox * ow - oy * oz) + cw;
408-
} else if (formula == 3) { // 4D "Mandy Cousin" Mandelbrot Set
407+
} else if (formula == 5 || formula == 6) { // 4D "Mandy Cousin" Mandelbrot/Julia Set
409408
nx = ox * ox - oy * oy - oz * oz + ow * ow + cx;
410409
ny = 2.0f * (ox * oy + oz * ow) + cy;
411410
nz = 2.0f * (ox * oz + oy * ow) + cz;
412411
nw = 2.0f * (ox * ow + oy * oz) + cw;
413-
} else if (formula == 4) { // 4D Mandelbrot Set Variation
412+
} else if (formula == 7 || formula == 8) { // 4D "Variation" Mandelbrot/Julia Set
414413
nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
415414
ny = 2.0f * (ox * oy + oz * ow) + cy;
416415
nz = 2.0f * (ox * oz - oy * ow) + cz;

‎src/mapgen_fractal.h

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2525

2626
#define MGFRACTAL_LARGE_CAVE_DEPTH -33
2727

28-
/////////////////// Mapgen Fractal flags
29-
#define MGFRACTAL_JULIA 0x01
30-
3128
class BiomeManager;
3229

3330
extern FlagDesc flagdesc_mapgen_fractal[];

0 commit comments

Comments
 (0)
Please sign in to comment.