adrido
/
minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to translucency computation & improve water colors

master
Rogier 2014-05-24 19:55:38 +02:00
parent 9706084e8d
commit ace16ce575
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PixelAttributes.cpp
View File

@ -136,7 +136,7 @@ void PixelAttribute::mixUnder(const PixelAttribute &p)
g = p.g; g = p.g;
b = p.b; b = p.b;
a = p.a; a = p.a;
t = p.t; t = 0;
h = p.h; h = p.h;
} }
else { else {
@ -144,15 +144,18 @@ void PixelAttribute::mixUnder(const PixelAttribute &p)
g = (a * g + p.a * (1 - a) * p.g); g = (a * g + p.a * (1 - a) * p.g);
b = (a * b + p.a * (1 - a) * p.b); b = (a * b + p.a * (1 - a) * p.b);
a = (a + (1 - a) * p.a); a = (a + (1 - a) * p.a);
t = (t + p.t) / 2; if (p.a != 1)
t = (t + p.t) / 2;
h = p.h; h = p.h;
} }
if (prev_alpha == 255 && p.alpha() < 255) { if (prev_alpha >= 254 && p.alpha() < 255) {
// Darken // Darken
// Parameters make deep water look good :-) // Parameters make deep water look good :-)
r = r * (0.85 + 0.1 * (1 - p.a)); r = r * 0.95;
g = g * (0.85 + 0.1 * (1 - p.a)); g = g * 0.95;
b = b * (0.85 + 0.1 * (1 - p.a)); b = b * 0.95;
if (p.a != 1)
t = (t + p.t) / 2;
} }
} }

4
colors.txt
View File

@ -1468,7 +1468,7 @@ mesecons_walllever:wall_lever_off 136 136 136
bones:bones 74 74 74 bones:bones 74 74 74
default:glass 192 192 227 64 16 default:glass 192 192 227 64 16
default:water_flowing 39 66 106 default:water_flowing 39 66 106
default:water_flowing 78 132 212 64 224 default:water_flowing 78 132 255 64 224
default:junglesapling 37 34 14 default:junglesapling 37 34 14
default:sandstonebrick 160 144 108 default:sandstonebrick 160 144 108
default:furnace_active 97 93 91 default:furnace_active 97 93 91
@ -1507,7 +1507,7 @@ default:tree 66 52 35
default:jungletree 120 106 78 default:jungletree 120 106 78
default:cactus 132 143 108 default:cactus 132 143 108
default:water_source 39 66 106 default:water_source 39 66 106
default:water_source 78 132 212 64 224 default:water_source 78 132 255 64 224
default:mese 200 202 0 default:mese 200 202 0
default:stone_with_coal 91 88 87 default:stone_with_coal 91 88 87
default:nyancat 38 16 66 default:nyancat 38 16 66