master
root 2021-01-12 12:24:23 +01:00
parent f1ef393c65
commit 8efa0f746f
4 changed files with 25 additions and 24 deletions

View File

@ -34,13 +34,17 @@ function closet.compose_preview(clicker, gender)
if not(underwear) then
lower = "cloth_lower_underwear_preview.png"
end
local preview, texture_base
if gender == "male" then
texture_base= "closet_player_preview.png"
else
texture_base = "closet_female_preview.png"
end
preview="[combine:32x64:0,0="..texture_base
local base_texture = player_api.compose_base_texture(clicker, {
canvas_size ="32x64",
skin_texture = "closet_player_preview.png",
eyebrowns_pos = "8,0",
eye_right_pos = "10,8",
eye_left_pos = "18,8",
mouth_pos = "8,12",
hair_preview = true,
hair_pos = "8,0",
})
local preview= base_texture
if head then
preview= preview .. ":8,0="..head
end
@ -86,7 +90,7 @@ function closet.container.get_container_formspec(pos, clicker)
local formspec =
"size[8,8.25]" ..
--5.4--"model[0,0;5,5;preview_model;"..model..";"..texture..";-10,195;;;0,79]"..
"image[0.5,0.5;2,4;"..preview.."]" ..
"image[0.5,0.5;2,4;"..minetest.formspec_escape(preview).."]" ..
"list[current_player;cloths;2.5,0.25;2,4]" ..
get_bg(2.5,0.25,3,1,"closet_gui_clothes_bg.png")..
"list[nodemeta:" .. spos .. ";closet;5,0.25;3,12;]" ..

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

@ -1,21 +1,19 @@
local S = ...
function vanity.get_vanity_formspec(clicker)
local gender = player_api.get_gender(clicker)
--5.4--local model = player_api.get_gender_model(gender)
local face_base = player_api.compose_skin(clicker, "vanity_face_base.png")
local base_texture = player_api.get_base_texture_table(clicker)
local eyebrows = base_texture["eyebrowns"]
local eye = base_texture["eye"]
local mouth = base_texture["mouth"]
local hair = base_texture["hair"]
local face_preview = minetest.formspec_escape("[combine:16x16:0,0=".. face_base ..
":0,0=" .. eyebrows ..
":2,8=" .. eye ..
":10,8=" .. eye ..
":0,12=" .. mouth ..
":0,0 =" .. string.sub(hair, 0, -5).."_preview.png"
)
local face_preview = minetest.formspec_escape(player_api.compose_base_texture(clicker, {
canvas_size ="16x16",
skin_texture = "vanity_face_base.png",
eyebrowns_pos = "0,0",
eye_right_pos = "2,8",
eye_left_pos = "10,8",
mouth_pos = "0,12",
hair_preview = true,
hair_pos = "0,0",
}))
local formspec =
"formspec_version[4]"..
"size[8.75,6.25]"..
@ -44,8 +42,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
return
end
local player_name = player:get_player_name()
base_texture = player_api.get_base_texture_table(player)
local change = false
local base_texture = player_api.get_base_texture_table(player)
if fields.btn_blue_eye then
base_texture["eye"] = "player_blue_eye.png"
elseif fields.btn_brown_eye then