Add new suns, fix skybox colors when changing between biomes

This commit is contained in:
Juraj Vajda 2023-02-22 10:17:30 -05:00
parent 356e32db11
commit 1a63831ecd
6 changed files with 43 additions and 26 deletions

View File

@ -815,6 +815,8 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file)
- everness_forsaken_desert_sun_tonemap.png - everness_forsaken_desert_sun_tonemap.png
- everness_coral_forest_sun_tonemap.png - everness_coral_forest_sun_tonemap.png
- everness_coral_forest_sun.png - everness_coral_forest_sun.png
- everness_forsaken_tundra_sun.png
- everness_forsaken_tundra_sun_tonemap.png
**CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated

View File

@ -177,7 +177,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#c492a5', -- day_sky = '#c492a5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#e4b2c5', day_horizon = '#e4b2c5',
dawn_sky = '#e0aec1', dawn_sky = '#e0aec1',
dawn_horizon = '#e5b3c6', dawn_horizon = '#e5b3c6',
@ -199,7 +199,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#c492a5', -- day_sky = '#c492a5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#e4b2c5', day_horizon = '#e4b2c5',
dawn_sky = '#e0aec1', dawn_sky = '#e0aec1',
dawn_horizon = '#e5b3c6', dawn_horizon = '#e5b3c6',
@ -221,7 +221,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#c492a5', -- day_sky = '#c492a5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#e4b2c5', day_horizon = '#e4b2c5',
dawn_sky = '#e0aec1', dawn_sky = '#e0aec1',
dawn_horizon = '#e5b3c6', dawn_horizon = '#e5b3c6',
@ -243,7 +243,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#c492a5', -- day_sky = '#c492a5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#e4b2c5', day_horizon = '#e4b2c5',
dawn_sky = '#e0aec1', dawn_sky = '#e0aec1',
dawn_horizon = '#e5b3c6', dawn_horizon = '#e5b3c6',
@ -260,13 +260,13 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#5dd35d', -- day_sky = '#5dd35d',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#7df37d', day_horizon = '#7df37d',
-- dawn_sky = '#79ef79', -- dawn_sky = '#79ef79',
dawn_sky = '', dawn_sky = '#B4BAFA',
dawn_horizon = '#7ef47e', dawn_horizon = '#7ef47e',
-- night_sky = '#158b15', -- night_sky = '#158b15',
night_sky = '', night_sky = '#006BFF',
night_horizon = '#3eb43e', night_horizon = '#3eb43e',
indoors = '#1e941e', indoors = '#1e941e',
fog_sun_tint = '#50c650', fog_sun_tint = '#50c650',
@ -279,13 +279,13 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#5dd35d', -- day_sky = '#5dd35d',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#7df37d', day_horizon = '#7df37d',
-- dawn_sky = '#79ef79', -- dawn_sky = '#79ef79',
dawn_sky = '', dawn_sky = '#B4BAFA',
dawn_horizon = '#7ef47e', dawn_horizon = '#7ef47e',
-- night_sky = '#158b15', -- night_sky = '#158b15',
night_sky = '', night_sky = '#006BFF',
night_horizon = '#3eb43e', night_horizon = '#3eb43e',
indoors = '#1e941e', indoors = '#1e941e',
fog_sun_tint = '#50c650', fog_sun_tint = '#50c650',
@ -346,7 +346,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#b992c5', -- day_sky = '#b992c5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#d9b2e5', day_horizon = '#d9b2e5',
dawn_sky = '#d5aee1', dawn_sky = '#d5aee1',
dawn_horizon = '#dab3e6', dawn_horizon = '#dab3e6',
@ -371,7 +371,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#b992c5', -- day_sky = '#b992c5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#d9b2e5', day_horizon = '#d9b2e5',
dawn_sky = '#d5aee1', dawn_sky = '#d5aee1',
dawn_horizon = '#dab3e6', dawn_horizon = '#dab3e6',
@ -396,7 +396,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#b992c5', -- day_sky = '#b992c5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#d9b2e5', day_horizon = '#d9b2e5',
dawn_sky = '#d5aee1', dawn_sky = '#d5aee1',
dawn_horizon = '#dab3e6', dawn_horizon = '#dab3e6',
@ -421,7 +421,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#b992c5', -- day_sky = '#b992c5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#d9b2e5', day_horizon = '#d9b2e5',
dawn_sky = '#d5aee1', dawn_sky = '#d5aee1',
dawn_horizon = '#dab3e6', dawn_horizon = '#dab3e6',
@ -446,7 +446,7 @@ local skybox_defs = {
type = 'regular', type = 'regular',
sky_color = { sky_color = {
-- day_sky = '#b992c5', -- day_sky = '#b992c5',
day_sky = '', day_sky = '#61B5F5',
day_horizon = '#d9b2e5', day_horizon = '#d9b2e5',
dawn_sky = '#d5aee1', dawn_sky = '#d5aee1',
dawn_horizon = '#dab3e6', dawn_horizon = '#dab3e6',
@ -479,7 +479,7 @@ local skybox_defs = {
}, },
sun_parameters = { sun_parameters = {
texture = 'everness_forsaken_desert_sun.png', texture = 'everness_forsaken_desert_sun.png',
scale = 1.57, scale = 3.14,
tonemap = 'everness_forsaken_desert_sun_tonemap.png' tonemap = 'everness_forsaken_desert_sun_tonemap.png'
}, },
}, },
@ -500,7 +500,7 @@ local skybox_defs = {
}, },
sun_parameters = { sun_parameters = {
texture = 'everness_forsaken_desert_sun.png', texture = 'everness_forsaken_desert_sun.png',
scale = 1.57, scale = 3.14,
tonemap = 'everness_forsaken_desert_sun_tonemap.png' tonemap = 'everness_forsaken_desert_sun_tonemap.png'
}, },
}, },
@ -552,7 +552,12 @@ local skybox_defs = {
fog_sun_tint = '#bd962c', fog_sun_tint = '#bd962c',
fog_moon_tint = '#be972d' fog_moon_tint = '#be972d'
} }
} },
sun_parameters = {
texture = 'everness_forsaken_tundra_sun.png',
scale = 1.57,
tonemap = 'everness_forsaken_tundra_sun_tonemap.png'
},
}, },
everness_forsaken_tundra_beach = { everness_forsaken_tundra_beach = {
sky_parameters = { sky_parameters = {
@ -570,7 +575,12 @@ local skybox_defs = {
fog_sun_tint = '#bd962c', fog_sun_tint = '#bd962c',
fog_moon_tint = '#be972d' fog_moon_tint = '#be972d'
} }
} },
sun_parameters = {
texture = 'everness_forsaken_tundra_sun.png',
scale = 1.57,
tonemap = 'everness_forsaken_tundra_sun_tonemap.png'
},
}, },
everness_forsaken_tundra_ocean = { everness_forsaken_tundra_ocean = {
sky_parameters = { sky_parameters = {
@ -588,7 +598,12 @@ local skybox_defs = {
fog_sun_tint = '#bd962c', fog_sun_tint = '#bd962c',
fog_moon_tint = '#be972d' fog_moon_tint = '#be972d'
} }
} },
sun_parameters = {
texture = 'everness_forsaken_tundra_sun.png',
scale = 1.57,
tonemap = 'everness_forsaken_tundra_sun_tonemap.png'
},
}, },
everness_forsaken_tundra_under = { everness_forsaken_tundra_under = {
sky_parameters = { sky_parameters = {
@ -617,12 +632,12 @@ local function should_flip(player)
-- 1 morning -- 1 morning
-- 2 afternoon -- 2 afternoon
local current_time = minetest.get_timeofday() < 0.5 and 1 or 2 local current_time = minetest.get_timeofday() < 0.5 and 1 or 2
local should_flip = current_time ~= player_time local flip = current_time ~= player_time
player_meta:set_int('everness_timeofday', current_time) player_meta:set_int('everness_timeofday', current_time)
return { return {
should_flip = should_flip, should_flip = flip,
current_time = current_time current_time = current_time
} }
end end
@ -655,15 +670,15 @@ minetest.register_globalstep(function(dtime)
return return
end end
local should_flip = should_flip(player) local should_flip_data = should_flip(player)
-- flip sun/moon when morning/afternoon -- flip sun/moon when morning/afternoon
if player_biome_name == biome_name and should_flip then if player_biome_name == biome_name and should_flip_data.should_flip then
if skybox_defs[biome_name] then if skybox_defs[biome_name] then
if skybox_defs[biome_name].sun_parameters then if skybox_defs[biome_name].sun_parameters then
local sun_params = table.copy(skybox_defs[biome_name].sun_parameters) local sun_params = table.copy(skybox_defs[biome_name].sun_parameters)
if should_flip.current_time == 2 then if should_flip_data.current_time == 2 then
sun_params.texture = sun_params.texture .. '^[transformFY' sun_params.texture = sun_params.texture .. '^[transformFY'
end end
@ -686,7 +701,7 @@ minetest.register_globalstep(function(dtime)
local sun_params = table.copy(skybox_defs[biome_name].sun_parameters) local sun_params = table.copy(skybox_defs[biome_name].sun_parameters)
-- flip sun when afternoon -- flip sun when afternoon
if should_flip.current_time == 2 then if should_flip_data.current_time == 2 then
sun_params.texture = sun_params.texture .. '^[transformFY' sun_params.texture = sun_params.texture .. '^[transformFY'
end end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B