Commit Graph

83 Commits

Author SHA1 Message Date
Joshua Barretto
a432cef263 Better colour correction 2019-09-26 00:15:07 +01:00
Acrimon
1dfbe40731 Made the worldgen noise generators seed from the RNG and got rid of zerocopy. 2019-09-17 16:05:08 +02:00
haslersn
1796c09ca1 common: Rework volume API
See the doc comments in `common/src/vol.rs` for more information on
the API itself.

The changes include:

* Consistent `Err`/`Error` naming.
  * Types are named `...Error`.
  * `enum` variants are named `...Err`.
* Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation
  to an upcoming change where a “map” in the game related sense will
  be added.
* Add volume iterators. There are two types of them:
  * _Position_ iterators obtained from the trait `IntoPosIterator`
    using the method
    `fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `Vec3<i32>`.
  * _Volume_ iterators obtained from the trait `IntoVolIterator`
    using the method
    `fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `(Vec3<i32>, &Self::Vox)`.
  Those traits will usually be implemented by references to volume
  types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some
  type which usually implements several volume traits, such as `Chunk`).
  * _Position_ iterators iterate over the positions valid for that
    volume.
  * _Volume_ iterators do the same but return not only the position
    but also the voxel at that position, in each iteration.
* Introduce trait `RectSizedVol` for the use case which we have with
  `Chonk`: A `Chonk` is sized only in x and y direction.
* Introduce traits `RasterableVol`, `RectRasterableVol`
  * `RasterableVol` represents a volume that is compile-time sized and has
    its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen
    because such a volume can be used with `VolGrid3d`.
  * `RectRasterableVol` represents a volume that is compile-time sized at
    least in x and y direction and has its lower bound at `(0, 0, z)`.
    There's no requirement on he lower bound or size in z direction.
    The name `RectRasterableVol` was chosen because such a volume can be
    used with `VolGrid2d`.
2019-09-06 15:43:31 +02:00
Imbris
52d84248ec Remove all warnings 2019-09-04 19:03:49 -04:00
Joshua Barretto
1176fc4d07 Better loading times 2019-08-31 11:44:52 +01:00
Joshua Barretto
5a677b9c1e Added modular building generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
f8c5b277e3 Improved mountain slopes and cliffs 2019-08-31 11:44:52 +01:00
Joshua Barretto
fe2ad92201 Initial implementation of towns 2019-08-31 11:44:52 +01:00
Joshua Barretto
d42485238e Added town road construction 2019-08-31 11:44:52 +01:00
Joshua Barretto
b0293ecce4 Switched to FastNoise 2019-08-31 11:44:52 +01:00
Joshua Barretto
4777921680 Added test generator 2019-08-31 11:44:52 +01:00
Joshua Barretto
75f5419571 Removed dryness 2019-08-31 11:44:52 +01:00
Joshua Yanovski
c02f2a7f9e Fixes to worldgen and adding a debug command.
Humidity and temperature are now indexed to uniform altitude *over land
chunks* (and water chunks adjacent to land) rather than over the whole
range of altitude.  This is necessary in order to satisfy the uniformity
conditions of the formula for weighted sum CDF.

Additionally, fixes the computation of whether a tree should be
generated or not.  Previously, it was using a source of randomness
scaled to use much less than the full 0-1 range; this has been resolved.
This makes for much nicer and more gradual transitions between densities
and reduces the amount of completely barren landscapes, while also
making forests larger.

Finally, this commit adds a server command, debug_column, which returns
some useful debug information about a column given an x and y
coordinate.  This is useful for debugging worldgen.
2019-08-26 11:52:25 +02:00
Joshua Yanovski
958a40b8c0 Fix clean code lints. 2019-08-25 18:17:51 +02:00
Joshua Yanovski
6f12a240de Chaos doesn't depend on temperature anymore.
Also fix some things to use a consistent coordinate system and bump up
tree density and variation around tree density in hopes of creating more
aesthetically pleasing jungles.  However, this does change worldgen a
bit, so please make sure you look through it before merging.
2019-08-25 17:49:33 +02:00
jshipsey
f02b571f7f fmt 2019-08-24 15:32:07 -04:00
Joshua Yanovski
25a02ae6e0 Make humidity ignore ocean chunks. 2019-08-24 21:13:32 +02:00
Joshua Barretto
0db797744b Better snow noise 2019-08-23 00:31:27 +01:00
Joshua Yanovski
398c18359d Addressing concerns, for real. 2019-08-23 00:57:42 +02:00
Joshua Yanovski
2ff192021c Addressing PR issues. 2019-08-22 23:48:13 +02:00
Joshua Barretto
ba1a146cd5 Better snow, colours, more chaos 2019-08-22 22:25:17 +01:00
Joshua Yanovski
dbeec66b2d Total chaos. 2019-08-22 21:03:42 +02:00
Joshua Yanovski
5caed42e4f Fix density computation. 2019-08-22 17:45:47 +02:00
Joshua Yanovski
139933194c Restore old chaos. 2019-08-22 01:01:13 +02:00
Joshua Yanovski
d174dd99b4 Fixing a few visual issues. 2019-08-21 23:36:43 +02:00
Joshua Yanovski
91ea62a5c9 Get rid of extraneous things. 2019-08-21 20:48:51 +02:00
Joshua Yanovski
05d501632e Fixing jungle. 2019-08-21 20:41:32 +02:00
Joshua Yanovski
8c644e2bb1 Distribution "fun." 2019-08-20 22:48:22 +02:00
Joshua Yanovski
5919f63516 Fixing visual issues. 2019-08-19 19:20:54 +02:00
Joshua Yanovski
fa35f9932e Smoothed some things out. 2019-08-19 05:22:39 +02:00
Joshua Yanovski
1c9be67516 Billow tweaks. 2019-08-19 03:41:32 +02:00
Joshua Yanovski
c5ffb232d4 Fixing some colors. 2019-08-19 03:01:11 +02:00
Joshua Yanovski
d8c864cf3a Making jungles work. 2019-08-19 01:52:26 +02:00
Joshua Yanovski
680b81a5e6 WIP for humidity. 2019-08-18 18:35:27 +02:00
Acrimon
09525bf964 Cleaner solution. 2019-08-19 00:46:24 +02:00
Acrimon
f8d14bdfd5 Ran fmt. 2019-08-19 00:20:56 +02:00
Acrimon
6b59f0bc9a Fixed seed expansion for noise seeding. 2019-08-19 00:19:51 +02:00
Acrimon
51a4e358dd Formatted code. 2019-08-11 13:37:04 +02:00
Acrimon
7b8a7a410d Cleaned up seed generation in worldsim. 2019-08-11 13:37:04 +02:00
Acrimon
00b5a4a58e Greatly simplified seed expansion. 2019-08-11 13:37:04 +02:00
Acrimon
393ac4610c Improved worldgen seed expansion 2019-08-11 13:36:14 +02:00
Acrimon
a5b19935a2 Use named generator in worldgen. 2019-07-30 16:10:59 +02:00
Acrimon
ee49ebe807 Update rand, log and scan_fmt 2019-07-29 13:42:26 +00:00
Joshua Barretto
09717f1c56 Added pyramids 2019-07-10 00:51:54 +01:00
Joshua Barretto
92d4b4dfbe Smoothed world borders 2019-07-09 21:42:27 +01:00
Joshua Barretto
fa28c8a6c6 Made cliff detection more tolerant 2019-07-09 00:31:43 +01:00
Joshua Barretto
cfdb0209bd Better savannah colours 2019-07-09 00:09:04 +01:00
Joshua Barretto
d79f7d9714 Colour improvements 2019-07-08 22:10:48 +01:00
Joshua Barretto
8e8bad137a Re-added oceans 2019-07-08 20:08:08 +01:00
Joshua Barretto
14ba09f96b Added acacia trees, desert bones, fixed minor worldgen issues 2019-07-08 17:41:20 +01:00