The functions perform the same instructions either way, but this makes it far clearer (to me, at least) how rad and ang relate to each other, and what the runtime complexity of findFittest is (O(n^2) instead of the O(n) it might appear to be at first glance).
(generator.c)
- getMinCacheSize():
- Replaced integer mults/divs by powers of 2 with bit shifts.
- Fixed a bug that made the cache buffer 2 SeaLevelColumnNoises too short.
I'm kind of surprised this didn't cause segfaults.
- genBiomes():
- Now copies cache values from y=0 to higher y values when sy > 1, to match
behavior of b1.8 - 1.17.
(noise.c)
- removed sampleOctave2D().
(layers.c)
- genColumnNoise(): Now uses sampleOctaveAmp() for 2D Perlin samples.
- processColumnNoise(), sampleBlocks(), sampleBetaBiomeOneBlock(),
genBetaBiomeNoiseScaled():
- Replaced integer mults/divs and modulos by powers of 2 with left/right
bit shifts and bitwise and, respectively.
(generator.c)
- getMinCacheSize(): Allocate extra cache for Beta ocean column noise buffer
(noise.c)
- samplePerlin(): Reverted previous change, as the attempted optimization had
unintended side-effects for 1.18+ generation and had no measurable
performance improvement.
(layers.h)
- Renamed two OctaveNoise members of struct SurfaceNoiseBeta
- Added new struct SeaLevelColumnNoiseBeta
- Added headers for four new functions defined in layers.c
(layers.c)
- initSurfaceNoiseBeta(): Reflect changes to names in layers.h
- sampleBiomeNoiseBeta(): When nptype == 1, returned humidity value is now
multiplied by temperature to reflect the behavior seen in biome gen
- Added new function genColumnNoise():
Generates values used to calculate terrain noise columns and places
them in a SeaLevelColumnNoiseBeta struct pointed to by the provided
pointer.
- Added new function processColumnNoise():
Generates a partial noise column for finding the block at sea level
using data pointed to by the provided SeaLevelColumnNoiseBeta pointer
- Added new function sampleBlocks():
Using adjacent noise columns, determine whether the blocks at y=64 are
solid and place results in array pointed to by provided pointer
- Added new function sampleBetaBiomeOneBlock():
Generates new noise columns for each sampled block and skips the
diagonal traversal with cache buffer, as no noise columns data can be
re-used when scale >= 8.
- genBetaBiomeNoiseScaled():
Previous "no ocean" code is now locked behind (noOcean || scale >= 8)
condition. Calls sampleBiomeNoiseBeta() when noOcean is true, and calls
sampleBetaBiomeOneBlock() otherwise.
Else, the generated region is traversed in 4x4 block sections
corresponding to terrain noise columns. Columns are saved for re-use in
future passes in order to minimize unnecessary Perlin generation, and
region traversal is done in diagonal stripes in order to minimize extra
cache size needed (on average) for the saved noise sample buffer.
My original plan for the diagonal traversal was to store SeaLevelColumnNoise
*pointers* in the extra cache space, which would be dynamically allocated
when generated, but since extra cache space will only exceed the original
cache space when the generated area is so small that memory concerns are
trivial, this plan was abandoned in favor of storing the structs directly in
the cache. This approach also eliminates the risk of memory leaks.
Currently, with oceans, this code takes about 20 seconds to generate the
biomes for a 4096 x 4096 block region. Since this approach to ocean-finding
deals in 4x4 noise columns, scales 2-4 are still quite slow for the same
scaled region -- about 13 seconds at 1:4 scale. At higher scales, the
diagonal approach is abandoned and four new noise columns are generated for
every midpoint block that is sampled.
I made a quick test build of Cubiomes Viewer, and while the ocean-finding
code works, the regions are very slow to show up in the view window, and
changing the zoom level can cause regions to reset when zooming in both
directions. Perhaps some optimizations can be made in Cubiomes Viewer in
terms of handling cache and displaying generated biomes at different scales,
but I'm not familiar enough with that project to suggest anything specific.
I tried to cut out as much unnecessary processing as possible in my
implementation of the inherently cpu-intensive ocean-finding algorithm, but
it's certainly possible optimizations can be made in the generation code
itself.
After estimating the approximate spawn position, Cubiomes currently centers the position in the middle of the corresponding chunk and then (I'm guessing erroneously) returns the position immediately, completely skipping all of the code fine-tuning the position to the most likely block afterwards. As a result, every single spawnpoint calculated by Cubiomes (and consequently Cubiomes Viewer) is in the middle of a chunk, leading to problems such as origin spawns always returning as (8, 8) instead of (0, 0), and so on.
(biome_tree.c)
- Moved a curly brace to maintain style consistent with repo
(generator.h)
- Removed SurfaceNoiseBeta struct from Generator
(generator.c)
- applySeed(): Removed initSurfaceNoiseBeta() call
- genBiomes():
Now declares and initializes SurfaceNoiseBeta when mc <= MC_B1_7
Returns err when g->dim == DIM_END and mc < MC_1_0
(layers.c)
- biomeExists(): Added new checks for mc <= B1_7
- initSurfaceNoiseBeta(): Implemented
- New comment added to sampleBiomeNoiseBeta()
(noise.h)
- Added headers for four new functions defined in noise.c
(noise.c)
- samplePerlin(): Placed all lerps used for 3D noise but not used for 2D noise
behind a (d2 != 0) condition. I'm anticipating needing every bit of
optimization I can find to make ocean-finding practically efficient.
- added new samplePerlinOldBetaTerrain3D() function:
used to generate the octmin, octmax, and octmain noise near sea level
for the given noise column x and z. The necessity for this function will
be explained more in-depth below.
- added new initOctaveOldBetaTerrain() function:
Used to initialize the five Perlin OctaveNoise structs in
SurfaceNoiseBeta. Unlike climate noise, these are Perlin noise maps
instead of Simplex, but the existing octaveInit() cannot be used because
the starting lacunarity values are not integer powers of 2.
- added new sampleOctave2D() function:
Nearly identical to sampleOctave(), except that ay is set to -(p->b),
forcing samplePerlin()'s d2 variable to be 0, resulting in a 2D noise
sample.
- added new sampleOctaveOldBetaTerrain3D() function:
Used to sample the three 3D noisemaps in SurfaceNoiseBeta. The function
is passed a 2-element array of doubles, which is passed to
samplePerlinOldBetaTerrain3D() where the different octaves' values are
added. The only samples made are the ones necessary to determine the
blocks at sea level.
samplePerlinOldBetaTerrain3D() is necessary because when generating these
versions' overworld octmin, octmax, and octmain noise, lower levels affect
higher levels based on whether the lower 8 bits of i2 are equal to the lower
8 bits of i2 from the previous iteration. Each level is only affected by the
immediately previous level where (i2 & 255 !- previ2), so I was able to make an
optimization -- the first several y-level iterations are split into a separate
for loop that only looks at i2, and finds the highest y-level that affects the
final output at sea level. In my Java test program using Minecraft's code, this
optimization brough the time needed to produce an image of a 4096 x 4096 region
down to 1/3 of what it was before the optimization.
The yLacFlag argument determines whether or not lacunarity is cut in half for
the y dimension -- octmain uses lacunarity values for y that are half of the
x/z lacunarity value.
In a future commit, I may extend samplePerlinOldBetaTerrain3D() and
sampleOctaveOldBetaTerrain3D() to generate partial noise columns between ymin
and ymax bounds, in order to eventually implement 4x4 surface height finding.
(biome_tree.c)
- getOldBetaBiome: removed isWater argument.
(finders.c)
- getStructureConfig: now returns 0 for mineshafts and villages before B1.8.
(layers.h)
- Added SurfaceNoiseBeta struct:
Very similar to SurfaceNoise.
Since SurfaceNoiseBeta will only ever be used for the Overworld, the
double values saved in SurfaceNoise will be hardcoded into the
SurfaceNoiseBeta sampling function.
octSurf and octDepth in surfaceNoise are replaced with new octA and octB
OctaveNoises, used for precise terrain generation. These names are
subject to change if I come up with more meaningful names in the
future.
The oct array contains six additional PerlinNoise structs compared to
SurfaceNoise, as the 4-octave octSurf is replaced with the 10-octave
octA.
- Added BiomeNoiseBeta struct:
Mostly a cut-down version of BiomeNoise.
The climate array contains three OctaveNoise structs, corresponding to
the 4-octave temperature and humidity noise generators, as well as
an additional 2-octave generator that I'm calling "fuzz". The fuzz
noise is high-frequency and low-amplitude, and is used as a factor
applied to the raw output of both the temperature and humidity
generators before these values are used.
The PerlinNoise array oct contains 10 octaves -- 4 for temperature, 4 for
humidity, and 2 for fuzz.
nptype and mc are carried over from BiomeNoise. mc currently has no
purpose, but I've heard of a bug in some early beta versions causing
chunk biomes to generate rotated, so storing the version may
eventually prove useful.
- Added headers for 5 new functions in layers.c.
- Changed header for getOldBetaBiome (defined in biome_tree.c) to reflect new
signature.
(layers.c)
- Added initSurfaceNoiseBeta function: No-op placeholder for now.
- Added setBetaBiomeSeed function: Initializes the three climate simplex noise
generators and sets bnb->nptype to -1 by default.
- Added sampleBiomeNoiseBeta function:
sampleBiomeNoiseBeta samples climate noise at the given x and z
coordinates (1:1 scale) and returns a biome ID corresponding to the
biome at the generated temperature and humidity noise values.
The behavior of zeroing out the array np when it is passed is copied
from sampleBiomeNoise. I'm not sure about its function, so if it's
not applicable, this argument and associated behavior can be removed.
If bnb->nptype is set to NP_TEMPERATURE or NP_HUMIDITY, only that noise
value is generated and the other is ignored. The noise value is
multiplied by 10000 and returned as a signed long to match the
behavior of sampleBiomeNoise. Note that Beta climate values range from
0 to 1, not -1 to 1, so the resulting ints will all be nonnegative.
The argument nv (noise values) is a pointer to a 2-element array of
doubles. If it is present, the noise values are placed in the array
before the biome is determined.
- Added genBetaBiomeNoiseScaled function:
At 1:1 scale, every block in Range r is sampled and the return value of
sampleBiomeNoiseBeta is placed in the cache.
At higher scales, midpoints are sampled.
When ocean support is added, this function will likely behave
differently when NO_BETA_OCEAN is clear in order to maximize time
and memory efficiency.
(generator.h)
- Flags enum: Bit 1 (0x2) is now the NO_BETA_OCEAN flag.
- Generator struct: New union member for pre-B1.8: Includes BiomeNoiseBeta
and SurfaceNoiseBeta structs now defined in layers.h
(generator.c)
- setupGenearator:
New version so pre-B1.8 versions behave correctly.
For mc <= MC_B1_7, setupGenerator simply sets g->bnb.mc, as all other
setup for pre-B1.8 biome generation requires the seed to be known.
- applySeed:
When mc <= MC_B1_7, the new setBetaBiomeSeed function defined in layers.c
is called. If the NO_BETA_OCEAN flag is not set, initSurfaceNoiseBeta
is also called. initSurfaceNoiseBeta is currently just a no-op
placeholder.
- getMinCacheSize:
New version check.
Returns default size when mc <= MC_B1_7. Will likely be modified when
ocean-finding functionality is added.
- genBiomes: Calls genBetaBiomeNoiseScaled when mc <= MC_B1_7
Note: Compiling libcubiomes.a will will currently cause several warnings due to
unused parameters related to not-yet-implemented ocean finding.
(biome_tree.c)
- Add lookup table for pre-B1.8 biomes
- Add getOldBetaBiome function to look up biome from climate noise values
(layers.h)
- Add header for getOldBetaBiome function defined in biome_tree.c
- Fix small error from previous commit (semicolons instead of commas)
(noise.c)
- Add new octaveInitOldBetaBiome function
- Add new sampleOctaveOldBetaBiome function
(noise.h)
- Add headers for two new functions defined in noise.c
This commit adds new functions required to generate Alpha 1.2 - Beta 1.7
climate maps, as well as a lookup table for biomes.
The pre- Beta 1.8 biome system uses three 2D simplex noise maps to determine
biomes -- two 4-octave maps for temperature and humidity, and an additional
2-octave map as a source of high-frequency noise that is applied to the raw
output of both climate maps as they are mapped to the range [-1, 1] before
being used to determine the biome at each coordinate sample.
Beta 1.7.3's NoiseGeneratorOctaves2 class defines the lacunarity and
amplitude of each octave of a map in a way that seems incompatible with the
existing octaveInit function. The lacunarity of each octave is the provided
starting value multiplied by a power of a provided modifier value, starting
at modifier^0 and ending at modifier^(octcnt-1). Amplitude works similarly, but
the starting value and modifier are hardcoded. As far as I can tell, there's no
way to get the correct results using octaveInit, so a new
octaveInitOldBetaBiome is used here to initialize the octaves correctly.
Given that Cubiomes has no pre-existing function for sampling simplex
OctaveNoise, I added sampleOctaveOldBetaBiome. It works the same as
sampleOctave, except that it calls sampleSimplex2D instead of samplePerlin,
and it adds the noisemap's random values 'a' and 'b' onto ax and az
respectively in order to match Minecraft b1.7's simplex sampling algorithm.
(layers.h)
- Add MC_B1_7 to MCVersion enum
- Add name mappings for B1.7 biomes to BiomeID enum
(util.c)
- Add Beta 1.7 to mc2str and str2mc functions
- Add name mappings for B1.7 biomes to biome2str function
* fixed biomeExists() for 1.19 end dimension
* fixed biome check position for village and bastion in 1.18+
* added support for 1:256 scale of biome locator in 1.17-
expanded support for structure variants
added end city pieces generation (WIP)
added outer end voids (MC-159283)
fixed several issues with the availablity of biomes for layered generation
fixed that about half of 1.18/1.19 end gateways have wrong positions
