Ben Wallis
8ed2109bcf
Fixed suppressed clippy warnings for #587 - collapsible_if
2020-06-12 20:34:54 +01:00
Ben Wallis
950c62efc6
Suppressed all existing clippy warnings in preparation for fixes as part of #587
2020-06-10 22:01:42 +01:00
Joshua Barretto
786665eac4
Merge branch 'sharp/deterministic-civsim' into 'master'
...
Make civsim and sites deterministic.
See merge request veloren/veloren!1009
2020-05-26 19:22:48 +00:00
Joshua Yanovski
34427373ef
Make civsim and sites deterministic.
...
For anything in worldgen where you use a HashMap, *please* think
carefully about which hasher you are going to use! This is
especially true if (for some reason) you are depending on hashmap
iteration order remaining stable for some aspect of worldgen.
2020-05-21 21:43:54 +02:00
Treeco
61bcfbeeb2
Changed default map and seed, lowered site counts
2020-05-15 11:36:19 +01:00
Joshua Barretto
2a6a19f7ef
fmt
2020-04-23 18:19:42 +01:00
Joshua Barretto
01e2cd2b88
Warning cleanup
2020-04-23 18:19:42 +01:00
Joshua Barretto
8d4f1da3a6
Improved path rendering on the map, removed ugly path noise
2020-04-23 18:19:41 +01:00
Joshua Barretto
a65dbc570a
Returned to normal world size
2020-04-23 18:19:41 +01:00
Joshua Barretto
431b2ae07b
Fixed window mask layering, fmt
2020-04-23 18:19:41 +01:00
Joshua Barretto
0329b355ef
Made civsim paths visible in-game
2020-04-23 18:19:41 +01:00
Monty Marz
0fb3a115da
Add more crops
2020-04-23 18:19:41 +01:00
Joshua Barretto
3042a09dfd
Disabled warping in towns
2020-04-23 18:19:41 +01:00
Joshua Barretto
a51d214c21
Fixed path irregularities, better bridges
2020-04-23 18:19:41 +01:00
Joshua Barretto
68c5612692
Innumerable minor improvements to towns, added bridges, better paths, more house variations, etc.
2020-04-23 18:19:41 +01:00
Joshua Barretto
8499143f77
Basic town house generation
2020-04-23 18:19:40 +01:00
Joshua Barretto
b0f9ef5f30
Added skeleton house generation
2020-04-23 18:19:40 +01:00
Joshua Barretto
46190aa634
Began work on basic economic simulation
2020-04-23 18:19:40 +01:00
Joshua Barretto
348003fc1a
Better track routing for civsim
2020-04-23 18:19:40 +01:00
Joshua Barretto
c1514fc37b
Added initial civ generation
2020-04-23 18:19:40 +01:00
Joshua Barretto
41b77a9b10
Removed old settlement code, removed zcache from dependency of site generators for forward compatibility
2020-04-23 18:19:40 +01:00
Joshua Barretto
1c6a6cd6cf
Moved settlement code to site directory, removed old town generation code
2020-04-23 18:19:40 +01:00
Joshua Barretto
9dc46c490e
Better town walls, made settlements avoid rivers
2020-04-23 18:19:40 +01:00
Joshua Barretto
085a115e2b
Began work on post-generation town rendering, fixed overflow bug on large maps
2020-04-23 18:19:40 +01:00
Joshua Barretto
0021bd6452
Added new settlement generation to world, basic rendering
2020-04-23 18:19:40 +01:00
Joshua Barretto
944a37b848
Initial settlement generation work
2020-04-23 18:19:40 +01:00
Marcel Märtens
8f5e409ac4
update toolchain to
2020-02-09 22:58:01 +01:00
Monty Marz
93d7c67cdc
Hack to allow minimap rotation.
...
Currently it just always rotates towards the camera, but it wouldn't be
hard to create a config option that swaps out the rotation of the
indicator and the map.
2020-02-06 17:34:32 +00:00
Marcel Märtens
dae31ae5b6
apply new rustfmt - touching alot of files
2020-02-01 21:39:39 +01:00
Joshua Yanovski
6d5e42f10b
Better is_underwater() check.
...
Takes rivers into account somewhat, and doesn't take up extra space in
SimChunk.
2020-01-26 16:18:51 +01:00
Joshua Barretto
4f0d27690c
Patched waypoint spawning
2020-01-26 14:27:11 +00:00
Joshua Barretto
6e2784ba0e
Convert to chunk positions for downhill
2020-01-26 13:21:33 +00:00
Joshua Barretto
a4573f6fb2
Use .downhill for waypoint generation
2020-01-26 13:05:28 +00:00
Joshua Barretto
631124f3fc
Switched to _squared(), added comments, parallelised waypoint gen
2020-01-26 12:52:32 +00:00
Joshua Barretto
723b578378
Improved pet aggression system, made waypoints rarer
2020-01-26 12:52:32 +00:00
Joshua Barretto
7437c18b99
Various bug fixes
2020-01-26 12:52:32 +00:00
Joshua Barretto
8c7e96e313
Improved waypoint spawn locations, scaled down pathfinding cost
2020-01-26 12:52:32 +00:00
Joshua Yanovski
02f9c9490b
Addressing MR comments.
2020-01-24 03:45:29 +01:00
Joshua Yanovski
64d19a80e3
Make changing Alt/Compute to f32 work again.
2020-01-23 18:18:18 +01:00
Joshua Yanovski
756cc0aab4
Erosion cleanup, part 2.
...
Covers all remaining files touched by MR except
world/src/sim/erosion.rs.
2020-01-23 18:18:17 +01:00
Joshua Yanovski
55a96bce09
Minor fix to map generation.
...
Also fixes some typos and makes formatting easier for changes needed to
produce large maps.
2020-01-23 18:18:17 +01:00
Joshua Yanovski
49e7e55cd6
Fix warnings in examples and benchmarks.
2020-01-23 18:18:16 +01:00
Joshua Yanovski
1d6d0ea03d
Fix all warnings.
2020-01-23 18:18:16 +01:00
Joshua Yanovski
ccd85e8907
Fixes to enable loading (relatively) large maps.
...
With these changes, we can successfully open, map, and play maps thare
are 16x the size of a standard (1024 x 1024 chunk) map, 4x larger in
each direction.
2020-01-23 18:18:16 +01:00
Joshua Yanovski
d54f22c9fa
Add a default world map.
...
Also adds map versioning, proper scaling, and updates sediment
rendering. It also tones down warp.
2020-01-23 18:18:15 +01:00
Joshua Yanovski
1358f1dffa
Changes to worldgen, adding more sedmient etc.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
ebe0d14eab
Send client 3D rendered map.
...
Also shares configurable rendering between map generator and server.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
9ee0cd82d0
Code restructuring for performance.
...
Turned a lot of for loops into for_each loops, which should be easier
for LLVM to optimize currently. Also updated almost all the non-erosion
stuff in WorldGen to run in parallel (and take advantage of the cache,
in the case of TownGen), and hopefully improved performance somewhat for
chunk generation as well.
2020-01-23 18:18:14 +01:00
Joshua Yanovski
53ac7c0eb1
Weight flux twice as much as beforein humidity calculation.
2020-01-23 18:18:13 +01:00
Joshua Yanovski
597bb3c526
Adding many new types of geomorphic laws:
...
- soil production (currently disabled).
- debris flow erosion (combined with regular stream power law).
- flow computation using multiple receivers.
- filling strategy during drainage network calculations.
Also tweaks a variety of other aspects of erosion.
2020-01-23 18:18:12 +01:00
