203 Commits

Author SHA1 Message Date
Rogier
2e69eaeba7 Enhance progress indicator 2015-02-20 13:10:08 +01:00
Rogier
c0a62b7874 Use topmost height for a stack of only transparent nodes 2015-02-20 13:10:08 +01:00
Rogier
185bf90c4b Sanitize the code that searches for a colors.txt file 2015-02-20 13:10:08 +01:00
Rogier
4ab1728246 Fix to drawalpha darkening mode (no extra computation of t needed...) 2015-02-20 13:10:08 +01:00
Rogier
b799f2150c Fix typo in colors.txt (wrong 5th parameter for water source) 2015-02-20 13:10:08 +01:00
Rogier
d3dcf310eb Fix shading when pixels are sparse 2015-02-20 13:10:08 +01:00
Rogier
22041a8603 Add shorthand options to draw tiles matching map-blocks and map-chunks
The option --tiles has two new possible values: 'block' and 'chunk'
'block' creates tiles corresponding to map blocks
'chunk' creates tiles corresponding to map chunks
(chunks are the unit of map generation).

An option --chunksize was added to manually override the chunk size.
2015-02-20 13:10:08 +01:00
Rogier
5aa358aafe Rename some constants for clarity 2015-02-20 13:10:08 +01:00
Rogier
b71c1a3089 Print block coordinates as well in the scale
Note: on the y-axis scale, the block coordinates are rendered above
the line, instead of under the node coordinate, as that makes
them adjacent to the block they refer to.

for illustration: create a map with --drawscale --tiles=16 --tileorigin=world.
this makes the tiles correspond to the map blocks.
Consider a point with y-coordinate 64. It is part of a map-block with y=64..79.
This block is located at and above the line corresponding to y=64. On the y-axis,
it is therefore most intuitive to render the block coordinate above the line.
2015-02-20 13:10:03 +01:00
Rogier
bff6d0761d Updated Changelog 2014-06-19 15:00:24 +02:00
Rogier
743d657bef Improve the colors of water (esp. for --drawalpha) & make lava transparent.
As the best color for water depends on the rendering parameters
(i.e. the --drawalpha mode: none, average or cumulative), two
additional colors files are provided for these alternatives.
2014-06-19 13:31:53 +02:00
Rogier
b99111e038 Add a --drawalpha mode that keeps water (etc.) transparent to great depths
This new mode averages the colors of all transparent blocks, instead of
making the colors progressively darker and more opaque.

This 'average' mode is now the default when using --drawalpha. It can be
explicitly selected using --drawalpha=average. The old modes can be selected
using --drawalpha=cumulative[-darken].

It is recommended to change the colors of water as well. These are in a
separate patch.
2014-06-19 13:30:00 +02:00
Rogier
e27d181d9f Idempotent changes to PixelAttribute class (preparing for next patch) 2014-06-19 13:29:28 +02:00
Rogier
a065e68eac Make darkening of thick transparent stacks (e.g. deep water) configurable.
In order to reduce rendering surprises, this darkening is off by default
(it was on previously).
2014-06-18 21:19:14 +02:00
Rogier
9285bc586c Add package extensions to .gitignore 2014-06-18 21:18:58 +02:00
Rogier
71234c3422 Fix build for freebsd/clang - fixes #4 2014-06-18 14:01:34 +02:00
Rogier
1dcc3da212 Updated changelog with recent changes, and updated base version 2014-06-18 11:44:24 +02:00
Rogier
3ffb1dfb33 Some small changes to README.rst 2014-06-18 11:44:24 +02:00
Rogier
66122c1c2e Freeminer database coordinate format support ('a<x>,<y>,<z>') 2014-06-18 10:12:44 +02:00
Rogier
0a9a885e63 Fix to redis return value verification
(thanks to clang for reporting the issue :-)
2014-06-18 10:11:54 +02:00
Rogier
60b39e7d4b Generalize processing of air and ignore nodes 2014-06-18 10:11:11 +02:00
Rogier
f832530bf8 Allow air nodes to have a color.
As this comes with a significant performance penalty, this
feature must be enabled using the command-line option --drawair

For best results, the color of air should be fully transparent,
so that underlying nodes will override it.
2014-06-18 10:07:55 +02:00
Rogier
ced0390611 Add a default color for nodes
This is useful to show invisible ('air' or 'invalid') nodes in blocks
that are in the database using a different color than blocks that are
not in the database (which will have no color at all, causing the
background color to show).
2014-06-18 10:06:46 +02:00
Rogier
5369adb937 Interpret fully transparent node colors as default colors
(to be overridden by the color of any not-fully-transparent node beneath)

Fully transparent nodes also do not participate in shading.
2014-06-18 10:03:46 +02:00
Rogier
9b5da3ad2c Optimize generation of horizontally sparse maps
(i.e. maps with most but not all pixels in every row empty)
2014-06-18 10:03:32 +02:00
Rogier
5b9d51daa1 Improve installation and package generation; add deb and rpm
Minetestmapper can now be installed into a proper directory hierarchy
(instead of all files being dumped into /usr/local/. for instance.)

Non-hierarchical installation (or creation of a non-hierarchical archive)
is also still supported, and remains the default, for backwards compatibility.

Packaging on windows remains unchanged, due to lack of infrastructure :-)
2014-06-18 10:03:20 +02:00
Rogier
e6322f2911 Add an include directive for colors files
A colors file can now specify other colors files, from which
additional node color specifications will be read. This allows, for
instance, using system-installed colors file for most colors,
and only overriding some of its colors in a custom colors file.

As a purpose of using a custom colors file may be to leave the colors
for some nodes undefined, it is now also possible to undefine a
previously defined node color (i.e. after reading another colors file
which defines a color for the node).
2014-06-18 10:02:51 +02:00
Rogier
224c6b1df7 Add a command-line option to report which colors file is being used. 2014-06-18 09:50:41 +02:00
Rogier
b7fe1404fa Add support for system-wide colors.txt file 2014-06-10 17:41:28 +02:00
Rogier
f6adec1bf9 Configure a better version number (partly or fully auto-computed) 2014-05-26 21:31:29 +02:00
Rogier
8d3117e8d3 Fixes to CMakeLists.txt
- Continue processing if libraries are not found (so that all missing
  libraries are reported)
- Set compiler flags correctly if CMAKE_BUILD_TYPE is not set (fixes bug #0)
- Make CMAKE_BUILD_TYPE=Release the default
- Increase optimisation level for Release
2014-05-26 21:31:29 +02:00
Rogier
ace16ce575 Fix to translucency computation & improve water colors 2014-05-24 20:49:00 +02:00
Rogier
9706084e8d Remove lingering printfs... 2014-05-23 23:29:34 +02:00
Rogier
b9e82658d5 Added Changelog 2014-05-23 15:52:15 +02:00
Rogier
bacbcfc1e4 Skip comments at end of colors.txt lines as well
(and detect and report incomplete lines as well)
2014-05-23 15:52:15 +02:00
Rogier
f3c25ac729 Fix and improve configuration of tiles location 2014-05-23 13:47:41 +02:00
Rogier
bd2ff09dfb Fix computation of map size with tiles (height could be miscomputed) 2014-05-23 13:47:41 +02:00
Rogier
20163ec7a4 Fix to geometrymode option parsing code (allow empty optarg) 2014-05-23 13:47:41 +02:00
Rogier
6071a76bf2 Document --verbose=2 in README.rst 2014-05-23 13:47:41 +02:00
Rogier
736e2a8d27 Add command-line options to draw geometrical figures on the map
Supported figures are points, lines, ellipses, rectangles
and text.

The figures' locations can be specified using either world
coordinates, or map coordinates.
2014-05-23 13:47:41 +02:00
Rogier
c00cc13e6a Generalize the parsing of coordinates and geometry strings.
In preparation for future changes.

New geometry and new coordinate syntax has been added as well:

Additional node coordinate formats:
    <block>#[<node>]
    <block>.[<node>]

Additional geometry formats:
    <x1>,<y1>:<x2>,<y2>
    <x>,<y>:<w>x<h>

Also: the old geometry behavior (block granularity and map shrinking)
is now enabled only if the old geometry format is used (for compatibility)
2014-05-23 13:47:40 +02:00
Rogier
7bdea466b3 Add NodeCoord (in preparation for future changes) 2014-05-23 13:47:40 +02:00
Sfan5
febd3283da Better error reporting for LevelDB backend 2014-05-23 13:47:40 +02:00
Rogier
64bf53fc8a Close colors file after parsing 2014-05-23 13:47:40 +02:00
Rogier
6544d4de37 Catch block data parsing errors (e.g. caused by a corrupt map block)
Corrupt blocks are reported, and map generation continues. Map
generation aborts only after 100 or more corrupt map blocks.
2014-05-23 13:47:40 +02:00
Rogier
721fbfac52 Obtain database backend type from the world's world.mt file by default 2014-05-23 13:47:40 +02:00
Rogier
2fabf991ab Make sqlite backend optional (enabled by default) 2014-05-22 10:41:48 +02:00
Rogier
d707b882e8 Add redis database backend (port of sfan5's patches)
Patches included/ported:
	2553e44e8dec75d99408b56f469ff4be61c84336
	79d338a90c1a99fce9334bea5d4c296f190373fc
2014-05-22 10:41:48 +02:00
Rogier
98fa76bb6b Minor statistics fix to leveldb backend
(And a minor edit to README.rst)
2014-05-22 10:41:48 +02:00
Rogier
e097580b3e Remove colors.txt from .gitignore 2014-05-22 10:41:47 +02:00