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

Bluer snow, altered rock colour

Browse Source
This commit is contained in:
Joshua Barretto 2019-06-10 16:16:54 +01:00
parent df2594cbb4
commit e671d8473c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/shaders/terrain.vert
View File

@ -28,7 +28,7 @@ void main() {
float((v_col_light >> 8) & 0xFFu),
float((v_col_light >> 16) & 0xFFu),
float((v_col_light >> 24) & 0xFFu)
) / 255.0;
) / 200.0;
f_light = float(v_col_light & 0xFFu) / 255.0;

6
voxygen/src/render/pipelines/terrain.rs
View File

@ -53,9 +53,9 @@ impl Vertex {
| ((pos.z as u32) & 0x1FFF) << 16
| ((norm_bits as u32) & 0x7) << 29,
col_light: 0
| ((col.r.mul(255.0) as u32) & 0xFF) << 8
| ((col.g.mul(255.0) as u32) & 0xFF) << 16
| ((col.b.mul(255.0) as u32) & 0xFF) << 24
| ((col.r.mul(200.0) as u32) & 0xFF) << 8
| ((col.g.mul(200.0) as u32) & 0xFF) << 16
| ((col.b.mul(200.0) as u32) & 0xFF) << 24
| ((light.mul(255.0) as u32) & 0xFF) << 0,
}
}

8
world/src/block/mod.rs
View File

@ -62,16 +62,16 @@ impl<'a> Sampler for BlockGen<'a> {
let warp = (self.world.sim()
.gen_ctx
.warp_nz
.get((wposf.div(Vec3::new(120.0, 120.0, 140.0))).into_array())
.get((wposf.div(Vec3::new(150.0, 150.0, 150.0))).into_array())
as f32)
.mul((chaos - 0.1).max(0.0))
.mul(120.0);
.mul(130.0);
let is_cliff = if cliff > 0.0 {
(self.world.sim()
.gen_ctx
.warp_nz
.get((wposf.div(Vec3::new(300.0, 300.0, 800.0))).into_array())
.get((wposf.div(Vec3::new(300.0, 300.0, 1500.0))).into_array())
as f32) * cliff > 0.3
} else {
false
@ -105,7 +105,7 @@ impl<'a> Sampler for BlockGen<'a> {
let dirt = Block::new(1, Rgb::new(128, 90, 0));
let sand = Block::new(1, Rgb::new(180, 150, 50));
let water = Block::new(1, Rgb::new(100, 150, 255));
let warm_stone = Block::new(1, Rgb::new(165, 165, 90));
let warm_stone = Block::new(1, Rgb::new(165, 165, 130));
let block = if (wposf.z as f32) < height - 2.0 {
// Underground

2
world/src/column/mod.rs
View File

@ -65,7 +65,7 @@ impl<'a> Sampler for ColumnGen<'a> {
let warm_stone = Rgb::new(0.65, 0.65, 0.35);
let beach_sand = Rgb::new(0.93, 0.84, 0.4);
let desert_sand = Rgb::new(0.98, 0.8, 0.15);
let snow = Rgb::broadcast(1.0);
let snow = Rgb::new(0.9, 0.9, 1.3);
let grass = Rgb::lerp(cold_grass, warm_grass, marble);
let sand = Rgb::lerp(beach_sand, desert_sand, marble);