2011-11-14 20:41:30 +01:00
|
|
|
/*
|
2013-02-24 18:40:43 +01:00
|
|
|
Minetest
|
2013-02-24 19:38:45 +01:00
|
|
|
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
|
2011-11-14 20:41:30 +01:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
2012-06-05 16:56:56 +02:00
|
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
2011-11-14 20:41:30 +01:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2012-06-05 16:56:56 +02:00
|
|
|
GNU Lesser General Public License for more details.
|
2011-11-14 20:41:30 +01:00
|
|
|
|
2012-06-05 16:56:56 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
2011-11-14 20:41:30 +01:00
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "nodedef.h"
|
|
|
|
|
2012-01-12 06:10:39 +01:00
|
|
|
#include "itemdef.h"
|
2011-11-14 20:41:30 +01:00
|
|
|
#ifndef SERVER
|
2015-03-05 11:52:57 +01:00
|
|
|
#include "client/tile.h"
|
2014-10-15 04:13:53 +02:00
|
|
|
#include "mesh.h"
|
2014-10-21 05:12:15 +02:00
|
|
|
#include <IMeshManipulator.h>
|
2011-11-14 20:41:30 +01:00
|
|
|
#endif
|
|
|
|
#include "log.h"
|
2011-11-15 18:58:36 +01:00
|
|
|
#include "settings.h"
|
2011-11-16 12:03:28 +01:00
|
|
|
#include "nameidmapping.h"
|
2013-07-14 00:55:47 +02:00
|
|
|
#include "util/numeric.h"
|
2012-06-17 01:40:36 +02:00
|
|
|
#include "util/serialize.h"
|
2014-09-12 00:22:05 +02:00
|
|
|
#include "exceptions.h"
|
|
|
|
#include "debug.h"
|
2014-10-15 04:13:53 +02:00
|
|
|
#include "gamedef.h"
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
#include "mapnode.h"
|
2015-03-30 12:55:29 +02:00
|
|
|
#include <fstream> // Used in applyTextureOverrides()
|
2011-11-15 18:58:36 +01:00
|
|
|
|
2011-11-15 21:41:49 +01:00
|
|
|
/*
|
|
|
|
NodeBox
|
|
|
|
*/
|
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
void NodeBox::reset()
|
|
|
|
{
|
|
|
|
type = NODEBOX_REGULAR;
|
|
|
|
// default is empty
|
|
|
|
fixed.clear();
|
|
|
|
// default is sign/ladder-like
|
|
|
|
wall_top = aabb3f(-BS/2, BS/2-BS/16., -BS/2, BS/2, BS/2, BS/2);
|
|
|
|
wall_bottom = aabb3f(-BS/2, -BS/2, -BS/2, BS/2, -BS/2+BS/16., BS/2);
|
|
|
|
wall_side = aabb3f(-BS/2, -BS/2, -BS/2, -BS/2+BS/16., BS/2, BS/2);
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
// no default for other parts
|
|
|
|
connect_top.clear();
|
|
|
|
connect_bottom.clear();
|
|
|
|
connect_front.clear();
|
|
|
|
connect_left.clear();
|
|
|
|
connect_back.clear();
|
|
|
|
connect_right.clear();
|
2012-03-19 04:25:09 +01:00
|
|
|
}
|
|
|
|
|
2013-08-01 22:50:58 +02:00
|
|
|
void NodeBox::serialize(std::ostream &os, u16 protocol_version) const
|
2011-11-15 18:58:36 +01:00
|
|
|
{
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
int version = 1;
|
|
|
|
if (protocol_version >= 27)
|
|
|
|
version = 3;
|
|
|
|
else if (protocol_version >= 21)
|
|
|
|
version = 2;
|
2013-08-01 22:50:58 +02:00
|
|
|
writeU8(os, version);
|
|
|
|
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
switch (type) {
|
|
|
|
case NODEBOX_LEVELED:
|
|
|
|
case NODEBOX_FIXED:
|
|
|
|
if (version == 1)
|
|
|
|
writeU8(os, NODEBOX_FIXED);
|
|
|
|
else
|
|
|
|
writeU8(os, type);
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
writeU16(os, fixed.size());
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
for (std::vector<aabb3f>::const_iterator
|
2012-03-19 04:25:09 +01:00
|
|
|
i = fixed.begin();
|
2015-08-25 22:23:05 +02:00
|
|
|
i != fixed.end(); ++i)
|
2012-03-19 04:25:09 +01:00
|
|
|
{
|
|
|
|
writeV3F1000(os, i->MinEdge);
|
|
|
|
writeV3F1000(os, i->MaxEdge);
|
|
|
|
}
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
break;
|
|
|
|
case NODEBOX_WALLMOUNTED:
|
|
|
|
writeU8(os, type);
|
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
writeV3F1000(os, wall_top.MinEdge);
|
|
|
|
writeV3F1000(os, wall_top.MaxEdge);
|
|
|
|
writeV3F1000(os, wall_bottom.MinEdge);
|
|
|
|
writeV3F1000(os, wall_bottom.MaxEdge);
|
|
|
|
writeV3F1000(os, wall_side.MinEdge);
|
|
|
|
writeV3F1000(os, wall_side.MaxEdge);
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
break;
|
|
|
|
case NODEBOX_CONNECTED:
|
|
|
|
if (version <= 2) {
|
|
|
|
// send old clients nodes that can't be walked through
|
|
|
|
// to prevent abuse
|
|
|
|
writeU8(os, NODEBOX_FIXED);
|
|
|
|
|
|
|
|
writeU16(os, 1);
|
|
|
|
writeV3F1000(os, v3f(-BS/2, -BS/2, -BS/2));
|
|
|
|
writeV3F1000(os, v3f(BS/2, BS/2, BS/2));
|
|
|
|
} else {
|
|
|
|
writeU8(os, type);
|
|
|
|
|
|
|
|
#define WRITEBOX(box) do { \
|
|
|
|
writeU16(os, (box).size()); \
|
|
|
|
for (std::vector<aabb3f>::const_iterator \
|
|
|
|
i = (box).begin(); \
|
|
|
|
i != (box).end(); ++i) { \
|
|
|
|
writeV3F1000(os, i->MinEdge); \
|
|
|
|
writeV3F1000(os, i->MaxEdge); \
|
|
|
|
}; } while (0)
|
|
|
|
|
|
|
|
WRITEBOX(fixed);
|
|
|
|
WRITEBOX(connect_top);
|
|
|
|
WRITEBOX(connect_bottom);
|
|
|
|
WRITEBOX(connect_front);
|
|
|
|
WRITEBOX(connect_left);
|
|
|
|
WRITEBOX(connect_back);
|
|
|
|
WRITEBOX(connect_right);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
writeU8(os, type);
|
|
|
|
break;
|
2012-03-19 04:25:09 +01:00
|
|
|
}
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void NodeBox::deSerialize(std::istream &is)
|
|
|
|
{
|
|
|
|
int version = readU8(is);
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
if (version < 1 || version > 3)
|
2011-11-15 18:58:36 +01:00
|
|
|
throw SerializationError("unsupported NodeBox version");
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
reset();
|
|
|
|
|
2011-11-15 18:58:36 +01:00
|
|
|
type = (enum NodeBoxType)readU8(is);
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2013-07-13 19:48:14 +02:00
|
|
|
if(type == NODEBOX_FIXED || type == NODEBOX_LEVELED)
|
2012-03-19 04:25:09 +01:00
|
|
|
{
|
|
|
|
u16 fixed_count = readU16(is);
|
|
|
|
while(fixed_count--)
|
|
|
|
{
|
|
|
|
aabb3f box;
|
|
|
|
box.MinEdge = readV3F1000(is);
|
|
|
|
box.MaxEdge = readV3F1000(is);
|
|
|
|
fixed.push_back(box);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(type == NODEBOX_WALLMOUNTED)
|
|
|
|
{
|
|
|
|
wall_top.MinEdge = readV3F1000(is);
|
|
|
|
wall_top.MaxEdge = readV3F1000(is);
|
|
|
|
wall_bottom.MinEdge = readV3F1000(is);
|
|
|
|
wall_bottom.MaxEdge = readV3F1000(is);
|
|
|
|
wall_side.MinEdge = readV3F1000(is);
|
|
|
|
wall_side.MaxEdge = readV3F1000(is);
|
|
|
|
}
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
else if (type == NODEBOX_CONNECTED)
|
|
|
|
{
|
|
|
|
#define READBOXES(box) do { \
|
|
|
|
count = readU16(is); \
|
|
|
|
(box).reserve(count); \
|
|
|
|
while (count--) { \
|
|
|
|
v3f min = readV3F1000(is); \
|
|
|
|
v3f max = readV3F1000(is); \
|
|
|
|
(box).push_back(aabb3f(min, max)); }; } while (0)
|
|
|
|
|
|
|
|
u16 count;
|
|
|
|
|
|
|
|
READBOXES(fixed);
|
|
|
|
READBOXES(connect_top);
|
|
|
|
READBOXES(connect_bottom);
|
|
|
|
READBOXES(connect_front);
|
|
|
|
READBOXES(connect_left);
|
|
|
|
READBOXES(connect_back);
|
|
|
|
READBOXES(connect_right);
|
|
|
|
}
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
|
2011-11-15 21:41:49 +01:00
|
|
|
/*
|
2012-06-16 02:40:45 +02:00
|
|
|
TileDef
|
2011-11-15 21:41:49 +01:00
|
|
|
*/
|
2012-11-26 03:16:48 +01:00
|
|
|
|
2013-01-25 01:37:19 +01:00
|
|
|
void TileDef::serialize(std::ostream &os, u16 protocol_version) const
|
2011-11-15 18:58:36 +01:00
|
|
|
{
|
2015-07-16 15:36:48 +02:00
|
|
|
if (protocol_version >= 26)
|
|
|
|
writeU8(os, 2);
|
|
|
|
else if (protocol_version >= 17)
|
2014-07-06 16:17:46 +02:00
|
|
|
writeU8(os, 1);
|
2013-01-25 01:37:19 +01:00
|
|
|
else
|
|
|
|
writeU8(os, 0);
|
2012-06-16 02:40:45 +02:00
|
|
|
os<<serializeString(name);
|
|
|
|
writeU8(os, animation.type);
|
|
|
|
writeU16(os, animation.aspect_w);
|
|
|
|
writeU16(os, animation.aspect_h);
|
|
|
|
writeF1000(os, animation.length);
|
2015-07-16 15:36:48 +02:00
|
|
|
if (protocol_version >= 17)
|
2013-01-25 01:37:19 +01:00
|
|
|
writeU8(os, backface_culling);
|
2015-07-16 15:36:48 +02:00
|
|
|
if (protocol_version >= 26) {
|
|
|
|
writeU8(os, tileable_horizontal);
|
|
|
|
writeU8(os, tileable_vertical);
|
|
|
|
}
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
|
2016-01-24 04:53:27 +01:00
|
|
|
void TileDef::deSerialize(std::istream &is, const u8 contenfeatures_version, const NodeDrawType drawtype)
|
2011-11-15 18:58:36 +01:00
|
|
|
{
|
2012-06-16 02:40:45 +02:00
|
|
|
int version = readU8(is);
|
|
|
|
name = deSerializeString(is);
|
|
|
|
animation.type = (TileAnimationType)readU8(is);
|
|
|
|
animation.aspect_w = readU16(is);
|
|
|
|
animation.aspect_h = readU16(is);
|
|
|
|
animation.length = readF1000(is);
|
2015-07-16 15:36:48 +02:00
|
|
|
if (version >= 1)
|
2013-01-25 01:37:19 +01:00
|
|
|
backface_culling = readU8(is);
|
2015-07-16 15:36:48 +02:00
|
|
|
if (version >= 2) {
|
|
|
|
tileable_horizontal = readU8(is);
|
|
|
|
tileable_vertical = readU8(is);
|
|
|
|
}
|
2016-01-24 04:53:27 +01:00
|
|
|
|
|
|
|
if ((contenfeatures_version < 8) &&
|
|
|
|
((drawtype == NDT_MESH) ||
|
|
|
|
(drawtype == NDT_FIRELIKE) ||
|
|
|
|
(drawtype == NDT_LIQUID) ||
|
|
|
|
(drawtype == NDT_PLANTLIKE)))
|
Backface culling: Ignore setting in tiledef from old servers.
Outdated servers are always sending tiledefs with culling
enabled no matter what, as the value was previously entirely
ignored.
To compensate, we must (1) detect that we're running against
an old server with a new client, and (2) disable culling for
mesh, plantlike, firelike and liquid draw types no matter what
the server is telling us.
In order to achieve this, we need to bump the protocol version
since we cannot rely on the tiledef version, and test for it
being older. I've bumped the protocol version, although that
should have likely happened in the actual change that introduced
the new backface_culling PR #3578. Fortunately that's only 2
commits back at this point.
We also explicitly test for the drawtype to assure we are not
changing the culling value for other nodes, where it should
remain enabled.
This was tested against various pub servers, including 0.4.13 and
0.4.12.
Fixes #3598
2016-01-21 23:40:24 +01:00
|
|
|
backface_culling = false;
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
|
2015-07-16 15:36:48 +02:00
|
|
|
|
2012-03-23 19:23:03 +01:00
|
|
|
/*
|
|
|
|
SimpleSoundSpec serialization
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void serializeSimpleSoundSpec(const SimpleSoundSpec &ss,
|
|
|
|
std::ostream &os)
|
|
|
|
{
|
|
|
|
os<<serializeString(ss.name);
|
|
|
|
writeF1000(os, ss.gain);
|
|
|
|
}
|
|
|
|
static void deSerializeSimpleSoundSpec(SimpleSoundSpec &ss, std::istream &is)
|
|
|
|
{
|
|
|
|
ss.name = deSerializeString(is);
|
|
|
|
ss.gain = readF1000(is);
|
|
|
|
}
|
|
|
|
|
2011-11-15 21:41:49 +01:00
|
|
|
/*
|
|
|
|
ContentFeatures
|
|
|
|
*/
|
|
|
|
|
2011-11-15 18:58:36 +01:00
|
|
|
ContentFeatures::ContentFeatures()
|
|
|
|
{
|
|
|
|
reset();
|
|
|
|
}
|
2011-11-14 20:41:30 +01:00
|
|
|
|
|
|
|
ContentFeatures::~ContentFeatures()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2011-11-15 18:58:36 +01:00
|
|
|
void ContentFeatures::reset()
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Cached stuff
|
|
|
|
*/
|
|
|
|
#ifndef SERVER
|
|
|
|
solidness = 2;
|
|
|
|
visual_solidness = 0;
|
|
|
|
backface_culling = true;
|
2015-07-16 15:36:48 +02:00
|
|
|
|
2011-11-15 18:58:36 +01:00
|
|
|
#endif
|
2012-06-05 22:51:37 +02:00
|
|
|
has_on_construct = false;
|
|
|
|
has_on_destruct = false;
|
|
|
|
has_after_destruct = false;
|
2011-11-15 18:58:36 +01:00
|
|
|
/*
|
|
|
|
Actual data
|
2012-11-26 03:16:48 +01:00
|
|
|
|
2011-11-26 01:26:19 +01:00
|
|
|
NOTE: Most of this is always overridden by the default values given
|
|
|
|
in builtin.lua
|
2011-11-15 18:58:36 +01:00
|
|
|
*/
|
2011-11-16 08:36:19 +01:00
|
|
|
name = "";
|
2012-02-28 18:45:23 +01:00
|
|
|
groups.clear();
|
2012-03-19 07:16:17 +01:00
|
|
|
// Unknown nodes can be dug
|
|
|
|
groups["dig_immediate"] = 2;
|
2011-11-15 18:58:36 +01:00
|
|
|
drawtype = NDT_NORMAL;
|
2014-10-15 04:13:53 +02:00
|
|
|
mesh = "";
|
|
|
|
#ifndef SERVER
|
|
|
|
for(u32 i = 0; i < 24; i++)
|
|
|
|
mesh_ptr[i] = NULL;
|
2015-06-22 04:34:56 +02:00
|
|
|
minimap_color = video::SColor(0, 0, 0, 0);
|
2014-10-15 04:13:53 +02:00
|
|
|
#endif
|
2011-11-15 18:58:36 +01:00
|
|
|
visual_scale = 1.0;
|
2014-07-25 07:35:55 +02:00
|
|
|
for(u32 i = 0; i < 6; i++)
|
2012-06-16 02:40:45 +02:00
|
|
|
tiledef[i] = TileDef();
|
2014-07-25 07:35:55 +02:00
|
|
|
for(u16 j = 0; j < CF_SPECIAL_COUNT; j++)
|
2012-06-16 02:40:45 +02:00
|
|
|
tiledef_special[j] = TileDef();
|
2011-11-15 18:58:36 +01:00
|
|
|
alpha = 255;
|
|
|
|
post_effect_color = video::SColor(0, 0, 0, 0);
|
|
|
|
param_type = CPT_NONE;
|
2012-01-21 00:11:44 +01:00
|
|
|
param_type_2 = CPT2_NONE;
|
2011-11-15 18:58:36 +01:00
|
|
|
is_ground_content = false;
|
|
|
|
light_propagates = false;
|
|
|
|
sunlight_propagates = false;
|
|
|
|
walkable = true;
|
|
|
|
pointable = true;
|
|
|
|
diggable = true;
|
|
|
|
climbable = false;
|
|
|
|
buildable_to = false;
|
2015-12-30 05:22:58 +01:00
|
|
|
floodable = false;
|
2013-01-27 10:33:25 +01:00
|
|
|
rightclickable = true;
|
2013-07-13 19:48:14 +02:00
|
|
|
leveled = 0;
|
2011-11-15 18:58:36 +01:00
|
|
|
liquid_type = LIQUID_NONE;
|
2011-11-25 16:00:50 +01:00
|
|
|
liquid_alternative_flowing = "";
|
|
|
|
liquid_alternative_source = "";
|
2011-11-15 18:58:36 +01:00
|
|
|
liquid_viscosity = 0;
|
2012-09-07 18:48:12 +02:00
|
|
|
liquid_renewable = true;
|
2013-07-16 16:28:18 +02:00
|
|
|
liquid_range = LIQUID_LEVEL_MAX+1;
|
2013-08-01 18:36:11 +02:00
|
|
|
drowning = 0;
|
2011-11-15 18:58:36 +01:00
|
|
|
light_source = 0;
|
|
|
|
damage_per_second = 0;
|
2012-03-19 04:25:09 +01:00
|
|
|
node_box = NodeBox();
|
2011-11-15 18:58:36 +01:00
|
|
|
selection_box = NodeBox();
|
2014-10-18 18:46:16 +02:00
|
|
|
collision_box = NodeBox();
|
2013-12-03 17:21:40 +01:00
|
|
|
waving = 0;
|
2012-01-21 00:11:44 +01:00
|
|
|
legacy_facedir_simple = false;
|
|
|
|
legacy_wallmounted = false;
|
2012-03-23 19:23:03 +01:00
|
|
|
sound_footstep = SimpleSoundSpec();
|
2012-03-24 10:10:28 +01:00
|
|
|
sound_dig = SimpleSoundSpec("__group");
|
2012-03-24 02:28:08 +01:00
|
|
|
sound_dug = SimpleSoundSpec();
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
connects_to.clear();
|
|
|
|
connects_to_ids.clear();
|
Allow nodes to specify which sides to connect to.
NDT_CONNECTED attempts to connect to any side of nodes that it can
connect to, which is troublesome for FACEDIR type nodes that generally
may only have one usable face, and can be rotated.
We introduce a node parameter `connect_sides` that is valid for
any node type. If specified, it lists faces of the node (in "top",
"bottom", "front", "left", "back", "right", form, as array) that
connecting nodeboxes can connect to. "front" corresponds to the south
facing side of a node with facedir = 0.
If the node is rotatable using *simple* FACEDIR, then the attached
face is properly rotated before checking. This allows e.g. a chest
to be attached to only from the rear side.
2016-03-04 08:18:04 +01:00
|
|
|
connect_sides = 0;
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
|
2015-05-05 22:52:06 +02:00
|
|
|
void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
|
2011-11-15 18:58:36 +01:00
|
|
|
{
|
2014-07-25 07:35:55 +02:00
|
|
|
if(protocol_version < 24){
|
2012-11-26 22:59:03 +01:00
|
|
|
serializeOld(os, protocol_version);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-01-24 04:53:27 +01:00
|
|
|
writeU8(os, protocol_version < 27 ? 7 : 8);
|
|
|
|
|
2011-11-16 08:36:19 +01:00
|
|
|
os<<serializeString(name);
|
2012-02-28 18:45:23 +01:00
|
|
|
writeU16(os, groups.size());
|
2012-03-04 13:22:35 +01:00
|
|
|
for(ItemGroupList::const_iterator
|
2015-08-25 22:23:05 +02:00
|
|
|
i = groups.begin(); i != groups.end(); ++i){
|
2012-02-28 18:45:23 +01:00
|
|
|
os<<serializeString(i->first);
|
|
|
|
writeS16(os, i->second);
|
|
|
|
}
|
2011-11-15 18:58:36 +01:00
|
|
|
writeU8(os, drawtype);
|
|
|
|
writeF1000(os, visual_scale);
|
|
|
|
writeU8(os, 6);
|
2014-07-25 07:35:55 +02:00
|
|
|
for(u32 i = 0; i < 6; i++)
|
2013-01-25 01:37:19 +01:00
|
|
|
tiledef[i].serialize(os, protocol_version);
|
2011-11-15 18:58:36 +01:00
|
|
|
writeU8(os, CF_SPECIAL_COUNT);
|
2014-07-25 07:35:55 +02:00
|
|
|
for(u32 i = 0; i < CF_SPECIAL_COUNT; i++){
|
2013-01-25 01:37:19 +01:00
|
|
|
tiledef_special[i].serialize(os, protocol_version);
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
writeU8(os, alpha);
|
|
|
|
writeU8(os, post_effect_color.getAlpha());
|
|
|
|
writeU8(os, post_effect_color.getRed());
|
|
|
|
writeU8(os, post_effect_color.getGreen());
|
|
|
|
writeU8(os, post_effect_color.getBlue());
|
|
|
|
writeU8(os, param_type);
|
2012-01-21 00:11:44 +01:00
|
|
|
writeU8(os, param_type_2);
|
2011-11-15 18:58:36 +01:00
|
|
|
writeU8(os, is_ground_content);
|
|
|
|
writeU8(os, light_propagates);
|
|
|
|
writeU8(os, sunlight_propagates);
|
|
|
|
writeU8(os, walkable);
|
|
|
|
writeU8(os, pointable);
|
|
|
|
writeU8(os, diggable);
|
|
|
|
writeU8(os, climbable);
|
|
|
|
writeU8(os, buildable_to);
|
2012-03-19 01:08:04 +01:00
|
|
|
os<<serializeString(""); // legacy: used to be metadata_name
|
2011-11-15 18:58:36 +01:00
|
|
|
writeU8(os, liquid_type);
|
2011-11-25 16:00:50 +01:00
|
|
|
os<<serializeString(liquid_alternative_flowing);
|
|
|
|
os<<serializeString(liquid_alternative_source);
|
2011-11-15 18:58:36 +01:00
|
|
|
writeU8(os, liquid_viscosity);
|
2012-11-25 20:11:45 +01:00
|
|
|
writeU8(os, liquid_renewable);
|
2011-11-15 18:58:36 +01:00
|
|
|
writeU8(os, light_source);
|
|
|
|
writeU32(os, damage_per_second);
|
2013-08-01 22:50:58 +02:00
|
|
|
node_box.serialize(os, protocol_version);
|
|
|
|
selection_box.serialize(os, protocol_version);
|
2012-01-21 00:11:44 +01:00
|
|
|
writeU8(os, legacy_facedir_simple);
|
|
|
|
writeU8(os, legacy_wallmounted);
|
2012-03-23 19:23:03 +01:00
|
|
|
serializeSimpleSoundSpec(sound_footstep, os);
|
2012-03-24 10:10:28 +01:00
|
|
|
serializeSimpleSoundSpec(sound_dig, os);
|
2012-03-24 02:28:08 +01:00
|
|
|
serializeSimpleSoundSpec(sound_dug, os);
|
2013-03-23 23:15:30 +01:00
|
|
|
writeU8(os, rightclickable);
|
2013-06-19 16:30:22 +02:00
|
|
|
writeU8(os, drowning);
|
2013-07-13 19:48:14 +02:00
|
|
|
writeU8(os, leveled);
|
2013-07-16 16:28:18 +02:00
|
|
|
writeU8(os, liquid_range);
|
2014-07-25 07:35:55 +02:00
|
|
|
writeU8(os, waving);
|
2013-07-20 21:25:21 +02:00
|
|
|
// Stuff below should be moved to correct place in a version that otherwise changes
|
|
|
|
// the protocol version
|
2014-10-15 04:13:53 +02:00
|
|
|
os<<serializeString(mesh);
|
2014-10-18 18:46:16 +02:00
|
|
|
collision_box.serialize(os, protocol_version);
|
2015-12-30 05:22:58 +01:00
|
|
|
writeU8(os, floodable);
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
writeU16(os, connects_to_ids.size());
|
|
|
|
for (std::set<content_t>::const_iterator i = connects_to_ids.begin();
|
|
|
|
i != connects_to_ids.end(); ++i)
|
|
|
|
writeU16(os, *i);
|
Allow nodes to specify which sides to connect to.
NDT_CONNECTED attempts to connect to any side of nodes that it can
connect to, which is troublesome for FACEDIR type nodes that generally
may only have one usable face, and can be rotated.
We introduce a node parameter `connect_sides` that is valid for
any node type. If specified, it lists faces of the node (in "top",
"bottom", "front", "left", "back", "right", form, as array) that
connecting nodeboxes can connect to. "front" corresponds to the south
facing side of a node with facedir = 0.
If the node is rotatable using *simple* FACEDIR, then the attached
face is properly rotated before checking. This allows e.g. a chest
to be attached to only from the rear side.
2016-03-04 08:18:04 +01:00
|
|
|
writeU8(os, connect_sides);
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
|
2012-01-12 06:10:39 +01:00
|
|
|
void ContentFeatures::deSerialize(std::istream &is)
|
2011-11-15 18:58:36 +01:00
|
|
|
{
|
|
|
|
int version = readU8(is);
|
2016-01-24 04:53:27 +01:00
|
|
|
if (version < 7) {
|
2012-11-26 22:59:03 +01:00
|
|
|
deSerializeOld(is, version);
|
|
|
|
return;
|
2016-01-24 04:53:27 +01:00
|
|
|
} else if (version > 8) {
|
|
|
|
throw SerializationError("unsupported ContentFeatures version");
|
2012-11-26 08:49:31 +01:00
|
|
|
}
|
2012-11-26 22:59:03 +01:00
|
|
|
|
|
|
|
name = deSerializeString(is);
|
|
|
|
groups.clear();
|
|
|
|
u32 groups_size = readU16(is);
|
2014-07-25 07:35:55 +02:00
|
|
|
for(u32 i = 0; i < groups_size; i++){
|
2012-11-26 22:59:03 +01:00
|
|
|
std::string name = deSerializeString(is);
|
|
|
|
int value = readS16(is);
|
|
|
|
groups[name] = value;
|
2012-02-28 18:45:23 +01:00
|
|
|
}
|
2012-11-26 22:59:03 +01:00
|
|
|
drawtype = (enum NodeDrawType)readU8(is);
|
Backface culling: Ignore setting in tiledef from old servers.
Outdated servers are always sending tiledefs with culling
enabled no matter what, as the value was previously entirely
ignored.
To compensate, we must (1) detect that we're running against
an old server with a new client, and (2) disable culling for
mesh, plantlike, firelike and liquid draw types no matter what
the server is telling us.
In order to achieve this, we need to bump the protocol version
since we cannot rely on the tiledef version, and test for it
being older. I've bumped the protocol version, although that
should have likely happened in the actual change that introduced
the new backface_culling PR #3578. Fortunately that's only 2
commits back at this point.
We also explicitly test for the drawtype to assure we are not
changing the culling value for other nodes, where it should
remain enabled.
This was tested against various pub servers, including 0.4.13 and
0.4.12.
Fixes #3598
2016-01-21 23:40:24 +01:00
|
|
|
|
2012-11-26 22:59:03 +01:00
|
|
|
visual_scale = readF1000(is);
|
|
|
|
if(readU8(is) != 6)
|
|
|
|
throw SerializationError("unsupported tile count");
|
2014-07-25 07:35:55 +02:00
|
|
|
for(u32 i = 0; i < 6; i++)
|
2016-01-24 04:53:27 +01:00
|
|
|
tiledef[i].deSerialize(is, version, drawtype);
|
2012-11-26 22:59:03 +01:00
|
|
|
if(readU8(is) != CF_SPECIAL_COUNT)
|
|
|
|
throw SerializationError("unsupported CF_SPECIAL_COUNT");
|
2014-07-25 07:35:55 +02:00
|
|
|
for(u32 i = 0; i < CF_SPECIAL_COUNT; i++)
|
2016-01-24 04:53:27 +01:00
|
|
|
tiledef_special[i].deSerialize(is, version, drawtype);
|
2012-11-26 22:59:03 +01:00
|
|
|
alpha = readU8(is);
|
|
|
|
post_effect_color.setAlpha(readU8(is));
|
|
|
|
post_effect_color.setRed(readU8(is));
|
|
|
|
post_effect_color.setGreen(readU8(is));
|
|
|
|
post_effect_color.setBlue(readU8(is));
|
|
|
|
param_type = (enum ContentParamType)readU8(is);
|
|
|
|
param_type_2 = (enum ContentParamType2)readU8(is);
|
|
|
|
is_ground_content = readU8(is);
|
|
|
|
light_propagates = readU8(is);
|
|
|
|
sunlight_propagates = readU8(is);
|
|
|
|
walkable = readU8(is);
|
|
|
|
pointable = readU8(is);
|
|
|
|
diggable = readU8(is);
|
|
|
|
climbable = readU8(is);
|
|
|
|
buildable_to = readU8(is);
|
|
|
|
deSerializeString(is); // legacy: used to be metadata_name
|
|
|
|
liquid_type = (enum LiquidType)readU8(is);
|
|
|
|
liquid_alternative_flowing = deSerializeString(is);
|
|
|
|
liquid_alternative_source = deSerializeString(is);
|
|
|
|
liquid_viscosity = readU8(is);
|
|
|
|
liquid_renewable = readU8(is);
|
|
|
|
light_source = readU8(is);
|
|
|
|
damage_per_second = readU32(is);
|
|
|
|
node_box.deSerialize(is);
|
|
|
|
selection_box.deSerialize(is);
|
|
|
|
legacy_facedir_simple = readU8(is);
|
|
|
|
legacy_wallmounted = readU8(is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_footstep, is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_dig, is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_dug, is);
|
2013-03-23 23:15:30 +01:00
|
|
|
rightclickable = readU8(is);
|
2013-07-20 21:25:21 +02:00
|
|
|
drowning = readU8(is);
|
|
|
|
leveled = readU8(is);
|
|
|
|
liquid_range = readU8(is);
|
2014-07-25 07:35:55 +02:00
|
|
|
waving = readU8(is);
|
2012-11-26 22:59:03 +01:00
|
|
|
// If you add anything here, insert it primarily inside the try-catch
|
|
|
|
// block to not need to increase the version.
|
|
|
|
try{
|
|
|
|
// Stuff below should be moved to correct place in a version that
|
|
|
|
// otherwise changes the protocol version
|
2014-10-15 04:13:53 +02:00
|
|
|
mesh = deSerializeString(is);
|
2014-10-18 18:46:16 +02:00
|
|
|
collision_box.deSerialize(is);
|
2015-12-30 05:22:58 +01:00
|
|
|
floodable = readU8(is);
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
u16 connects_to_size = readU16(is);
|
|
|
|
for (u16 i = 0; i < connects_to_size; i++)
|
|
|
|
connects_to_ids.insert(readU16(is));
|
Allow nodes to specify which sides to connect to.
NDT_CONNECTED attempts to connect to any side of nodes that it can
connect to, which is troublesome for FACEDIR type nodes that generally
may only have one usable face, and can be rotated.
We introduce a node parameter `connect_sides` that is valid for
any node type. If specified, it lists faces of the node (in "top",
"bottom", "front", "left", "back", "right", form, as array) that
connecting nodeboxes can connect to. "front" corresponds to the south
facing side of a node with facedir = 0.
If the node is rotatable using *simple* FACEDIR, then the attached
face is properly rotated before checking. This allows e.g. a chest
to be attached to only from the rear side.
2016-03-04 08:18:04 +01:00
|
|
|
connect_sides = readU8(is);
|
2012-11-26 22:59:03 +01:00
|
|
|
}catch(SerializationError &e) {};
|
2011-11-15 13:43:15 +01:00
|
|
|
}
|
|
|
|
|
2011-11-15 21:41:49 +01:00
|
|
|
/*
|
|
|
|
CNodeDefManager
|
|
|
|
*/
|
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
class CNodeDefManager: public IWritableNodeDefManager {
|
2011-11-14 20:41:30 +01:00
|
|
|
public:
|
2014-10-03 09:16:43 +02:00
|
|
|
CNodeDefManager();
|
|
|
|
virtual ~CNodeDefManager();
|
|
|
|
void clear();
|
|
|
|
virtual IWritableNodeDefManager *clone();
|
2014-11-21 05:43:29 +01:00
|
|
|
inline virtual const ContentFeatures& get(content_t c) const;
|
|
|
|
inline virtual const ContentFeatures& get(const MapNode &n) const;
|
2014-10-03 09:16:43 +02:00
|
|
|
virtual bool getId(const std::string &name, content_t &result) const;
|
|
|
|
virtual content_t getId(const std::string &name) const;
|
2016-02-09 07:08:31 +01:00
|
|
|
virtual bool getIds(const std::string &name, std::set<content_t> &result) const;
|
2014-10-03 09:16:43 +02:00
|
|
|
virtual const ContentFeatures& get(const std::string &name) const;
|
|
|
|
content_t allocateId();
|
|
|
|
virtual content_t set(const std::string &name, const ContentFeatures &def);
|
|
|
|
virtual content_t allocateDummy(const std::string &name);
|
|
|
|
virtual void updateAliases(IItemDefManager *idef);
|
2015-03-30 12:55:29 +02:00
|
|
|
virtual void applyTextureOverrides(const std::string &override_filepath);
|
2015-03-15 07:25:22 +01:00
|
|
|
virtual void updateTextures(IGameDef *gamedef,
|
2015-05-05 22:52:06 +02:00
|
|
|
void (*progress_cbk)(void *progress_args, u32 progress, u32 max_progress),
|
|
|
|
void *progress_cbk_args);
|
|
|
|
void serialize(std::ostream &os, u16 protocol_version) const;
|
2014-10-03 09:16:43 +02:00
|
|
|
void deSerialize(std::istream &is);
|
2014-12-17 09:20:17 +01:00
|
|
|
|
2015-01-04 22:32:31 +01:00
|
|
|
inline virtual bool getNodeRegistrationStatus() const;
|
|
|
|
inline virtual void setNodeRegistrationStatus(bool completed);
|
|
|
|
|
2015-05-07 08:34:15 +02:00
|
|
|
virtual void pendNodeResolve(NodeResolver *nr);
|
2015-04-16 10:12:26 +02:00
|
|
|
virtual bool cancelNodeResolveCallback(NodeResolver *nr);
|
|
|
|
virtual void runNodeResolveCallbacks();
|
2015-05-05 22:52:06 +02:00
|
|
|
virtual void resetNodeResolveState();
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
virtual void mapNodeboxConnections();
|
Allow nodes to specify which sides to connect to.
NDT_CONNECTED attempts to connect to any side of nodes that it can
connect to, which is troublesome for FACEDIR type nodes that generally
may only have one usable face, and can be rotated.
We introduce a node parameter `connect_sides` that is valid for
any node type. If specified, it lists faces of the node (in "top",
"bottom", "front", "left", "back", "right", form, as array) that
connecting nodeboxes can connect to. "front" corresponds to the south
facing side of a node with facedir = 0.
If the node is rotatable using *simple* FACEDIR, then the attached
face is properly rotated before checking. This allows e.g. a chest
to be attached to only from the rear side.
2016-03-04 08:18:04 +01:00
|
|
|
virtual bool nodeboxConnects(MapNode from, MapNode to, u8 connect_face);
|
2012-11-26 03:16:48 +01:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
private:
|
|
|
|
void addNameIdMapping(content_t i, std::string name);
|
|
|
|
#ifndef SERVER
|
|
|
|
void fillTileAttribs(ITextureSource *tsrc, TileSpec *tile, TileDef *tiledef,
|
2014-10-03 17:20:29 +02:00
|
|
|
u32 shader_id, bool use_normal_texture, bool backface_culling,
|
|
|
|
u8 alpha, u8 material_type);
|
2014-10-03 09:16:43 +02:00
|
|
|
#endif
|
2013-07-14 00:55:47 +02:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
// Features indexed by id
|
|
|
|
std::vector<ContentFeatures> m_content_features;
|
|
|
|
|
|
|
|
// A mapping for fast converting back and forth between names and ids
|
|
|
|
NameIdMapping m_name_id_mapping;
|
|
|
|
|
|
|
|
// Like m_name_id_mapping, but only from names to ids, and includes
|
|
|
|
// item aliases too. Updated by updateAliases()
|
|
|
|
// Note: Not serialized.
|
|
|
|
|
|
|
|
std::map<std::string, content_t> m_name_id_mapping_with_aliases;
|
|
|
|
|
|
|
|
// A mapping from groups to a list of content_ts (and their levels)
|
|
|
|
// that belong to it. Necessary for a direct lookup in getIds().
|
|
|
|
// Note: Not serialized.
|
|
|
|
std::map<std::string, GroupItems> m_group_to_items;
|
|
|
|
|
|
|
|
// Next possibly free id
|
|
|
|
content_t m_next_id;
|
2014-10-08 21:28:14 +02:00
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
// NodeResolvers to callback once node registration has ended
|
|
|
|
std::vector<NodeResolver *> m_pending_resolve_callbacks;
|
2015-01-04 22:32:31 +01:00
|
|
|
|
|
|
|
// True when all nodes have been registered
|
|
|
|
bool m_node_registration_complete;
|
2014-10-03 09:16:43 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2014-12-17 09:20:17 +01:00
|
|
|
CNodeDefManager::CNodeDefManager()
|
2014-10-03 09:16:43 +02:00
|
|
|
{
|
|
|
|
clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CNodeDefManager::~CNodeDefManager()
|
|
|
|
{
|
2014-10-21 05:12:15 +02:00
|
|
|
#ifndef SERVER
|
|
|
|
for (u32 i = 0; i < m_content_features.size(); i++) {
|
|
|
|
ContentFeatures *f = &m_content_features[i];
|
|
|
|
for (u32 j = 0; j < 24; j++) {
|
|
|
|
if (f->mesh_ptr[j])
|
|
|
|
f->mesh_ptr[j]->drop();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CNodeDefManager::clear()
|
|
|
|
{
|
|
|
|
m_content_features.clear();
|
|
|
|
m_name_id_mapping.clear();
|
|
|
|
m_name_id_mapping_with_aliases.clear();
|
|
|
|
m_group_to_items.clear();
|
|
|
|
m_next_id = 0;
|
|
|
|
|
2015-05-05 22:52:06 +02:00
|
|
|
resetNodeResolveState();
|
2015-01-05 04:39:57 +01:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
u32 initial_length = 0;
|
|
|
|
initial_length = MYMAX(initial_length, CONTENT_UNKNOWN + 1);
|
|
|
|
initial_length = MYMAX(initial_length, CONTENT_AIR + 1);
|
|
|
|
initial_length = MYMAX(initial_length, CONTENT_IGNORE + 1);
|
|
|
|
m_content_features.resize(initial_length);
|
|
|
|
|
|
|
|
// Set CONTENT_UNKNOWN
|
2011-11-14 20:41:30 +01:00
|
|
|
{
|
2014-10-03 09:16:43 +02:00
|
|
|
ContentFeatures f;
|
|
|
|
f.name = "unknown";
|
|
|
|
// Insert directly into containers
|
|
|
|
content_t c = CONTENT_UNKNOWN;
|
|
|
|
m_content_features[c] = f;
|
|
|
|
addNameIdMapping(c, f.name);
|
2011-11-14 20:41:30 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
|
|
|
|
// Set CONTENT_AIR
|
2011-11-14 20:41:30 +01:00
|
|
|
{
|
2014-10-03 09:16:43 +02:00
|
|
|
ContentFeatures f;
|
|
|
|
f.name = "air";
|
|
|
|
f.drawtype = NDT_AIRLIKE;
|
|
|
|
f.param_type = CPT_LIGHT;
|
|
|
|
f.light_propagates = true;
|
|
|
|
f.sunlight_propagates = true;
|
|
|
|
f.walkable = false;
|
|
|
|
f.pointable = false;
|
|
|
|
f.diggable = false;
|
|
|
|
f.buildable_to = true;
|
2015-12-30 05:22:58 +01:00
|
|
|
f.floodable = true;
|
2014-10-03 09:16:43 +02:00
|
|
|
f.is_ground_content = true;
|
|
|
|
// Insert directly into containers
|
|
|
|
content_t c = CONTENT_AIR;
|
|
|
|
m_content_features[c] = f;
|
|
|
|
addNameIdMapping(c, f.name);
|
2011-11-14 20:41:30 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
|
|
|
|
// Set CONTENT_IGNORE
|
2011-11-16 12:03:28 +01:00
|
|
|
{
|
2014-10-03 09:16:43 +02:00
|
|
|
ContentFeatures f;
|
|
|
|
f.name = "ignore";
|
|
|
|
f.drawtype = NDT_AIRLIKE;
|
|
|
|
f.param_type = CPT_NONE;
|
|
|
|
f.light_propagates = false;
|
|
|
|
f.sunlight_propagates = false;
|
|
|
|
f.walkable = false;
|
|
|
|
f.pointable = false;
|
|
|
|
f.diggable = false;
|
|
|
|
f.buildable_to = true; // A way to remove accidental CONTENT_IGNOREs
|
|
|
|
f.is_ground_content = true;
|
|
|
|
// Insert directly into containers
|
|
|
|
content_t c = CONTENT_IGNORE;
|
|
|
|
m_content_features[c] = f;
|
|
|
|
addNameIdMapping(c, f.name);
|
2011-11-16 12:03:28 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
IWritableNodeDefManager *CNodeDefManager::clone()
|
|
|
|
{
|
|
|
|
CNodeDefManager *mgr = new CNodeDefManager();
|
|
|
|
*mgr = *this;
|
|
|
|
return mgr;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-11-21 05:43:29 +01:00
|
|
|
inline const ContentFeatures& CNodeDefManager::get(content_t c) const
|
2014-10-03 09:16:43 +02:00
|
|
|
{
|
2014-11-21 05:43:29 +01:00
|
|
|
return c < m_content_features.size()
|
|
|
|
? m_content_features[c] : m_content_features[CONTENT_UNKNOWN];
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-11-21 05:43:29 +01:00
|
|
|
inline const ContentFeatures& CNodeDefManager::get(const MapNode &n) const
|
2014-10-03 09:16:43 +02:00
|
|
|
{
|
|
|
|
return get(n.getContent());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool CNodeDefManager::getId(const std::string &name, content_t &result) const
|
|
|
|
{
|
|
|
|
std::map<std::string, content_t>::const_iterator
|
|
|
|
i = m_name_id_mapping_with_aliases.find(name);
|
|
|
|
if(i == m_name_id_mapping_with_aliases.end())
|
|
|
|
return false;
|
|
|
|
result = i->second;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
content_t CNodeDefManager::getId(const std::string &name) const
|
|
|
|
{
|
|
|
|
content_t id = CONTENT_IGNORE;
|
|
|
|
getId(name, id);
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-02-09 07:08:31 +01:00
|
|
|
bool CNodeDefManager::getIds(const std::string &name,
|
2014-10-03 09:49:06 +02:00
|
|
|
std::set<content_t> &result) const
|
2014-10-03 09:16:43 +02:00
|
|
|
{
|
|
|
|
//TimeTaker t("getIds", NULL, PRECISION_MICRO);
|
|
|
|
if (name.substr(0,6) != "group:") {
|
2011-11-19 17:48:09 +01:00
|
|
|
content_t id = CONTENT_IGNORE;
|
2016-02-09 07:08:31 +01:00
|
|
|
bool exists = getId(name, id);
|
|
|
|
if (exists)
|
2014-10-03 09:16:43 +02:00
|
|
|
result.insert(id);
|
2016-02-09 07:08:31 +01:00
|
|
|
return exists;
|
2011-11-19 17:48:09 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
std::string group = name.substr(6);
|
|
|
|
|
|
|
|
std::map<std::string, GroupItems>::const_iterator
|
|
|
|
i = m_group_to_items.find(group);
|
|
|
|
if (i == m_group_to_items.end())
|
2016-02-09 07:08:31 +01:00
|
|
|
return true;
|
2014-10-03 09:16:43 +02:00
|
|
|
|
|
|
|
const GroupItems &items = i->second;
|
|
|
|
for (GroupItems::const_iterator j = items.begin();
|
|
|
|
j != items.end(); ++j) {
|
|
|
|
if ((*j).second != 0)
|
|
|
|
result.insert((*j).first);
|
|
|
|
}
|
|
|
|
//printf("getIds: %dus\n", t.stop());
|
2016-02-09 07:08:31 +01:00
|
|
|
return true;
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const ContentFeatures& CNodeDefManager::get(const std::string &name) const
|
|
|
|
{
|
|
|
|
content_t id = CONTENT_UNKNOWN;
|
|
|
|
getId(name, id);
|
|
|
|
return get(id);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// returns CONTENT_IGNORE if no free ID found
|
|
|
|
content_t CNodeDefManager::allocateId()
|
|
|
|
{
|
|
|
|
for (content_t id = m_next_id;
|
|
|
|
id >= m_next_id; // overflow?
|
|
|
|
++id) {
|
|
|
|
while (id >= m_content_features.size()) {
|
|
|
|
m_content_features.push_back(ContentFeatures());
|
2012-03-31 11:30:11 +02:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
const ContentFeatures &f = m_content_features[id];
|
|
|
|
if (f.name == "") {
|
|
|
|
m_next_id = id + 1;
|
|
|
|
return id;
|
2013-03-31 00:12:23 +01:00
|
|
|
}
|
2011-11-16 13:36:33 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
// If we arrive here, an overflow occurred in id.
|
|
|
|
// That means no ID was found
|
|
|
|
return CONTENT_IGNORE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// IWritableNodeDefManager
|
|
|
|
content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &def)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
// Pre-conditions
|
2014-10-03 09:16:43 +02:00
|
|
|
assert(name != "");
|
|
|
|
assert(name == def.name);
|
|
|
|
|
|
|
|
// Don't allow redefining ignore (but allow air and unknown)
|
|
|
|
if (name == "ignore") {
|
2015-10-14 07:26:03 +02:00
|
|
|
warningstream << "NodeDefManager: Ignoring "
|
2014-10-03 09:16:43 +02:00
|
|
|
"CONTENT_IGNORE redefinition"<<std::endl;
|
2013-07-14 00:55:47 +02:00
|
|
|
return CONTENT_IGNORE;
|
|
|
|
}
|
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
content_t id = CONTENT_IGNORE;
|
|
|
|
if (!m_name_id_mapping.getId(name, id)) { // ignore aliases
|
|
|
|
// Get new id
|
|
|
|
id = allocateId();
|
|
|
|
if (id == CONTENT_IGNORE) {
|
2015-10-14 07:26:03 +02:00
|
|
|
warningstream << "NodeDefManager: Absolute "
|
2014-10-03 09:16:43 +02:00
|
|
|
"limit reached" << std::endl;
|
2013-07-14 00:55:47 +02:00
|
|
|
return CONTENT_IGNORE;
|
2011-11-25 21:45:55 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
assert(id != CONTENT_IGNORE);
|
|
|
|
addNameIdMapping(id, name);
|
|
|
|
}
|
|
|
|
m_content_features[id] = def;
|
|
|
|
verbosestream << "NodeDefManager: registering content id \"" << id
|
|
|
|
<< "\": name=\"" << def.name << "\""<<std::endl;
|
2013-07-14 00:55:47 +02:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
// Add this content to the list of all groups it belongs to
|
|
|
|
// FIXME: This should remove a node from groups it no longer
|
|
|
|
// belongs to when a node is re-registered
|
|
|
|
for (ItemGroupList::const_iterator i = def.groups.begin();
|
|
|
|
i != def.groups.end(); ++i) {
|
|
|
|
std::string group_name = i->first;
|
|
|
|
|
|
|
|
std::map<std::string, GroupItems>::iterator
|
|
|
|
j = m_group_to_items.find(group_name);
|
|
|
|
if (j == m_group_to_items.end()) {
|
|
|
|
m_group_to_items[group_name].push_back(
|
2015-03-30 12:55:29 +02:00
|
|
|
std::make_pair(id, i->second));
|
2014-10-03 09:16:43 +02:00
|
|
|
} else {
|
|
|
|
GroupItems &items = j->second;
|
|
|
|
items.push_back(std::make_pair(id, i->second));
|
2013-03-31 00:12:23 +01:00
|
|
|
}
|
2011-11-16 12:03:28 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
content_t CNodeDefManager::allocateDummy(const std::string &name)
|
|
|
|
{
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(name != ""); // Pre-condition
|
2014-10-03 09:16:43 +02:00
|
|
|
ContentFeatures f;
|
|
|
|
f.name = name;
|
|
|
|
return set(name, f);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CNodeDefManager::updateAliases(IItemDefManager *idef)
|
|
|
|
{
|
|
|
|
std::set<std::string> all = idef->getAll();
|
|
|
|
m_name_id_mapping_with_aliases.clear();
|
|
|
|
for (std::set<std::string>::iterator
|
2015-08-25 22:23:05 +02:00
|
|
|
i = all.begin(); i != all.end(); ++i) {
|
2014-10-03 09:16:43 +02:00
|
|
|
std::string name = *i;
|
|
|
|
std::string convert_to = idef->getAlias(name);
|
|
|
|
content_t id;
|
|
|
|
if (m_name_id_mapping.getId(convert_to, id)) {
|
|
|
|
m_name_id_mapping_with_aliases.insert(
|
2015-03-30 12:55:29 +02:00
|
|
|
std::make_pair(name, id));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void CNodeDefManager::applyTextureOverrides(const std::string &override_filepath)
|
|
|
|
{
|
|
|
|
infostream << "CNodeDefManager::applyTextureOverrides(): Applying "
|
|
|
|
"overrides to textures from " << override_filepath << std::endl;
|
|
|
|
|
|
|
|
std::ifstream infile(override_filepath.c_str());
|
|
|
|
std::string line;
|
|
|
|
int line_c = 0;
|
|
|
|
while (std::getline(infile, line)) {
|
|
|
|
line_c++;
|
|
|
|
if (trim(line) == "")
|
|
|
|
continue;
|
|
|
|
std::vector<std::string> splitted = str_split(line, ' ');
|
|
|
|
if (splitted.size() != 3) {
|
|
|
|
errorstream << override_filepath
|
|
|
|
<< ":" << line_c << " Could not apply texture override \""
|
|
|
|
<< line << "\": Syntax error" << std::endl;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
content_t id;
|
|
|
|
if (!getId(splitted[0], id)) {
|
|
|
|
errorstream << override_filepath
|
|
|
|
<< ":" << line_c << " Could not apply texture override \""
|
|
|
|
<< line << "\": Unknown node \""
|
|
|
|
<< splitted[0] << "\"" << std::endl;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ContentFeatures &nodedef = m_content_features[id];
|
|
|
|
|
|
|
|
if (splitted[1] == "top")
|
|
|
|
nodedef.tiledef[0].name = splitted[2];
|
|
|
|
else if (splitted[1] == "bottom")
|
|
|
|
nodedef.tiledef[1].name = splitted[2];
|
|
|
|
else if (splitted[1] == "right")
|
|
|
|
nodedef.tiledef[2].name = splitted[2];
|
|
|
|
else if (splitted[1] == "left")
|
|
|
|
nodedef.tiledef[3].name = splitted[2];
|
|
|
|
else if (splitted[1] == "back")
|
|
|
|
nodedef.tiledef[4].name = splitted[2];
|
|
|
|
else if (splitted[1] == "front")
|
|
|
|
nodedef.tiledef[5].name = splitted[2];
|
|
|
|
else if (splitted[1] == "all" || splitted[1] == "*")
|
|
|
|
for (int i = 0; i < 6; i++)
|
|
|
|
nodedef.tiledef[i].name = splitted[2];
|
|
|
|
else if (splitted[1] == "sides")
|
|
|
|
for (int i = 2; i < 6; i++)
|
|
|
|
nodedef.tiledef[i].name = splitted[2];
|
|
|
|
else {
|
|
|
|
errorstream << override_filepath
|
|
|
|
<< ":" << line_c << " Could not apply texture override \""
|
|
|
|
<< line << "\": Unknown node side \""
|
|
|
|
<< splitted[1] << "\"" << std::endl;
|
|
|
|
continue;
|
2011-12-03 22:50:31 +01:00
|
|
|
}
|
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
2015-03-15 07:25:22 +01:00
|
|
|
void CNodeDefManager::updateTextures(IGameDef *gamedef,
|
|
|
|
void (*progress_callback)(void *progress_args, u32 progress, u32 max_progress),
|
|
|
|
void *progress_callback_args)
|
2014-10-03 09:16:43 +02:00
|
|
|
{
|
2011-11-14 21:07:42 +01:00
|
|
|
#ifndef SERVER
|
2014-10-03 09:16:43 +02:00
|
|
|
infostream << "CNodeDefManager::updateTextures(): Updating "
|
|
|
|
"textures in node definitions" << std::endl;
|
2014-10-15 04:13:53 +02:00
|
|
|
ITextureSource *tsrc = gamedef->tsrc();
|
|
|
|
IShaderSource *shdsrc = gamedef->getShaderSource();
|
2014-10-21 05:12:15 +02:00
|
|
|
scene::ISceneManager* smgr = gamedef->getSceneManager();
|
|
|
|
scene::IMeshManipulator* meshmanip = smgr->getMeshManipulator();
|
2012-01-12 06:10:39 +01:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
bool connected_glass = g_settings->getBool("connected_glass");
|
|
|
|
bool opaque_water = g_settings->getBool("opaque_water");
|
|
|
|
bool enable_shaders = g_settings->getBool("enable_shaders");
|
|
|
|
bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
|
|
|
|
bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
|
2014-10-28 08:02:28 +01:00
|
|
|
bool enable_mesh_cache = g_settings->getBool("enable_mesh_cache");
|
2015-06-28 12:17:36 +02:00
|
|
|
bool enable_minimap = g_settings->getBool("enable_minimap");
|
2015-07-08 11:20:07 +02:00
|
|
|
std::string leaves_style = g_settings->get("leaves_style");
|
2014-05-14 23:19:31 +02:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
bool use_normal_texture = enable_shaders &&
|
|
|
|
(enable_bumpmapping || enable_parallax_occlusion);
|
2013-12-03 17:21:40 +01:00
|
|
|
|
2015-03-15 07:25:22 +01:00
|
|
|
u32 size = m_content_features.size();
|
|
|
|
|
|
|
|
for (u32 i = 0; i < size; i++) {
|
2014-10-03 09:16:43 +02:00
|
|
|
ContentFeatures *f = &m_content_features[i];
|
|
|
|
|
2015-06-22 04:34:56 +02:00
|
|
|
// minimap pixel color - the average color of a texture
|
2015-06-28 12:17:36 +02:00
|
|
|
if (enable_minimap && f->tiledef[0].name != "")
|
2015-06-22 04:34:56 +02:00
|
|
|
f->minimap_color = tsrc->getTextureAverageColor(f->tiledef[0].name);
|
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
// Figure out the actual tiles to use
|
|
|
|
TileDef tiledef[6];
|
|
|
|
for (u32 j = 0; j < 6; j++) {
|
|
|
|
tiledef[j] = f->tiledef[j];
|
|
|
|
if (tiledef[j].name == "")
|
|
|
|
tiledef[j].name = "unknown_node.png";
|
|
|
|
}
|
|
|
|
|
|
|
|
bool is_liquid = false;
|
|
|
|
bool is_water_surface = false;
|
|
|
|
|
|
|
|
u8 material_type = (f->alpha == 255) ?
|
|
|
|
TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
|
|
|
|
|
|
|
|
switch (f->drawtype) {
|
|
|
|
default:
|
|
|
|
case NDT_NORMAL:
|
|
|
|
f->solidness = 2;
|
|
|
|
break;
|
|
|
|
case NDT_AIRLIKE:
|
|
|
|
f->solidness = 0;
|
|
|
|
break;
|
|
|
|
case NDT_LIQUID:
|
|
|
|
assert(f->liquid_type == LIQUID_SOURCE);
|
|
|
|
if (opaque_water)
|
|
|
|
f->alpha = 255;
|
2016-02-26 23:30:50 +01:00
|
|
|
f->solidness = 1;
|
2014-10-03 09:16:43 +02:00
|
|
|
is_liquid = true;
|
|
|
|
break;
|
|
|
|
case NDT_FLOWINGLIQUID:
|
|
|
|
assert(f->liquid_type == LIQUID_FLOWING);
|
|
|
|
f->solidness = 0;
|
|
|
|
if (opaque_water)
|
|
|
|
f->alpha = 255;
|
|
|
|
is_liquid = true;
|
|
|
|
break;
|
|
|
|
case NDT_GLASSLIKE:
|
|
|
|
f->solidness = 0;
|
|
|
|
f->visual_solidness = 1;
|
|
|
|
break;
|
|
|
|
case NDT_GLASSLIKE_FRAMED:
|
|
|
|
f->solidness = 0;
|
|
|
|
f->visual_solidness = 1;
|
|
|
|
break;
|
|
|
|
case NDT_GLASSLIKE_FRAMED_OPTIONAL:
|
|
|
|
f->solidness = 0;
|
|
|
|
f->visual_solidness = 1;
|
|
|
|
f->drawtype = connected_glass ? NDT_GLASSLIKE_FRAMED : NDT_GLASSLIKE;
|
|
|
|
break;
|
|
|
|
case NDT_ALLFACES:
|
|
|
|
f->solidness = 0;
|
|
|
|
f->visual_solidness = 1;
|
|
|
|
break;
|
|
|
|
case NDT_ALLFACES_OPTIONAL:
|
2015-07-08 11:20:07 +02:00
|
|
|
if (leaves_style == "fancy") {
|
2014-10-03 09:16:43 +02:00
|
|
|
f->drawtype = NDT_ALLFACES;
|
2011-11-15 18:58:36 +01:00
|
|
|
f->solidness = 0;
|
2014-10-03 09:16:43 +02:00
|
|
|
f->visual_solidness = 1;
|
2015-07-08 11:20:07 +02:00
|
|
|
} else if (leaves_style == "simple") {
|
|
|
|
for (u32 j = 0; j < 6; j++) {
|
|
|
|
if (f->tiledef_special[j].name != "")
|
|
|
|
tiledef[j].name = f->tiledef_special[j].name;
|
|
|
|
}
|
|
|
|
f->drawtype = NDT_GLASSLIKE;
|
|
|
|
f->solidness = 0;
|
|
|
|
f->visual_solidness = 1;
|
2014-10-03 09:16:43 +02:00
|
|
|
} else {
|
|
|
|
f->drawtype = NDT_NORMAL;
|
|
|
|
f->solidness = 2;
|
|
|
|
for (u32 i = 0; i < 6; i++)
|
|
|
|
tiledef[i].name += std::string("^[noalpha");
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
if (f->waving == 1)
|
|
|
|
material_type = TILE_MATERIAL_WAVING_LEAVES;
|
|
|
|
break;
|
|
|
|
case NDT_PLANTLIKE:
|
|
|
|
f->solidness = 0;
|
|
|
|
if (f->waving == 1)
|
|
|
|
material_type = TILE_MATERIAL_WAVING_PLANTS;
|
|
|
|
break;
|
|
|
|
case NDT_FIRELIKE:
|
2014-10-03 09:49:06 +02:00
|
|
|
f->solidness = 0;
|
|
|
|
break;
|
2014-10-15 04:13:53 +02:00
|
|
|
case NDT_MESH:
|
|
|
|
f->solidness = 0;
|
|
|
|
break;
|
2014-10-03 09:16:43 +02:00
|
|
|
case NDT_TORCHLIKE:
|
|
|
|
case NDT_SIGNLIKE:
|
|
|
|
case NDT_FENCELIKE:
|
|
|
|
case NDT_RAILLIKE:
|
|
|
|
case NDT_NODEBOX:
|
|
|
|
f->solidness = 0;
|
|
|
|
break;
|
|
|
|
}
|
2011-11-15 18:58:36 +01:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
if (is_liquid) {
|
|
|
|
material_type = (f->alpha == 255) ?
|
|
|
|
TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
|
|
|
|
if (f->name == "default:water_source")
|
|
|
|
is_water_surface = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
u32 tile_shader[6];
|
|
|
|
for (u16 j = 0; j < 6; j++) {
|
|
|
|
tile_shader[j] = shdsrc->getShader("nodes_shader",
|
|
|
|
material_type, f->drawtype);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_water_surface) {
|
|
|
|
tile_shader[0] = shdsrc->getShader("water_surface_shader",
|
|
|
|
material_type, f->drawtype);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Tiles (fill in f->tiles[])
|
|
|
|
for (u16 j = 0; j < 6; j++) {
|
|
|
|
fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j],
|
2016-01-19 05:44:46 +01:00
|
|
|
use_normal_texture, f->tiledef[j].backface_culling, f->alpha, material_type);
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Special tiles (fill in f->special_tiles[])
|
|
|
|
for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) {
|
|
|
|
fillTileAttribs(tsrc, &f->special_tiles[j], &f->tiledef_special[j],
|
2014-10-03 17:20:29 +02:00
|
|
|
tile_shader[j], use_normal_texture,
|
|
|
|
f->tiledef_special[j].backface_culling, f->alpha, material_type);
|
2011-11-14 21:07:42 +01:00
|
|
|
}
|
2014-10-15 04:13:53 +02:00
|
|
|
|
|
|
|
if ((f->drawtype == NDT_MESH) && (f->mesh != "")) {
|
2014-10-28 08:02:28 +01:00
|
|
|
// Meshnode drawtype
|
|
|
|
// Read the mesh and apply scale
|
2014-10-15 04:13:53 +02:00
|
|
|
f->mesh_ptr[0] = gamedef->getMesh(f->mesh);
|
2014-10-21 05:12:15 +02:00
|
|
|
if (f->mesh_ptr[0]){
|
|
|
|
v3f scale = v3f(1.0, 1.0, 1.0) * BS * f->visual_scale;
|
|
|
|
scaleMesh(f->mesh_ptr[0], scale);
|
|
|
|
recalculateBoundingBox(f->mesh_ptr[0]);
|
2014-12-05 01:04:25 +01:00
|
|
|
meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
|
2014-10-21 05:12:15 +02:00
|
|
|
}
|
2014-12-11 06:41:54 +01:00
|
|
|
} else if ((f->drawtype == NDT_NODEBOX) &&
|
2014-10-21 05:12:15 +02:00
|
|
|
((f->node_box.type == NODEBOX_REGULAR) ||
|
|
|
|
(f->node_box.type == NODEBOX_FIXED)) &&
|
2014-10-15 04:13:53 +02:00
|
|
|
(!f->node_box.fixed.empty())) {
|
2014-10-28 08:02:28 +01:00
|
|
|
//Convert regular nodebox nodes to meshnodes
|
|
|
|
//Change the drawtype and apply scale
|
2014-10-15 04:13:53 +02:00
|
|
|
f->drawtype = NDT_MESH;
|
2016-02-07 04:08:43 +01:00
|
|
|
f->mesh_ptr[0] = convertNodeboxesToMesh(f->node_box.fixed);
|
2014-10-21 05:12:15 +02:00
|
|
|
v3f scale = v3f(1.0, 1.0, 1.0) * f->visual_scale;
|
|
|
|
scaleMesh(f->mesh_ptr[0], scale);
|
2014-10-15 04:13:53 +02:00
|
|
|
recalculateBoundingBox(f->mesh_ptr[0]);
|
2014-12-05 01:04:25 +01:00
|
|
|
meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
|
2014-10-15 04:13:53 +02:00
|
|
|
}
|
|
|
|
|
2014-10-28 08:02:28 +01:00
|
|
|
//Cache 6dfacedir and wallmounted rotated clones of meshes
|
|
|
|
if (enable_mesh_cache && f->mesh_ptr[0] && (f->param_type_2 == CPT2_FACEDIR)) {
|
2014-10-20 16:11:38 +02:00
|
|
|
for (u16 j = 1; j < 24; j++) {
|
|
|
|
f->mesh_ptr[j] = cloneMesh(f->mesh_ptr[0]);
|
|
|
|
rotateMeshBy6dFacedir(f->mesh_ptr[j], j);
|
|
|
|
recalculateBoundingBox(f->mesh_ptr[j]);
|
2014-10-28 08:02:28 +01:00
|
|
|
meshmanip->recalculateNormals(f->mesh_ptr[j], true, false);
|
|
|
|
}
|
|
|
|
} else if (enable_mesh_cache && f->mesh_ptr[0] && (f->param_type_2 == CPT2_WALLMOUNTED)) {
|
2014-11-19 22:17:54 +01:00
|
|
|
static const u8 wm_to_6d[6] = {20, 0, 16+1, 12+3, 8, 4+2};
|
2014-10-28 08:02:28 +01:00
|
|
|
for (u16 j = 1; j < 6; j++) {
|
|
|
|
f->mesh_ptr[j] = cloneMesh(f->mesh_ptr[0]);
|
|
|
|
rotateMeshBy6dFacedir(f->mesh_ptr[j], wm_to_6d[j]);
|
|
|
|
recalculateBoundingBox(f->mesh_ptr[j]);
|
|
|
|
meshmanip->recalculateNormals(f->mesh_ptr[j], true, false);
|
2014-10-15 04:13:53 +02:00
|
|
|
}
|
2014-10-28 08:02:28 +01:00
|
|
|
rotateMeshBy6dFacedir(f->mesh_ptr[0], wm_to_6d[0]);
|
|
|
|
recalculateBoundingBox(f->mesh_ptr[0]);
|
2014-12-11 06:41:54 +01:00
|
|
|
meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
|
2014-10-20 16:11:38 +02:00
|
|
|
}
|
2015-03-15 07:25:22 +01:00
|
|
|
|
|
|
|
progress_callback(progress_callback_args, i, size);
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
2011-11-14 21:07:42 +01:00
|
|
|
#endif
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef SERVER
|
|
|
|
void CNodeDefManager::fillTileAttribs(ITextureSource *tsrc, TileSpec *tile,
|
|
|
|
TileDef *tiledef, u32 shader_id, bool use_normal_texture,
|
2014-10-03 17:20:29 +02:00
|
|
|
bool backface_culling, u8 alpha, u8 material_type)
|
2014-10-03 09:16:43 +02:00
|
|
|
{
|
|
|
|
tile->shader_id = shader_id;
|
2015-03-31 02:04:19 +02:00
|
|
|
tile->texture = tsrc->getTextureForMesh(tiledef->name, &tile->texture_id);
|
2014-10-03 09:16:43 +02:00
|
|
|
tile->alpha = alpha;
|
|
|
|
tile->material_type = material_type;
|
|
|
|
|
2015-07-16 15:36:48 +02:00
|
|
|
// Normal texture and shader flags texture
|
|
|
|
if (use_normal_texture) {
|
2014-10-03 09:16:43 +02:00
|
|
|
tile->normal_texture = tsrc->getNormalTexture(tiledef->name);
|
2015-07-16 15:36:48 +02:00
|
|
|
}
|
2015-08-18 23:59:44 +02:00
|
|
|
tile->flags_texture = tsrc->getShaderFlagsTexture(tile->normal_texture ? true : false);
|
2014-10-03 09:16:43 +02:00
|
|
|
|
|
|
|
// Material flags
|
|
|
|
tile->material_flags = 0;
|
2014-10-03 15:33:32 +02:00
|
|
|
if (backface_culling)
|
2014-10-03 09:16:43 +02:00
|
|
|
tile->material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
|
|
|
|
if (tiledef->animation.type == TAT_VERTICAL_FRAMES)
|
|
|
|
tile->material_flags |= MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
|
2015-08-05 22:52:32 +02:00
|
|
|
if (tiledef->tileable_horizontal)
|
|
|
|
tile->material_flags |= MATERIAL_FLAG_TILEABLE_HORIZONTAL;
|
|
|
|
if (tiledef->tileable_vertical)
|
|
|
|
tile->material_flags |= MATERIAL_FLAG_TILEABLE_VERTICAL;
|
2014-10-03 09:16:43 +02:00
|
|
|
|
|
|
|
// Animation parameters
|
|
|
|
int frame_count = 1;
|
|
|
|
if (tile->material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) {
|
|
|
|
// Get texture size to determine frame count by aspect ratio
|
|
|
|
v2u32 size = tile->texture->getOriginalSize();
|
|
|
|
int frame_height = (float)size.X /
|
|
|
|
(float)tiledef->animation.aspect_w *
|
|
|
|
(float)tiledef->animation.aspect_h;
|
|
|
|
frame_count = size.Y / frame_height;
|
|
|
|
int frame_length_ms = 1000.0 * tiledef->animation.length / frame_count;
|
|
|
|
tile->animation_frame_count = frame_count;
|
|
|
|
tile->animation_frame_length_ms = frame_length_ms;
|
2011-11-14 21:07:42 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
|
|
|
|
if (frame_count == 1) {
|
|
|
|
tile->material_flags &= ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
|
|
|
|
} else {
|
|
|
|
std::ostringstream os(std::ios::binary);
|
2014-12-18 13:25:36 +01:00
|
|
|
tile->frames.resize(frame_count);
|
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
for (int i = 0; i < frame_count; i++) {
|
2014-12-18 13:25:36 +01:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
FrameSpec frame;
|
|
|
|
|
|
|
|
os.str("");
|
|
|
|
os << tiledef->name << "^[verticalframe:"
|
|
|
|
<< frame_count << ":" << i;
|
|
|
|
|
2015-03-31 02:04:19 +02:00
|
|
|
frame.texture = tsrc->getTextureForMesh(os.str(), &frame.texture_id);
|
2014-10-03 09:16:43 +02:00
|
|
|
if (tile->normal_texture)
|
|
|
|
frame.normal_texture = tsrc->getNormalTexture(os.str());
|
2015-07-16 15:36:48 +02:00
|
|
|
frame.flags_texture = tile->flags_texture;
|
2014-10-03 09:16:43 +02:00
|
|
|
tile->frames[i] = frame;
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
#endif
|
2013-07-14 00:55:47 +02:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
|
2015-05-05 22:52:06 +02:00
|
|
|
void CNodeDefManager::serialize(std::ostream &os, u16 protocol_version) const
|
2014-10-03 09:16:43 +02:00
|
|
|
{
|
|
|
|
writeU8(os, 1); // version
|
|
|
|
u16 count = 0;
|
|
|
|
std::ostringstream os2(std::ios::binary);
|
|
|
|
for (u32 i = 0; i < m_content_features.size(); i++) {
|
|
|
|
if (i == CONTENT_IGNORE || i == CONTENT_AIR
|
|
|
|
|| i == CONTENT_UNKNOWN)
|
|
|
|
continue;
|
2015-05-05 22:52:06 +02:00
|
|
|
const ContentFeatures *f = &m_content_features[i];
|
2014-10-03 09:16:43 +02:00
|
|
|
if (f->name == "")
|
|
|
|
continue;
|
|
|
|
writeU16(os2, i);
|
|
|
|
// Wrap it in a string to allow different lengths without
|
|
|
|
// strict version incompatibilities
|
|
|
|
std::ostringstream wrapper_os(std::ios::binary);
|
|
|
|
f->serialize(wrapper_os, protocol_version);
|
|
|
|
os2<<serializeString(wrapper_os.str());
|
|
|
|
|
2015-03-06 11:21:51 +01:00
|
|
|
// must not overflow
|
|
|
|
u16 next = count + 1;
|
|
|
|
FATAL_ERROR_IF(next < count, "Overflow");
|
2014-10-03 09:16:43 +02:00
|
|
|
count++;
|
2011-11-15 18:58:36 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
writeU16(os, count);
|
|
|
|
os << serializeLongString(os2.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CNodeDefManager::deSerialize(std::istream &is)
|
|
|
|
{
|
|
|
|
clear();
|
|
|
|
int version = readU8(is);
|
|
|
|
if (version != 1)
|
|
|
|
throw SerializationError("unsupported NodeDefinitionManager version");
|
|
|
|
u16 count = readU16(is);
|
|
|
|
std::istringstream is2(deSerializeLongString(is), std::ios::binary);
|
|
|
|
ContentFeatures f;
|
|
|
|
for (u16 n = 0; n < count; n++) {
|
|
|
|
u16 i = readU16(is2);
|
|
|
|
|
|
|
|
// Read it from the string wrapper
|
|
|
|
std::string wrapper = deSerializeString(is2);
|
|
|
|
std::istringstream wrapper_is(wrapper, std::ios::binary);
|
|
|
|
f.deSerialize(wrapper_is);
|
|
|
|
|
|
|
|
// Check error conditions
|
|
|
|
if (i == CONTENT_IGNORE || i == CONTENT_AIR || i == CONTENT_UNKNOWN) {
|
2015-10-14 07:26:03 +02:00
|
|
|
warningstream << "NodeDefManager::deSerialize(): "
|
2014-10-03 09:16:43 +02:00
|
|
|
"not changing builtin node " << i << std::endl;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (f.name == "") {
|
2015-10-14 07:26:03 +02:00
|
|
|
warningstream << "NodeDefManager::deSerialize(): "
|
2014-10-03 09:16:43 +02:00
|
|
|
"received empty name" << std::endl;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Ignore aliases
|
|
|
|
u16 existing_id;
|
|
|
|
if (m_name_id_mapping.getId(f.name, existing_id) && i != existing_id) {
|
2015-10-14 07:26:03 +02:00
|
|
|
warningstream << "NodeDefManager::deSerialize(): "
|
2014-10-03 09:16:43 +02:00
|
|
|
"already defined with different ID: " << f.name << std::endl;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// All is ok, add node definition with the requested ID
|
|
|
|
if (i >= m_content_features.size())
|
|
|
|
m_content_features.resize((u32)(i) + 1);
|
|
|
|
m_content_features[i] = f;
|
|
|
|
addNameIdMapping(i, f.name);
|
|
|
|
verbosestream << "deserialized " << f.name << std::endl;
|
2012-01-12 06:10:39 +01:00
|
|
|
}
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
|
|
|
|
2011-11-14 20:41:30 +01:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
void CNodeDefManager::addNameIdMapping(content_t i, std::string name)
|
|
|
|
{
|
|
|
|
m_name_id_mapping.set(i, name);
|
|
|
|
m_name_id_mapping_with_aliases.insert(std::make_pair(name, i));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
IWritableNodeDefManager *createNodeDefManager()
|
2011-11-14 20:41:30 +01:00
|
|
|
{
|
2011-11-15 13:43:15 +01:00
|
|
|
return new CNodeDefManager();
|
2011-11-14 20:41:30 +01:00
|
|
|
}
|
|
|
|
|
2012-11-26 22:59:03 +01:00
|
|
|
|
2014-10-03 09:16:43 +02:00
|
|
|
//// Serialization of old ContentFeatures formats
|
2015-05-05 22:52:06 +02:00
|
|
|
void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
|
2012-11-26 22:59:03 +01:00
|
|
|
{
|
2014-10-03 09:16:43 +02:00
|
|
|
if (protocol_version == 13)
|
2012-11-26 22:59:03 +01:00
|
|
|
{
|
|
|
|
writeU8(os, 5); // version
|
|
|
|
os<<serializeString(name);
|
|
|
|
writeU16(os, groups.size());
|
2014-10-03 09:16:43 +02:00
|
|
|
for (ItemGroupList::const_iterator
|
2015-08-25 22:23:05 +02:00
|
|
|
i = groups.begin(); i != groups.end(); ++i) {
|
2012-11-26 22:59:03 +01:00
|
|
|
os<<serializeString(i->first);
|
|
|
|
writeS16(os, i->second);
|
|
|
|
}
|
|
|
|
writeU8(os, drawtype);
|
|
|
|
writeF1000(os, visual_scale);
|
|
|
|
writeU8(os, 6);
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < 6; i++)
|
2013-01-25 01:37:19 +01:00
|
|
|
tiledef[i].serialize(os, protocol_version);
|
2014-07-25 07:35:55 +02:00
|
|
|
//CF_SPECIAL_COUNT = 2 before cf ver. 7 and protocol ver. 24
|
|
|
|
writeU8(os, 2);
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < 2; i++)
|
2013-01-25 01:37:19 +01:00
|
|
|
tiledef_special[i].serialize(os, protocol_version);
|
2012-11-26 22:59:03 +01:00
|
|
|
writeU8(os, alpha);
|
|
|
|
writeU8(os, post_effect_color.getAlpha());
|
|
|
|
writeU8(os, post_effect_color.getRed());
|
|
|
|
writeU8(os, post_effect_color.getGreen());
|
|
|
|
writeU8(os, post_effect_color.getBlue());
|
|
|
|
writeU8(os, param_type);
|
|
|
|
writeU8(os, param_type_2);
|
|
|
|
writeU8(os, is_ground_content);
|
|
|
|
writeU8(os, light_propagates);
|
|
|
|
writeU8(os, sunlight_propagates);
|
|
|
|
writeU8(os, walkable);
|
|
|
|
writeU8(os, pointable);
|
|
|
|
writeU8(os, diggable);
|
|
|
|
writeU8(os, climbable);
|
|
|
|
writeU8(os, buildable_to);
|
|
|
|
os<<serializeString(""); // legacy: used to be metadata_name
|
|
|
|
writeU8(os, liquid_type);
|
|
|
|
os<<serializeString(liquid_alternative_flowing);
|
|
|
|
os<<serializeString(liquid_alternative_source);
|
|
|
|
writeU8(os, liquid_viscosity);
|
|
|
|
writeU8(os, light_source);
|
|
|
|
writeU32(os, damage_per_second);
|
2013-08-01 22:50:58 +02:00
|
|
|
node_box.serialize(os, protocol_version);
|
|
|
|
selection_box.serialize(os, protocol_version);
|
2012-11-26 22:59:03 +01:00
|
|
|
writeU8(os, legacy_facedir_simple);
|
|
|
|
writeU8(os, legacy_wallmounted);
|
|
|
|
serializeSimpleSoundSpec(sound_footstep, os);
|
|
|
|
serializeSimpleSoundSpec(sound_dig, os);
|
|
|
|
serializeSimpleSoundSpec(sound_dug, os);
|
|
|
|
}
|
2014-07-25 07:35:55 +02:00
|
|
|
else if (protocol_version > 13 && protocol_version < 24) {
|
|
|
|
writeU8(os, 6); // version
|
|
|
|
os<<serializeString(name);
|
|
|
|
writeU16(os, groups.size());
|
2014-10-03 09:16:43 +02:00
|
|
|
for (ItemGroupList::const_iterator
|
2015-08-25 22:23:05 +02:00
|
|
|
i = groups.begin(); i != groups.end(); ++i) {
|
2014-07-25 07:35:55 +02:00
|
|
|
os<<serializeString(i->first);
|
|
|
|
writeS16(os, i->second);
|
|
|
|
}
|
|
|
|
writeU8(os, drawtype);
|
|
|
|
writeF1000(os, visual_scale);
|
|
|
|
writeU8(os, 6);
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < 6; i++)
|
2014-07-25 07:35:55 +02:00
|
|
|
tiledef[i].serialize(os, protocol_version);
|
|
|
|
//CF_SPECIAL_COUNT = 2 before cf ver. 7 and protocol ver. 24
|
|
|
|
writeU8(os, 2);
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < 2; i++)
|
2014-07-25 07:35:55 +02:00
|
|
|
tiledef_special[i].serialize(os, protocol_version);
|
|
|
|
writeU8(os, alpha);
|
|
|
|
writeU8(os, post_effect_color.getAlpha());
|
|
|
|
writeU8(os, post_effect_color.getRed());
|
|
|
|
writeU8(os, post_effect_color.getGreen());
|
|
|
|
writeU8(os, post_effect_color.getBlue());
|
|
|
|
writeU8(os, param_type);
|
|
|
|
writeU8(os, param_type_2);
|
|
|
|
writeU8(os, is_ground_content);
|
|
|
|
writeU8(os, light_propagates);
|
|
|
|
writeU8(os, sunlight_propagates);
|
|
|
|
writeU8(os, walkable);
|
|
|
|
writeU8(os, pointable);
|
|
|
|
writeU8(os, diggable);
|
|
|
|
writeU8(os, climbable);
|
|
|
|
writeU8(os, buildable_to);
|
|
|
|
os<<serializeString(""); // legacy: used to be metadata_name
|
|
|
|
writeU8(os, liquid_type);
|
|
|
|
os<<serializeString(liquid_alternative_flowing);
|
|
|
|
os<<serializeString(liquid_alternative_source);
|
|
|
|
writeU8(os, liquid_viscosity);
|
|
|
|
writeU8(os, liquid_renewable);
|
|
|
|
writeU8(os, light_source);
|
|
|
|
writeU32(os, damage_per_second);
|
|
|
|
node_box.serialize(os, protocol_version);
|
|
|
|
selection_box.serialize(os, protocol_version);
|
|
|
|
writeU8(os, legacy_facedir_simple);
|
|
|
|
writeU8(os, legacy_wallmounted);
|
|
|
|
serializeSimpleSoundSpec(sound_footstep, os);
|
|
|
|
serializeSimpleSoundSpec(sound_dig, os);
|
|
|
|
serializeSimpleSoundSpec(sound_dug, os);
|
|
|
|
writeU8(os, rightclickable);
|
|
|
|
writeU8(os, drowning);
|
|
|
|
writeU8(os, leveled);
|
|
|
|
writeU8(os, liquid_range);
|
2014-12-11 06:41:54 +01:00
|
|
|
} else
|
2014-10-03 09:16:43 +02:00
|
|
|
throw SerializationError("ContentFeatures::serialize(): "
|
|
|
|
"Unsupported version requested");
|
2012-11-26 22:59:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void ContentFeatures::deSerializeOld(std::istream &is, int version)
|
|
|
|
{
|
2014-10-03 09:16:43 +02:00
|
|
|
if (version == 5) // In PROTOCOL_VERSION 13
|
2012-11-26 22:59:03 +01:00
|
|
|
{
|
|
|
|
name = deSerializeString(is);
|
|
|
|
groups.clear();
|
|
|
|
u32 groups_size = readU16(is);
|
|
|
|
for(u32 i=0; i<groups_size; i++){
|
|
|
|
std::string name = deSerializeString(is);
|
|
|
|
int value = readS16(is);
|
|
|
|
groups[name] = value;
|
|
|
|
}
|
|
|
|
drawtype = (enum NodeDrawType)readU8(is);
|
Backface culling: Ignore setting in tiledef from old servers.
Outdated servers are always sending tiledefs with culling
enabled no matter what, as the value was previously entirely
ignored.
To compensate, we must (1) detect that we're running against
an old server with a new client, and (2) disable culling for
mesh, plantlike, firelike and liquid draw types no matter what
the server is telling us.
In order to achieve this, we need to bump the protocol version
since we cannot rely on the tiledef version, and test for it
being older. I've bumped the protocol version, although that
should have likely happened in the actual change that introduced
the new backface_culling PR #3578. Fortunately that's only 2
commits back at this point.
We also explicitly test for the drawtype to assure we are not
changing the culling value for other nodes, where it should
remain enabled.
This was tested against various pub servers, including 0.4.13 and
0.4.12.
Fixes #3598
2016-01-21 23:40:24 +01:00
|
|
|
|
2012-11-26 22:59:03 +01:00
|
|
|
visual_scale = readF1000(is);
|
2014-10-03 09:16:43 +02:00
|
|
|
if (readU8(is) != 6)
|
2012-11-26 22:59:03 +01:00
|
|
|
throw SerializationError("unsupported tile count");
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < 6; i++)
|
2016-01-24 04:53:27 +01:00
|
|
|
tiledef[i].deSerialize(is, version, drawtype);
|
2014-10-03 09:16:43 +02:00
|
|
|
if (readU8(is) != CF_SPECIAL_COUNT)
|
2012-11-26 22:59:03 +01:00
|
|
|
throw SerializationError("unsupported CF_SPECIAL_COUNT");
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < CF_SPECIAL_COUNT; i++)
|
2016-01-24 04:53:27 +01:00
|
|
|
tiledef_special[i].deSerialize(is, version, drawtype);
|
2012-11-26 22:59:03 +01:00
|
|
|
alpha = readU8(is);
|
|
|
|
post_effect_color.setAlpha(readU8(is));
|
|
|
|
post_effect_color.setRed(readU8(is));
|
|
|
|
post_effect_color.setGreen(readU8(is));
|
|
|
|
post_effect_color.setBlue(readU8(is));
|
|
|
|
param_type = (enum ContentParamType)readU8(is);
|
|
|
|
param_type_2 = (enum ContentParamType2)readU8(is);
|
|
|
|
is_ground_content = readU8(is);
|
|
|
|
light_propagates = readU8(is);
|
|
|
|
sunlight_propagates = readU8(is);
|
|
|
|
walkable = readU8(is);
|
|
|
|
pointable = readU8(is);
|
|
|
|
diggable = readU8(is);
|
|
|
|
climbable = readU8(is);
|
|
|
|
buildable_to = readU8(is);
|
|
|
|
deSerializeString(is); // legacy: used to be metadata_name
|
|
|
|
liquid_type = (enum LiquidType)readU8(is);
|
|
|
|
liquid_alternative_flowing = deSerializeString(is);
|
|
|
|
liquid_alternative_source = deSerializeString(is);
|
|
|
|
liquid_viscosity = readU8(is);
|
|
|
|
light_source = readU8(is);
|
|
|
|
damage_per_second = readU32(is);
|
|
|
|
node_box.deSerialize(is);
|
|
|
|
selection_box.deSerialize(is);
|
|
|
|
legacy_facedir_simple = readU8(is);
|
|
|
|
legacy_wallmounted = readU8(is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_footstep, is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_dig, is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_dug, is);
|
2014-07-25 07:35:55 +02:00
|
|
|
} else if (version == 6) {
|
|
|
|
name = deSerializeString(is);
|
|
|
|
groups.clear();
|
|
|
|
u32 groups_size = readU16(is);
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < groups_size; i++) {
|
2014-07-25 07:35:55 +02:00
|
|
|
std::string name = deSerializeString(is);
|
|
|
|
int value = readS16(is);
|
|
|
|
groups[name] = value;
|
|
|
|
}
|
|
|
|
drawtype = (enum NodeDrawType)readU8(is);
|
|
|
|
visual_scale = readF1000(is);
|
2014-10-03 09:16:43 +02:00
|
|
|
if (readU8(is) != 6)
|
2014-07-25 07:35:55 +02:00
|
|
|
throw SerializationError("unsupported tile count");
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < 6; i++)
|
2016-01-24 04:53:27 +01:00
|
|
|
tiledef[i].deSerialize(is, version, drawtype);
|
2014-07-25 07:35:55 +02:00
|
|
|
// CF_SPECIAL_COUNT in version 6 = 2
|
2014-10-03 09:16:43 +02:00
|
|
|
if (readU8(is) != 2)
|
2014-07-25 07:35:55 +02:00
|
|
|
throw SerializationError("unsupported CF_SPECIAL_COUNT");
|
2014-10-03 09:16:43 +02:00
|
|
|
for (u32 i = 0; i < 2; i++)
|
2016-01-24 04:53:27 +01:00
|
|
|
tiledef_special[i].deSerialize(is, version, drawtype);
|
2014-07-25 07:35:55 +02:00
|
|
|
alpha = readU8(is);
|
|
|
|
post_effect_color.setAlpha(readU8(is));
|
|
|
|
post_effect_color.setRed(readU8(is));
|
|
|
|
post_effect_color.setGreen(readU8(is));
|
|
|
|
post_effect_color.setBlue(readU8(is));
|
|
|
|
param_type = (enum ContentParamType)readU8(is);
|
|
|
|
param_type_2 = (enum ContentParamType2)readU8(is);
|
|
|
|
is_ground_content = readU8(is);
|
|
|
|
light_propagates = readU8(is);
|
|
|
|
sunlight_propagates = readU8(is);
|
|
|
|
walkable = readU8(is);
|
|
|
|
pointable = readU8(is);
|
|
|
|
diggable = readU8(is);
|
|
|
|
climbable = readU8(is);
|
|
|
|
buildable_to = readU8(is);
|
|
|
|
deSerializeString(is); // legacy: used to be metadata_name
|
|
|
|
liquid_type = (enum LiquidType)readU8(is);
|
|
|
|
liquid_alternative_flowing = deSerializeString(is);
|
|
|
|
liquid_alternative_source = deSerializeString(is);
|
|
|
|
liquid_viscosity = readU8(is);
|
|
|
|
liquid_renewable = readU8(is);
|
|
|
|
light_source = readU8(is);
|
|
|
|
damage_per_second = readU32(is);
|
|
|
|
node_box.deSerialize(is);
|
|
|
|
selection_box.deSerialize(is);
|
|
|
|
legacy_facedir_simple = readU8(is);
|
|
|
|
legacy_wallmounted = readU8(is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_footstep, is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_dig, is);
|
|
|
|
deSerializeSimpleSoundSpec(sound_dug, is);
|
|
|
|
rightclickable = readU8(is);
|
|
|
|
drowning = readU8(is);
|
|
|
|
leveled = readU8(is);
|
|
|
|
liquid_range = readU8(is);
|
2014-10-03 09:16:43 +02:00
|
|
|
} else {
|
2012-11-26 22:59:03 +01:00
|
|
|
throw SerializationError("unsupported ContentFeatures version");
|
2014-10-03 09:16:43 +02:00
|
|
|
}
|
2012-11-26 22:59:03 +01:00
|
|
|
}
|
2014-10-08 21:28:14 +02:00
|
|
|
|
|
|
|
|
2015-01-04 22:32:31 +01:00
|
|
|
inline bool CNodeDefManager::getNodeRegistrationStatus() const
|
|
|
|
{
|
|
|
|
return m_node_registration_complete;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
inline void CNodeDefManager::setNodeRegistrationStatus(bool completed)
|
|
|
|
{
|
|
|
|
m_node_registration_complete = completed;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-05-07 08:34:15 +02:00
|
|
|
void CNodeDefManager::pendNodeResolve(NodeResolver *nr)
|
2014-10-08 21:28:14 +02:00
|
|
|
{
|
2015-04-16 10:12:26 +02:00
|
|
|
nr->m_ndef = this;
|
2015-05-07 08:34:15 +02:00
|
|
|
if (m_node_registration_complete)
|
2015-04-16 10:12:26 +02:00
|
|
|
nr->nodeResolveInternal();
|
2015-05-07 08:34:15 +02:00
|
|
|
else
|
|
|
|
m_pending_resolve_callbacks.push_back(nr);
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
bool CNodeDefManager::cancelNodeResolveCallback(NodeResolver *nr)
|
2014-10-08 21:28:14 +02:00
|
|
|
{
|
2015-04-16 10:12:26 +02:00
|
|
|
size_t len = m_pending_resolve_callbacks.size();
|
|
|
|
for (size_t i = 0; i != len; i++) {
|
|
|
|
if (nr != m_pending_resolve_callbacks[i])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
len--;
|
|
|
|
m_pending_resolve_callbacks[i] = m_pending_resolve_callbacks[len];
|
|
|
|
m_pending_resolve_callbacks.resize(len);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CNodeDefManager::runNodeResolveCallbacks()
|
|
|
|
{
|
|
|
|
for (size_t i = 0; i != m_pending_resolve_callbacks.size(); i++) {
|
|
|
|
NodeResolver *nr = m_pending_resolve_callbacks[i];
|
|
|
|
nr->nodeResolveInternal();
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
2015-04-16 10:12:26 +02:00
|
|
|
|
|
|
|
m_pending_resolve_callbacks.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-05-05 22:52:06 +02:00
|
|
|
void CNodeDefManager::resetNodeResolveState()
|
|
|
|
{
|
|
|
|
m_node_registration_complete = false;
|
|
|
|
m_pending_resolve_callbacks.clear();
|
|
|
|
}
|
|
|
|
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
void CNodeDefManager::mapNodeboxConnections()
|
|
|
|
{
|
|
|
|
for (u32 i = 0; i < m_content_features.size(); i++) {
|
|
|
|
ContentFeatures *f = &m_content_features[i];
|
|
|
|
if ((f->drawtype != NDT_NODEBOX) || (f->node_box.type != NODEBOX_CONNECTED))
|
|
|
|
continue;
|
|
|
|
for (std::vector<std::string>::iterator it = f->connects_to.begin();
|
|
|
|
it != f->connects_to.end(); ++it) {
|
|
|
|
getIds(*it, f->connects_to_ids);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Allow nodes to specify which sides to connect to.
NDT_CONNECTED attempts to connect to any side of nodes that it can
connect to, which is troublesome for FACEDIR type nodes that generally
may only have one usable face, and can be rotated.
We introduce a node parameter `connect_sides` that is valid for
any node type. If specified, it lists faces of the node (in "top",
"bottom", "front", "left", "back", "right", form, as array) that
connecting nodeboxes can connect to. "front" corresponds to the south
facing side of a node with facedir = 0.
If the node is rotatable using *simple* FACEDIR, then the attached
face is properly rotated before checking. This allows e.g. a chest
to be attached to only from the rear side.
2016-03-04 08:18:04 +01:00
|
|
|
bool CNodeDefManager::nodeboxConnects(MapNode from, MapNode to, u8 connect_face)
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
{
|
|
|
|
const ContentFeatures &f1 = get(from);
|
|
|
|
|
|
|
|
if ((f1.drawtype != NDT_NODEBOX) || (f1.node_box.type != NODEBOX_CONNECTED))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// lookup target in connected set
|
|
|
|
if (f1.connects_to_ids.find(to.param0) == f1.connects_to_ids.end())
|
|
|
|
return false;
|
|
|
|
|
|
|
|
const ContentFeatures &f2 = get(to);
|
|
|
|
|
|
|
|
if ((f2.drawtype == NDT_NODEBOX) && (f1.node_box.type == NODEBOX_CONNECTED))
|
|
|
|
// ignores actually looking if back connection exists
|
|
|
|
return (f2.connects_to_ids.find(from.param0) != f2.connects_to_ids.end());
|
|
|
|
|
Allow nodes to specify which sides to connect to.
NDT_CONNECTED attempts to connect to any side of nodes that it can
connect to, which is troublesome for FACEDIR type nodes that generally
may only have one usable face, and can be rotated.
We introduce a node parameter `connect_sides` that is valid for
any node type. If specified, it lists faces of the node (in "top",
"bottom", "front", "left", "back", "right", form, as array) that
connecting nodeboxes can connect to. "front" corresponds to the south
facing side of a node with facedir = 0.
If the node is rotatable using *simple* FACEDIR, then the attached
face is properly rotated before checking. This allows e.g. a chest
to be attached to only from the rear side.
2016-03-04 08:18:04 +01:00
|
|
|
// does to node declare usable faces?
|
|
|
|
if (f2.connect_sides > 0) {
|
|
|
|
if ((f2.param_type_2 == CPT2_FACEDIR) && (connect_face >= 4)) {
|
|
|
|
static const u8 rot[33 * 4] = {
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
4, 32, 16, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 4 - back
|
|
|
|
8, 4, 32, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8 - right
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
16, 8, 4, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 16 - front
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
32, 16, 8, 4 // 32 - left
|
|
|
|
};
|
|
|
|
return (f2.connect_sides & rot[(connect_face * 4) + to.param2]);
|
|
|
|
}
|
|
|
|
return (f2.connect_sides & connect_face);
|
|
|
|
}
|
Nodebox: Allow nodeboxes to "connect"
We introduce a new nodebox type "connected", and allow these nodes to
have optional nodeboxes that connect it to other connecting nodeboxes.
This is all done at scenedraw time in the client. The client will
inspect the surrounding nodes and if they are to be connected to,
it will draw the appropriate connecting nodeboxes to make those
connections.
In the node_box definition, we have to specify separate nodeboxes for
each valid connection. This allows us to make nodes that connect only
horizontally (the common case) by providing optional nodeboxes for +x,
-x, +z, -z directions. Or this allows us to make wires that can connect
up and down, by providing nodeboxes that connect it up and down (+y,
-y) as well.
The optional nodeboxes can be arrays. They are named "connect_top,
"connect_bottom", "connect_front", "connect_left", "connect_back" and
"connect_right". Here, "front" means the south facing side of the node
that has facedir = 0.
Additionally, a "fixed" nodebox list present will always be drawn,
so one can make a central post, for instance. This "fixed" nodebox
can be omitted, or it can be an array of nodeboxes.
Collision boxes are also updated in exactly the same fashion, which
allows you to walk over the upper extremities of the individual
node boxes, or stand really close to them. You can also walk up
node noxes that are small in height, all as expected, and unlike the
NDT_FENCELIKE nodes.
I've posted a screenshot demonstrating the flexibility at
http://i.imgur.com/zaJq8jo.png
In the screenshot, all connecting nodes are of this new subtype.
Transparent textures render incorrectly, Which I don't think is
related to this text, as other nodeboxes also have issues with this.
A protocol bump is performed in order to be able to send older clients
a nodeblock that is usable for them. In order to avoid abuse of users
we send older clients a "full-size" node, so that it's impossible for
them to try and walk through a fence or wall that's created in this
fashion. This was tested with a pre-bump client connected against a
server running the new protocol.
These nodes connect to other nodes, and you can select which ones
those are by specifying node names (or group names) in the
connects_to string array:
connects_to = { "group:fence", "default:wood" }
By default, nodes do not connect to anything, allowing you to create
nodes that always have to be paired in order to connect. lua_api.txt
is updated to reflect the extension to the node_box API.
Example lua code needed to generate these nodes can be found here:
https://gist.github.com/sofar/b381c8c192c8e53e6062
2016-02-25 09:16:31 +01:00
|
|
|
// the target is just a regular node, so connect no matter back connection
|
|
|
|
return true;
|
|
|
|
}
|
2015-05-05 22:52:06 +02:00
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
////
|
|
|
|
//// NodeResolver
|
|
|
|
////
|
|
|
|
|
2015-05-05 17:36:40 +02:00
|
|
|
NodeResolver::NodeResolver()
|
|
|
|
{
|
2015-04-16 10:12:26 +02:00
|
|
|
m_ndef = NULL;
|
|
|
|
m_nodenames_idx = 0;
|
|
|
|
m_nnlistsizes_idx = 0;
|
|
|
|
m_resolve_done = false;
|
|
|
|
|
|
|
|
m_nodenames.reserve(16);
|
|
|
|
m_nnlistsizes.reserve(4);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
NodeResolver::~NodeResolver()
|
|
|
|
{
|
|
|
|
if (!m_resolve_done && m_ndef)
|
|
|
|
m_ndef->cancelNodeResolveCallback(this);
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
void NodeResolver::nodeResolveInternal()
|
2014-10-08 21:28:14 +02:00
|
|
|
{
|
2015-04-16 10:12:26 +02:00
|
|
|
m_nodenames_idx = 0;
|
|
|
|
m_nnlistsizes_idx = 0;
|
|
|
|
|
|
|
|
resolveNodeNames();
|
|
|
|
m_resolve_done = true;
|
|
|
|
|
|
|
|
m_nodenames.clear();
|
|
|
|
m_nnlistsizes.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool NodeResolver::getIdFromNrBacklog(content_t *result_out,
|
|
|
|
const std::string &node_alt, content_t c_fallback)
|
2014-10-08 21:28:14 +02:00
|
|
|
{
|
2015-04-16 10:12:26 +02:00
|
|
|
if (m_nodenames_idx == m_nodenames.size()) {
|
|
|
|
*result_out = c_fallback;
|
2015-05-05 17:36:40 +02:00
|
|
|
errorstream << "NodeResolver: no more nodes in list" << std::endl;
|
2014-12-17 09:20:17 +01:00
|
|
|
return false;
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
|
|
|
|
2014-12-17 09:20:17 +01:00
|
|
|
content_t c;
|
2015-04-16 10:12:26 +02:00
|
|
|
std::string name = m_nodenames[m_nodenames_idx++];
|
2014-10-08 21:28:14 +02:00
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
bool success = m_ndef->getId(name, c);
|
2014-12-17 09:20:17 +01:00
|
|
|
if (!success && node_alt != "") {
|
|
|
|
name = node_alt;
|
2015-04-16 10:12:26 +02:00
|
|
|
success = m_ndef->getId(name, c);
|
2014-12-17 09:20:17 +01:00
|
|
|
}
|
2014-10-08 21:28:14 +02:00
|
|
|
|
2014-12-17 09:20:17 +01:00
|
|
|
if (!success) {
|
2015-04-16 10:12:26 +02:00
|
|
|
errorstream << "NodeResolver: failed to resolve node name '" << name
|
2014-12-28 04:20:04 +01:00
|
|
|
<< "'." << std::endl;
|
2014-12-17 09:20:17 +01:00
|
|
|
c = c_fallback;
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
*result_out = c;
|
2014-12-17 09:20:17 +01:00
|
|
|
return success;
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
bool NodeResolver::getIdsFromNrBacklog(std::vector<content_t> *result_out,
|
|
|
|
bool all_required, content_t c_fallback)
|
2014-10-08 21:28:14 +02:00
|
|
|
{
|
2014-12-28 04:20:04 +01:00
|
|
|
bool success = true;
|
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
if (m_nnlistsizes_idx == m_nnlistsizes.size()) {
|
|
|
|
errorstream << "NodeResolver: no more node lists" << std::endl;
|
2014-12-17 09:20:17 +01:00
|
|
|
return false;
|
|
|
|
}
|
2014-10-08 21:28:14 +02:00
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
size_t length = m_nnlistsizes[m_nnlistsizes_idx++];
|
2014-10-08 21:28:14 +02:00
|
|
|
|
2015-04-16 10:12:26 +02:00
|
|
|
while (length--) {
|
|
|
|
if (m_nodenames_idx == m_nodenames.size()) {
|
|
|
|
errorstream << "NodeResolver: no more nodes in list" << std::endl;
|
2014-12-17 09:20:17 +01:00
|
|
|
return false;
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
|
|
|
|
2014-12-17 09:20:17 +01:00
|
|
|
content_t c;
|
2015-04-16 10:12:26 +02:00
|
|
|
std::string &name = m_nodenames[m_nodenames_idx++];
|
2014-12-28 04:20:04 +01:00
|
|
|
|
2014-12-30 05:15:53 +01:00
|
|
|
if (name.substr(0,6) != "group:") {
|
2015-04-16 10:12:26 +02:00
|
|
|
if (m_ndef->getId(name, c)) {
|
|
|
|
result_out->push_back(c);
|
|
|
|
} else if (all_required) {
|
|
|
|
errorstream << "NodeResolver: failed to resolve node name '"
|
|
|
|
<< name << "'." << std::endl;
|
|
|
|
result_out->push_back(c_fallback);
|
2014-12-30 05:15:53 +01:00
|
|
|
success = false;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
std::set<content_t> cids;
|
|
|
|
std::set<content_t>::iterator it;
|
2015-04-16 10:12:26 +02:00
|
|
|
m_ndef->getIds(name, cids);
|
2014-12-30 05:15:53 +01:00
|
|
|
for (it = cids.begin(); it != cids.end(); ++it)
|
2015-04-16 10:12:26 +02:00
|
|
|
result_out->push_back(*it);
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-28 04:20:04 +01:00
|
|
|
return success;
|
2014-10-08 21:28:14 +02:00
|
|
|
}
|