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.
master
Rogier 2014-06-19 11:47:49 +02:00
parent b99111e038
commit 743d657bef
5 changed files with 37 additions and 6 deletions

View File

@ -296,6 +296,8 @@ if(WIN32)
install(FILES ${META_FILES} DESTINATION ".")
install(FILES "colors.txt" DESTINATION ".")
install(FILES "colors-average-alpha.txt" DESTINATION ".")
install(FILES "colors-cumulative-alpha.txt" DESTINATION ".")
install(PROGRAMS "${PROJECT_BINARY_DIR}/minetestmapper.exe" DESTINATION ".")
elseif(CREATE_FLAT_PACKAGE)
@ -316,6 +318,8 @@ elseif(CREATE_FLAT_PACKAGE)
install(FILES ${META_FILES} DESTINATION ".")
install(FILES "colors.txt" DESTINATION ".")
install(FILES "colors-average-alpha.txt" DESTINATION ".")
install(FILES "colors-cumulative-alpha.txt" DESTINATION ".")
install(PROGRAMS "${PROJECT_BINARY_DIR}/minetestmapper" DESTINATION ".")
else(WIN32)
@ -348,6 +352,8 @@ else(WIN32)
install(FILES ${META_FILES} DESTINATION "share/doc/${PROJECT_NAME}" COMPONENT mapper)
install(FILES colors.txt DESTINATION "share/games/${PROJECT_NAME}" COMPONENT mapper)
install(FILES colors-average-alpha.txt DESTINATION "share/games/${PROJECT_NAME}" COMPONENT mapper)
install(FILES colors-cumulative-alpha.txt DESTINATION "share/games/${PROJECT_NAME}" COMPONENT mapper)
install(TARGETS minetestmapper RUNTIME DESTINATION bin COMPONENT mapper)
if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")

View File

@ -213,6 +213,9 @@ drawalpha[=cumulative|cumulative-darken|average|none]:
average: 49 82 132 192 224 (look also good with alpha disabled)
Custom colors files are provided for these alternatives: colors-average-alpha.txt
and colors-cumulative-alpha.txt
drawair:
Draw air blocks. `--drawair`

11
colors-average-alpha.txt Normal file
View File

@ -0,0 +1,11 @@
# The colors in this file are specially recommended for --drawalpha=average
@include colors.txt
# Colors for use without --drawalpha.
default:water_source 49 82 132
default:water_flowing 49 82 132
default:water_source 49 82 132 192 224
default:water_flowing 49 82 132 192 224

View File

@ -0,0 +1,11 @@
# The colors in this file are specially recommended for --drawalpha=cumulative*
@include colors.txt
# Colors for use without --drawalpha.
default:water_source 49 82 132
default:water_flowing 49 82 132
default:water_source 78 132 255 64 224
default:water_flowing 78 132 255 64 224

View File

@ -1468,13 +1468,13 @@ mesecons_walllever:wall_lever_on 136 136 136
mesecons_walllever:wall_lever_off 136 136 136
bones:bones 74 74 74
default:glass 192 192 227 64 16
default:water_flowing 39 66 106
default:water_flowing 78 132 255 64 224
default:water_flowing 49 82 132
default:water_flowing 49 82 132 192 224
default:junglesapling 37 34 14
default:sandstonebrick 160 144 108
default:furnace_active 97 93 91
default:sign_wall 163 141 106
default:lava_source 255 100 0
default:lava_source 255 100 0 208 224
default:goldblock 126 116 35
default:obsidian_glass 16 17 17 64 16
default:stone_with_copper 91 88 87
@ -1499,7 +1499,7 @@ default:desert_sand 209 165 97
default:steelblock 153 153 153
default:rail 114 82 33
default:nyancat_rainbow 58 19 128
default:lava_flowing 255 100 0
default:lava_flowing 255 100 0 208 224
default:sapling 63 59 40
default:snow 225 227 255
default:furnace 97 93 91
@ -1507,8 +1507,8 @@ default:desert_stone 122 74 57
default:tree 66 52 35
default:jungletree 120 106 78
default:cactus 132 143 108
default:water_source 39 66 106
default:water_source 78 132 255 64 224
default:water_source 49 82 132
default:water_source 49 82 132 192 200
default:mese 200 202 0
default:stone_with_coal 91 88 87
default:nyancat 38 16 66