Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better tree colours

Browse Source
This commit is contained in:
Joshua Barretto 2022-05-11 00:15:05 +01:00
parent 907ba3dcbc
commit 5e1f16fb7a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/lod-object-vert.glsl
View File

@ -49,7 +49,7 @@ void main() {
#endif
f_norm = v_norm;
f_col = vec4(vec3(inst_col) * (1.0 / 255.0) * v_col * (sin(inst_pos.xyy) * 0.33 + 0.66), 1.0);
f_col = vec4(vec3(inst_col) * (1.0 / 255.0) * v_col * (hash(inst_pos.xyxy) * 0.35 + 0.65), 1.0);
if ((inst_flags & FLAG_SNOW_COVERED) > 0u) {
snow_cover = 1.0;

4
voxygen/src/scene/lod.rs
View File

@ -121,9 +121,9 @@ impl Lod {
// TODO: Put this somewhere more easily configurable, like a manifest
let color = match object.kind {
lod::ObjectKind::Pine => Rgb::new(0, 25, 12),
lod::ObjectKind::Oak => Rgb::new(13, 50, 5),
lod::ObjectKind::Oak => Rgb::new(10, 50, 5),
lod::ObjectKind::House => Rgb::new(20, 15, 0),
lod::ObjectKind::GiantTree => Rgb::new(13, 50, 5),
lod::ObjectKind::GiantTree => Rgb::new(15, 35, 5),
};
objects
.entry(object.kind)