nalc/nether
1
0
Fork 0
forked from minetest-mods/nether
Code Issues Pull Requests Releases Wiki Activity

Move wormhole_node_is_horizontal into the shape definition

Browse Source 
out of the portal defintion
This commit is contained in:
Treer 2020-01-05 01:33:56 +11:00 committed by SmallJoker
parent 43f1f24d53
commit 48cbd87b59
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
portal_api.lua
View File

@ -1,5 +1,5 @@
-- see portal_api.txt for documentation -- see portal_api.txt for documentation
local DEBUG = true local DEBUG = false
local IGNORE_MODSTORAGE_PORTALS = false -- set true if you don't want portals to remember where they were linked - sometimes it's handy for debugging to have the portal always recalculate its target local IGNORE_MODSTORAGE_PORTALS = false -- set true if you don't want portals to remember where they were linked - sometimes it's handy for debugging to have the portal always recalculate its target
nether.registered_portals = {} nether.registered_portals = {}
@ -90,6 +90,7 @@ nether.PortalShape_Traditional = {
size = vector.new(4, 5, 1), -- size of the portal, and not necessarily the size of the schematic, size = vector.new(4, 5, 1), -- size of the portal, and not necessarily the size of the schematic,
-- which may clear area around the portal. -- which may clear area around the portal.
schematic_filename = nether.path .. "/schematics/nether_portal.mts", schematic_filename = nether.path .. "/schematics/nether_portal.mts",
is_horizontal = false, -- whether the wormhole is a vertical or horizontal surface
-- returns the coords for minetest.place_schematic() that will place the schematic on the anchorPos -- returns the coords for minetest.place_schematic() that will place the schematic on the anchorPos
get_schematicPos_from_anchorPos = function(anchorPos, orientation) get_schematicPos_from_anchorPos = function(anchorPos, orientation)
@ -237,6 +238,7 @@ nether.PortalShape_Circular = {
size = vector.new(7, 7, 1), -- size of the portal, and not necessarily the size of the schematic, size = vector.new(7, 7, 1), -- size of the portal, and not necessarily the size of the schematic,
-- which may clear area around the portal. -- which may clear area around the portal.
schematic_filename = nether.path .. "/schematics/nether_portal_circular.mts", schematic_filename = nether.path .. "/schematics/nether_portal_circular.mts",
is_horizontal = false, -- whether the wormhole is a vertical or horizontal surface
-- returns the coords for minetest.place_schematic() that will place the schematic on the anchorPos -- returns the coords for minetest.place_schematic() that will place the schematic on the anchorPos
get_schematicPos_from_anchorPos = function(anchorPos, orientation) get_schematicPos_from_anchorPos = function(anchorPos, orientation)
@ -366,6 +368,7 @@ nether.PortalShape_Platform = {
size = vector.new(5, 2, 5), -- size of the portal, and not necessarily the size of the schematic, size = vector.new(5, 2, 5), -- size of the portal, and not necessarily the size of the schematic,
-- which may clear area around the portal. -- which may clear area around the portal.
schematic_filename = nether.path .. "/schematics/nether_portal_platform.mts", schematic_filename = nether.path .. "/schematics/nether_portal_platform.mts",
is_horizontal = true, -- whether the wormhole is a vertical or horizontal surface
-- returns the coords for minetest.place_schematic() that will place the schematic on the anchorPos -- returns the coords for minetest.place_schematic() that will place the schematic on the anchorPos
get_schematicPos_from_anchorPos = function(anchorPos, orientation) get_schematicPos_from_anchorPos = function(anchorPos, orientation)
@ -760,7 +763,7 @@ local function set_portal_metadata(portal_definition, anchorPos, orientation, de
-- they define the bounding volume for the portal. -- they define the bounding volume for the portal.
local p1, p2 = portal_definition.shape:get_p1_and_p2_from_anchorPos(anchorPos, orientation) local p1, p2 = portal_definition.shape:get_p1_and_p2_from_anchorPos(anchorPos, orientation)
local p1_string, p2_string = minetest.pos_to_string(p1), minetest.pos_to_string(p2) local p1_string, p2_string = minetest.pos_to_string(p1), minetest.pos_to_string(p2)
local param2 = get_colorfacedir_from_color_and_orientation(portal_definition.wormhole_node_color, orientation, portal_definition.wormhole_node_is_horizontal) local param2 = get_colorfacedir_from_color_and_orientation(portal_definition.wormhole_node_color, orientation, portal_definition.shape.is_horizontal)
local update_aborted-- using closures to allow the updateFunc to return extra information - by setting this variable local update_aborted-- using closures to allow the updateFunc to return extra information - by setting this variable
@ -924,7 +927,7 @@ local function build_portal(portal_definition, anchorPos, orientation, destinati
-- set the param2 on wormhole nodes to ensure they are the right color -- set the param2 on wormhole nodes to ensure they are the right color
local wormholeNode = { local wormholeNode = {
name = portal_definition.wormhole_node_name, name = portal_definition.wormhole_node_name,
param2 = get_colorfacedir_from_color_and_orientation(portal_definition.wormhole_node_color, orientation, portal_definition.wormhole_node_is_horizontal) param2 = get_colorfacedir_from_color_and_orientation(portal_definition.wormhole_node_color, orientation, portal_definition.shape.is_horizontal)
} }
portal_definition.shape.apply_func_to_wormhole_nodes( portal_definition.shape.apply_func_to_wormhole_nodes(
anchorPos, anchorPos,
@ -1560,7 +1563,6 @@ local portaldef_default = {
shape = PortalShape_Traditional, shape = PortalShape_Traditional,
wormhole_node_name = "nether:portal", wormhole_node_name = "nether:portal",
wormhole_node_color = 0, wormhole_node_color = 0,
wormhole_node_is_horizontal = false,
frame_node_name = "default:obsidian", frame_node_name = "default:obsidian",
particle_texture = "nether_particle.png", particle_texture = "nether_particle.png",
particle_texture_animation = nil, particle_texture_animation = nil,

1
portal_examples.lua
View File

@ -62,7 +62,6 @@ if minetest.settings:get_bool("nether_enable_portal_example_floatlands", ENABLE
shape = nether.PortalShape_Platform, shape = nether.PortalShape_Platform,
frame_node_name = "default:ice", frame_node_name = "default:ice",
wormhole_node_color = 7, -- 2 is blue wormhole_node_color = 7, -- 2 is blue
wormhole_node_is_horizontal = true, -- indicate the wormhole surface is horizontal
particle_texture = { particle_texture = {
name = "nether_particle_anim1.png", name = "nether_particle_anim1.png",
animation = { animation = {