preserve color bits in rotation fixup calls

This commit is contained in:
Vanessa Dannenberg 2018-08-22 04:25:43 -04:00
parent e3648f77e2
commit 4847b926d5

View File

@ -251,6 +251,8 @@ end
function unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing) function unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local colorbits = node.param2 - (node.param2 % 8)
local yaw = placer:get_look_horizontal() local yaw = placer:get_look_horizontal()
local dir = minetest.yaw_to_dir(yaw) -- -1.5) local dir = minetest.yaw_to_dir(yaw) -- -1.5)
local pitch = placer:get_look_vertical() local pitch = placer:get_look_vertical()
@ -262,7 +264,7 @@ function unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
elseif pitch > math.pi/8 then elseif pitch > math.pi/8 then
fdir = 1 fdir = 1
end end
minetest.swap_node(pos, { name = node.name, param2 = fdir }) minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
end end
-- use this when you have a "wallmounted" node that should never be oriented -- use this when you have a "wallmounted" node that should never be oriented
@ -270,10 +272,12 @@ end
function unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) function unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local colorbits = node.param2 - (node.param2 % 8)
local yaw = placer:get_look_horizontal() local yaw = placer:get_look_horizontal()
local dir = minetest.yaw_to_dir(yaw+1.5) local dir = minetest.yaw_to_dir(yaw+1.5)
local fdir = minetest.dir_to_wallmounted(dir) local fdir = minetest.dir_to_wallmounted(dir)
minetest.swap_node(pos, { name = node.name, param2 = fdir })
minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
end end
-- ... and use this one to force that kind of node off of floor/ceiling -- ... and use this one to force that kind of node off of floor/ceiling