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

Lighter

Browse Source
This commit is contained in:
Imbris 2019-08-13 22:43:27 -04:00
parent 6a477d6b69
commit d99a4f8d39
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/voxygen/shaders/include/sky.glsl
View File

@ -3,12 +3,12 @@ const float PI = 3.141592;
const vec3 SKY_DAY_TOP = vec3(0.1, 0.2, 0.9);
const vec3 SKY_DAY_MID = vec3(0.02, 0.08, 0.8);
const vec3 SKY_DAY_BOT = vec3(0.02, 0.01, 0.3);
const vec3 DAY_LIGHT = vec3(0.70, 0.70, 1.0);
const vec3 DAY_LIGHT = vec3(0.75, 0.75, 1.0);
const vec3 SKY_DUSK_TOP = vec3(0.21, 0.28, 0.50);
const vec3 SKY_DUSK_MID = vec3(0.68, 0.03, 0.0);
const vec3 SKY_DUSK_BOT = vec3(0.0, 0.0, 0.13);
const vec3 DUSK_LIGHT = vec3(0.9, 0.4, 0.3);
const vec3 DUSK_LIGHT = vec3(0.95, 0.6, 0.4);
const vec3 SKY_NIGHT_TOP = vec3(0.001, 0.001, 0.0025);
const vec3 SKY_NIGHT_MID = vec3(0.001, 0.005, 0.02);

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

@ -188,17 +188,17 @@ impl<'a> Sampler for ColumnGen<'a> {
.add(marble_small.sub(0.5).mul(0.25));
// Colours
let cold_grass = Rgb::new(0.0, 0.498, 0.408);
let warm_grass = Rgb::new(0.05, 0.765, 0.0);
let cold_stone = Rgb::new(0.569, 0.675, 0.796);
let warm_stone = Rgb::new(0.765, 0.765, 0.643);
let beach_sand = Rgb::new(0.886, 0.867, 0.635);
let desert_sand = Rgb::new(0.929, 0.796, 0.53);
let snow = Rgb::broadcast(0.765);
let cold_grass = Rgb::new(0.0, 0.49, 0.42);
let warm_grass = Rgb::new(0.03, 0.8, 0.0);
let cold_stone = Rgb::new(0.57, 0.67, 0.8);
let warm_stone = Rgb::new(0.77, 0.77, 0.64);
let beach_sand = Rgb::new(0.89, 0.87, 0.64);
let desert_sand = Rgb::new(0.93, 0.80, 0.54);
let snow = Rgb::broadcast(0.77);
let dirt = Lerp::lerp(
Rgb::new(0.078, 0.078, 0.196),
Rgb::new(0.612, 0.49, 0.0),
Rgb::new(0.078, 0.078, 0.20),
Rgb::new(0.61, 0.49, 0.0),
marble,
);
let cliff = Rgb::lerp(cold_stone, warm_stone, marble);
@ -208,7 +208,7 @@ impl<'a> Sampler for ColumnGen<'a> {
let tropical = Rgb::lerp(
grass,
Rgb::new(0.867, 0.62, 0.561),
Rgb::new(0.87, 0.62, 0.56),
marble_small.sub(0.5).mul(0.2).add(0.75).powf(0.667),
);