2011-04-10 14:16:27 +02: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-04-10 14:16:27 +02: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-04-10 14:16:27 +02: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-04-10 14:16:27 +02:00
|
|
|
|
2012-06-05 16:56:56 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
2011-04-10 14:16:27 +02:00
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "collision.h"
|
2018-04-03 18:16:17 +02:00
|
|
|
#include <cmath>
|
2011-04-10 14:16:27 +02:00
|
|
|
#include "mapblock.h"
|
|
|
|
#include "map.h"
|
2011-11-14 20:41:30 +01:00
|
|
|
#include "nodedef.h"
|
|
|
|
#include "gamedef.h"
|
2017-01-09 20:39:22 +01:00
|
|
|
#ifndef SERVER
|
2017-01-08 10:49:47 +01:00
|
|
|
#include "clientenvironment.h"
|
2017-01-09 20:39:22 +01:00
|
|
|
#endif
|
2017-01-08 11:01:35 +01:00
|
|
|
#include "serverenvironment.h"
|
2013-01-12 18:59:19 +01:00
|
|
|
#include "serverobject.h"
|
2017-01-09 20:39:22 +01:00
|
|
|
#include "util/timetaker.h"
|
2012-03-19 04:25:09 +01:00
|
|
|
#include "profiler.h"
|
|
|
|
|
2013-06-30 20:26:01 +02:00
|
|
|
// float error is 10 - 9.96875 = 0.03125
|
2013-06-30 22:26:54 +02:00
|
|
|
//#define COLL_ZERO 0.032 // broken unit tests
|
|
|
|
#define COLL_ZERO 0
|
2013-06-30 20:26:01 +02:00
|
|
|
|
2016-01-09 23:07:46 +01:00
|
|
|
|
|
|
|
struct NearbyCollisionInfo {
|
|
|
|
NearbyCollisionInfo(bool is_ul, bool is_obj, int bouncy,
|
|
|
|
const v3s16 &pos, const aabb3f &box) :
|
|
|
|
is_unloaded(is_ul),
|
|
|
|
is_object(is_obj),
|
|
|
|
bouncy(bouncy),
|
|
|
|
position(pos),
|
|
|
|
box(box)
|
|
|
|
{}
|
|
|
|
|
|
|
|
bool is_unloaded;
|
2017-06-16 11:25:52 +02:00
|
|
|
bool is_step_up = false;
|
2016-01-09 23:07:46 +01:00
|
|
|
bool is_object;
|
|
|
|
int bouncy;
|
|
|
|
v3s16 position;
|
|
|
|
aabb3f box;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
// Helper function:
|
|
|
|
// Checks for collision of a moving aabbox with a static aabbox
|
|
|
|
// Returns -1 if no collision, 0 if X collision, 1 if Y collision, 2 if Z collision
|
|
|
|
// The time after which the collision occurs is stored in dtime.
|
|
|
|
int axisAlignedCollision(
|
|
|
|
const aabb3f &staticbox, const aabb3f &movingbox,
|
2016-01-25 00:06:01 +01:00
|
|
|
const v3f &speed, f32 d, f32 *dtime)
|
2012-03-19 04:25:09 +01:00
|
|
|
{
|
|
|
|
//TimeTaker tt("axisAlignedCollision");
|
|
|
|
|
2013-06-30 20:26:01 +02:00
|
|
|
f32 xsize = (staticbox.MaxEdge.X - staticbox.MinEdge.X) - COLL_ZERO; // reduce box size for solve collision stuck (flying sand)
|
|
|
|
f32 ysize = (staticbox.MaxEdge.Y - staticbox.MinEdge.Y); // - COLL_ZERO; // Y - no sense for falling, but maybe try later
|
|
|
|
f32 zsize = (staticbox.MaxEdge.Z - staticbox.MinEdge.Z) - COLL_ZERO;
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
aabb3f relbox(
|
|
|
|
movingbox.MinEdge.X - staticbox.MinEdge.X,
|
|
|
|
movingbox.MinEdge.Y - staticbox.MinEdge.Y,
|
|
|
|
movingbox.MinEdge.Z - staticbox.MinEdge.Z,
|
|
|
|
movingbox.MaxEdge.X - staticbox.MinEdge.X,
|
|
|
|
movingbox.MaxEdge.Y - staticbox.MinEdge.Y,
|
|
|
|
movingbox.MaxEdge.Z - staticbox.MinEdge.Z
|
|
|
|
);
|
|
|
|
|
|
|
|
if(speed.X > 0) // Check for collision with X- plane
|
|
|
|
{
|
2016-01-25 00:06:01 +01:00
|
|
|
if (relbox.MaxEdge.X <= d) {
|
|
|
|
*dtime = -relbox.MaxEdge.X / speed.X;
|
|
|
|
if ((relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) &&
|
|
|
|
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO) &&
|
|
|
|
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
|
|
|
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
2012-03-19 04:25:09 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if(relbox.MinEdge.X > xsize)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(speed.X < 0) // Check for collision with X+ plane
|
|
|
|
{
|
2016-01-25 00:06:01 +01:00
|
|
|
if (relbox.MinEdge.X >= xsize - d) {
|
|
|
|
*dtime = (xsize - relbox.MinEdge.X) / speed.X;
|
|
|
|
if ((relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) &&
|
|
|
|
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO) &&
|
|
|
|
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
|
|
|
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
2012-03-19 04:25:09 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if(relbox.MaxEdge.X < 0)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// NO else if here
|
|
|
|
|
|
|
|
if(speed.Y > 0) // Check for collision with Y- plane
|
|
|
|
{
|
2016-01-25 00:06:01 +01:00
|
|
|
if (relbox.MaxEdge.Y <= d) {
|
|
|
|
*dtime = -relbox.MaxEdge.Y / speed.Y;
|
|
|
|
if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) &&
|
|
|
|
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
|
|
|
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
|
|
|
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
2012-03-19 04:25:09 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else if(relbox.MinEdge.Y > ysize)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(speed.Y < 0) // Check for collision with Y+ plane
|
|
|
|
{
|
2016-01-25 00:06:01 +01:00
|
|
|
if (relbox.MinEdge.Y >= ysize - d) {
|
|
|
|
*dtime = (ysize - relbox.MinEdge.Y) / speed.Y;
|
|
|
|
if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) &&
|
|
|
|
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
|
|
|
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
|
|
|
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
2012-03-19 04:25:09 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else if(relbox.MaxEdge.Y < 0)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// NO else if here
|
|
|
|
|
|
|
|
if(speed.Z > 0) // Check for collision with Z- plane
|
|
|
|
{
|
2016-01-25 00:06:01 +01:00
|
|
|
if (relbox.MaxEdge.Z <= d) {
|
|
|
|
*dtime = -relbox.MaxEdge.Z / speed.Z;
|
|
|
|
if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) &&
|
|
|
|
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
|
|
|
(relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) &&
|
|
|
|
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO))
|
2012-03-19 04:25:09 +01:00
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
//else if(relbox.MinEdge.Z > zsize)
|
|
|
|
//{
|
|
|
|
// return -1;
|
|
|
|
//}
|
|
|
|
}
|
|
|
|
else if(speed.Z < 0) // Check for collision with Z+ plane
|
|
|
|
{
|
2016-01-25 00:06:01 +01:00
|
|
|
if (relbox.MinEdge.Z >= zsize - d) {
|
|
|
|
*dtime = (zsize - relbox.MinEdge.Z) / speed.Z;
|
|
|
|
if ((relbox.MinEdge.X + speed.X * (*dtime) < xsize) &&
|
|
|
|
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
|
|
|
(relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) &&
|
|
|
|
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO))
|
2012-03-19 04:25:09 +01:00
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
//else if(relbox.MaxEdge.Z < 0)
|
|
|
|
//{
|
|
|
|
// return -1;
|
|
|
|
//}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Helper function:
|
|
|
|
// Checks if moving the movingbox up by the given distance would hit a ceiling.
|
|
|
|
bool wouldCollideWithCeiling(
|
2016-01-09 23:07:46 +01:00
|
|
|
const std::vector<NearbyCollisionInfo> &cinfo,
|
2012-03-19 04:25:09 +01:00
|
|
|
const aabb3f &movingbox,
|
|
|
|
f32 y_increase, f32 d)
|
|
|
|
{
|
|
|
|
//TimeTaker tt("wouldCollideWithCeiling");
|
|
|
|
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(y_increase >= 0); // pre-condition
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2017-08-17 20:23:54 +02:00
|
|
|
for (const auto &it : cinfo) {
|
|
|
|
const aabb3f &staticbox = it.box;
|
2016-01-09 23:07:46 +01:00
|
|
|
if ((movingbox.MaxEdge.Y - d <= staticbox.MinEdge.Y) &&
|
2012-03-19 04:25:09 +01:00
|
|
|
(movingbox.MaxEdge.Y + y_increase > staticbox.MinEdge.Y) &&
|
|
|
|
(movingbox.MinEdge.X < staticbox.MaxEdge.X) &&
|
|
|
|
(movingbox.MaxEdge.X > staticbox.MinEdge.X) &&
|
|
|
|
(movingbox.MinEdge.Z < staticbox.MaxEdge.Z) &&
|
|
|
|
(movingbox.MaxEdge.Z > staticbox.MinEdge.Z))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2018-02-10 21:04:16 +01:00
|
|
|
static inline void getNeighborConnectingFace(const v3s16 &p,
|
|
|
|
const NodeDefManager *nodedef, Map *map, MapNode n, int v, int *neighbors)
|
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
|
|
|
{
|
|
|
|
MapNode n2 = map->getNodeNoEx(p);
|
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
|
|
|
if (nodedef->nodeboxConnects(n, n2, v))
|
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
|
|
|
*neighbors |= v;
|
|
|
|
}
|
2011-04-10 14:16:27 +02:00
|
|
|
|
2013-01-12 18:59:19 +01:00
|
|
|
collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
2012-03-19 04:25:09 +01:00
|
|
|
f32 pos_max_d, const aabb3f &box_0,
|
|
|
|
f32 stepheight, f32 dtime,
|
2016-01-25 00:06:01 +01:00
|
|
|
v3f *pos_f, v3f *speed_f,
|
|
|
|
v3f accel_f, ActiveObject *self,
|
2013-06-14 14:04:46 +02:00
|
|
|
bool collideWithObjects)
|
2011-04-10 14:16:27 +02:00
|
|
|
{
|
2015-12-18 19:20:06 +01:00
|
|
|
static bool time_notification_done = false;
|
2013-01-12 18:59:19 +01:00
|
|
|
Map *map = &env->getMap();
|
2012-03-19 04:25:09 +01:00
|
|
|
//TimeTaker tt("collisionMoveSimple");
|
2015-12-18 19:20:06 +01:00
|
|
|
ScopeProfiler sp(g_profiler, "collisionMoveSimple avg", SPT_AVG);
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2011-04-10 14:16:27 +02:00
|
|
|
collisionMoveResult result;
|
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
/*
|
|
|
|
Calculate new velocity
|
|
|
|
*/
|
2017-08-20 19:37:55 +02:00
|
|
|
if (dtime > 0.5f) {
|
2015-12-18 19:20:06 +01:00
|
|
|
if (!time_notification_done) {
|
|
|
|
time_notification_done = true;
|
|
|
|
infostream << "collisionMoveSimple: maximum step interval exceeded,"
|
|
|
|
" lost movement details!"<<std::endl;
|
|
|
|
}
|
2017-08-20 19:37:55 +02:00
|
|
|
dtime = 0.5f;
|
2015-12-18 19:20:06 +01:00
|
|
|
} else {
|
|
|
|
time_notification_done = false;
|
2013-01-17 00:27:11 +01:00
|
|
|
}
|
2016-01-25 00:06:01 +01:00
|
|
|
*speed_f += accel_f * dtime;
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2013-04-03 01:24:45 +02:00
|
|
|
// If there is no speed, there are no collisions
|
2016-01-25 00:06:01 +01:00
|
|
|
if (speed_f->getLength() == 0)
|
2012-04-07 18:19:36 +02:00
|
|
|
return result;
|
|
|
|
|
2013-04-03 01:24:45 +02:00
|
|
|
// Limit speed for avoiding hangs
|
2016-01-25 00:06:01 +01:00
|
|
|
speed_f->Y = rangelim(speed_f->Y, -5000, 5000);
|
|
|
|
speed_f->X = rangelim(speed_f->X, -5000, 5000);
|
|
|
|
speed_f->Z = rangelim(speed_f->Z, -5000, 5000);
|
2013-04-03 01:24:45 +02:00
|
|
|
|
2011-04-10 14:16:27 +02:00
|
|
|
/*
|
2012-03-19 04:25:09 +01:00
|
|
|
Collect node boxes in movement range
|
2011-04-10 14:16:27 +02:00
|
|
|
*/
|
2016-01-09 23:07:46 +01:00
|
|
|
std::vector<NearbyCollisionInfo> cinfo;
|
2012-03-19 04:25:09 +01:00
|
|
|
{
|
|
|
|
//TimeTaker tt2("collisionMoveSimple collect boxes");
|
2017-08-17 20:23:54 +02:00
|
|
|
ScopeProfiler sp2(g_profiler, "collisionMoveSimple collect boxes avg", SPT_AVG);
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2017-08-04 21:48:32 +02:00
|
|
|
v3f newpos_f = *pos_f + *speed_f * dtime;
|
|
|
|
v3f minpos_f(
|
|
|
|
MYMIN(pos_f->X, newpos_f.X),
|
2017-08-20 19:37:55 +02:00
|
|
|
MYMIN(pos_f->Y, newpos_f.Y) + 0.01f * BS, // bias rounding, player often at +/-n.5
|
2017-08-04 21:48:32 +02:00
|
|
|
MYMIN(pos_f->Z, newpos_f.Z)
|
|
|
|
);
|
|
|
|
v3f maxpos_f(
|
|
|
|
MYMAX(pos_f->X, newpos_f.X),
|
|
|
|
MYMAX(pos_f->Y, newpos_f.Y),
|
|
|
|
MYMAX(pos_f->Z, newpos_f.Z)
|
|
|
|
);
|
|
|
|
v3s16 min = floatToInt(minpos_f + box_0.MinEdge, BS) - v3s16(1, 1, 1);
|
|
|
|
v3s16 max = floatToInt(maxpos_f + box_0.MaxEdge, BS) + v3s16(1, 1, 1);
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2015-08-18 12:05:24 +02:00
|
|
|
bool any_position_valid = false;
|
|
|
|
|
2017-08-17 20:23:54 +02:00
|
|
|
v3s16 p;
|
|
|
|
for (p.X = min.X; p.X <= max.X; p.X++)
|
|
|
|
for (p.Y = min.Y; p.Y <= max.Y; p.Y++)
|
|
|
|
for (p.Z = min.Z; p.Z <= max.Z; p.Z++) {
|
2014-11-14 09:05:34 +01:00
|
|
|
bool is_position_valid;
|
|
|
|
MapNode n = map->getNodeNoEx(p, &is_position_valid);
|
|
|
|
|
2018-02-24 16:57:34 +01:00
|
|
|
if (is_position_valid && n.getContent() != CONTENT_IGNORE) {
|
2012-03-19 04:25:09 +01:00
|
|
|
// Object collides into walkable nodes
|
2014-11-14 09:05:34 +01:00
|
|
|
|
2015-08-18 12:05:24 +02:00
|
|
|
any_position_valid = true;
|
2018-02-10 21:04:16 +01:00
|
|
|
const NodeDefManager *nodedef = gamedef->getNodeDefManager();
|
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 &f = nodedef->get(n);
|
2017-08-17 20:23:54 +02:00
|
|
|
|
|
|
|
if (!f.walkable)
|
2012-03-19 04:25:09 +01:00
|
|
|
continue;
|
2017-08-17 20:23:54 +02:00
|
|
|
|
2012-09-01 11:58:37 +02:00
|
|
|
int n_bouncy_value = itemgroup_get(f.groups, "bouncy");
|
2012-03-19 04:25:09 +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 neighbors = 0;
|
2017-08-17 20:23:54 +02:00
|
|
|
if (f.drawtype == NDT_NODEBOX &&
|
|
|
|
f.node_box.type == NODEBOX_CONNECTED) {
|
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
|
|
|
v3s16 p2 = p;
|
|
|
|
|
|
|
|
p2.Y++;
|
|
|
|
getNeighborConnectingFace(p2, nodedef, map, n, 1, &neighbors);
|
|
|
|
|
|
|
|
p2 = p;
|
|
|
|
p2.Y--;
|
|
|
|
getNeighborConnectingFace(p2, nodedef, map, n, 2, &neighbors);
|
|
|
|
|
|
|
|
p2 = p;
|
|
|
|
p2.Z--;
|
|
|
|
getNeighborConnectingFace(p2, nodedef, map, n, 4, &neighbors);
|
|
|
|
|
|
|
|
p2 = p;
|
|
|
|
p2.X--;
|
|
|
|
getNeighborConnectingFace(p2, nodedef, map, n, 8, &neighbors);
|
|
|
|
|
|
|
|
p2 = p;
|
|
|
|
p2.Z++;
|
|
|
|
getNeighborConnectingFace(p2, nodedef, map, n, 16, &neighbors);
|
|
|
|
|
|
|
|
p2 = p;
|
|
|
|
p2.X++;
|
|
|
|
getNeighborConnectingFace(p2, nodedef, map, n, 32, &neighbors);
|
|
|
|
}
|
|
|
|
std::vector<aabb3f> nodeboxes;
|
|
|
|
n.getCollisionBoxes(gamedef->ndef(), &nodeboxes, neighbors);
|
2018-04-04 00:43:08 +02:00
|
|
|
|
|
|
|
// Calculate float position only once
|
|
|
|
v3f posf = intToFloat(p, BS);
|
2017-08-17 20:23:54 +02:00
|
|
|
for (auto box : nodeboxes) {
|
2018-04-04 00:43:08 +02:00
|
|
|
box.MinEdge += posf;
|
|
|
|
box.MaxEdge += posf;
|
2017-08-17 20:23:54 +02:00
|
|
|
cinfo.emplace_back(false, false, n_bouncy_value, p, box);
|
2012-03-19 04:25:09 +01:00
|
|
|
}
|
2016-01-09 23:07:46 +01:00
|
|
|
} else {
|
2018-02-24 16:57:34 +01:00
|
|
|
// Collide with unloaded nodes (position invalid) and loaded
|
|
|
|
// CONTENT_IGNORE nodes (position valid)
|
2012-09-01 11:58:37 +02:00
|
|
|
aabb3f box = getNodeBox(p, BS);
|
2017-08-17 20:23:54 +02:00
|
|
|
cinfo.emplace_back(true, false, 0, p, box);
|
2012-03-19 04:25:09 +01:00
|
|
|
}
|
|
|
|
}
|
2015-08-18 12:05:24 +02:00
|
|
|
|
|
|
|
// Do not move if world has not loaded yet, since custom node boxes
|
|
|
|
// are not available for collision detection.
|
2018-02-24 16:57:34 +01:00
|
|
|
// This also intentionally occurs in the case of the object being positioned
|
|
|
|
// solely on loaded CONTENT_IGNORE nodes, no matter where they come from.
|
2016-04-06 01:11:36 +02:00
|
|
|
if (!any_position_valid) {
|
|
|
|
*speed_f = v3f(0, 0, 0);
|
2015-08-18 12:05:24 +02:00
|
|
|
return result;
|
2016-04-06 01:11:36 +02:00
|
|
|
}
|
2015-08-18 12:05:24 +02:00
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
} // tt2
|
|
|
|
|
2013-06-14 14:04:46 +02:00
|
|
|
if(collideWithObjects)
|
2013-01-12 18:59:19 +01:00
|
|
|
{
|
2017-08-17 20:23:54 +02:00
|
|
|
ScopeProfiler sp2(g_profiler, "collisionMoveSimple objects avg", SPT_AVG);
|
2013-01-12 18:59:19 +01:00
|
|
|
//TimeTaker tt3("collisionMoveSimple collect object boxes");
|
|
|
|
|
2016-01-09 23:07:46 +01:00
|
|
|
/* add object boxes to cinfo */
|
2013-01-12 18:59:19 +01:00
|
|
|
|
2015-03-05 18:08:19 +01:00
|
|
|
std::vector<ActiveObject*> objects;
|
2013-01-12 18:59:19 +01:00
|
|
|
#ifndef SERVER
|
|
|
|
ClientEnvironment *c_env = dynamic_cast<ClientEnvironment*>(env);
|
2015-03-05 18:08:19 +01:00
|
|
|
if (c_env != 0) {
|
2018-08-05 22:28:41 +02:00
|
|
|
// Calculate distance by speed, add own extent and 1.5m of tolerance
|
|
|
|
f32 distance = speed_f->getLength() * dtime +
|
|
|
|
box_0.getExtent().getLength() + 1.5f * BS;
|
2013-01-12 18:59:19 +01:00
|
|
|
std::vector<DistanceSortedActiveObject> clientobjects;
|
2018-08-05 22:28:41 +02:00
|
|
|
c_env->getActiveObjects(*pos_f, distance, clientobjects);
|
|
|
|
|
2017-08-17 20:23:54 +02:00
|
|
|
for (auto &clientobject : clientobjects) {
|
2018-08-05 22:28:41 +02:00
|
|
|
// Do collide with everything but itself and the parent CAO
|
|
|
|
if (!self || (self != clientobject.obj &&
|
|
|
|
self != clientobject.obj->getParent())) {
|
2017-08-17 20:23:54 +02:00
|
|
|
objects.push_back((ActiveObject*) clientobject.obj);
|
2013-04-09 23:16:13 +02:00
|
|
|
}
|
2013-01-12 18:59:19 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env);
|
2016-10-30 14:53:26 +01:00
|
|
|
if (s_env != NULL) {
|
2018-08-05 22:28:41 +02:00
|
|
|
// Calculate distance by speed, add own extent and 1.5m of tolerance
|
|
|
|
f32 distance = speed_f->getLength() * dtime +
|
|
|
|
box_0.getExtent().getLength() + 1.5f * BS;
|
2015-04-16 14:11:46 +02:00
|
|
|
std::vector<u16> s_objects;
|
2018-08-05 22:28:41 +02:00
|
|
|
s_env->getObjectsInsideRadius(s_objects, *pos_f, distance);
|
|
|
|
|
2017-08-17 20:23:54 +02:00
|
|
|
for (u16 obj_id : s_objects) {
|
|
|
|
ServerActiveObject *current = s_env->getActiveObject(obj_id);
|
2018-08-05 22:28:41 +02:00
|
|
|
|
|
|
|
if (!self || (self != current &&
|
|
|
|
self != current->getParent())) {
|
2013-04-09 23:16:13 +02:00
|
|
|
objects.push_back((ActiveObject*)current);
|
|
|
|
}
|
2013-01-12 18:59:19 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-05 18:08:19 +01:00
|
|
|
for (std::vector<ActiveObject*>::const_iterator iter = objects.begin();
|
|
|
|
iter != objects.end(); ++iter) {
|
2013-01-12 18:59:19 +01:00
|
|
|
ActiveObject *object = *iter;
|
|
|
|
|
2017-08-17 20:23:54 +02:00
|
|
|
if (object) {
|
2013-01-12 18:59:19 +01:00
|
|
|
aabb3f object_collisionbox;
|
2013-06-14 14:04:46 +02:00
|
|
|
if (object->getCollisionBox(&object_collisionbox) &&
|
2015-03-05 18:08:19 +01:00
|
|
|
object->collideWithObjects()) {
|
2017-08-17 20:23:54 +02:00
|
|
|
cinfo.emplace_back(false, true, 0, v3s16(), object_collisionbox);
|
2013-01-12 18:59:19 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} //tt3
|
|
|
|
|
2011-04-10 14:16:27 +02:00
|
|
|
/*
|
|
|
|
Collision detection
|
|
|
|
*/
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2011-04-10 14:16:27 +02:00
|
|
|
/*
|
|
|
|
Collision uncertainty radius
|
|
|
|
Make it a bit larger than the maximum distance of movement
|
|
|
|
*/
|
2017-08-20 19:37:55 +02:00
|
|
|
f32 d = pos_max_d * 1.1f;
|
2011-04-10 14:16:27 +02:00
|
|
|
// A fairly large value in here makes moving smoother
|
|
|
|
//f32 d = 0.15*BS;
|
|
|
|
|
|
|
|
// This should always apply, otherwise there are glitches
|
2015-03-06 11:21:51 +01:00
|
|
|
assert(d > pos_max_d); // invariant
|
2011-04-10 14:16:27 +02:00
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
int loopcount = 0;
|
|
|
|
|
2017-08-20 19:37:55 +02:00
|
|
|
while(dtime > BS * 1e-10f) {
|
2012-03-19 04:25:09 +01:00
|
|
|
//TimeTaker tt3("collisionMoveSimple dtime loop");
|
2017-08-17 20:23:54 +02:00
|
|
|
ScopeProfiler sp2(g_profiler, "collisionMoveSimple dtime loop avg", SPT_AVG);
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
// Avoid infinite loop
|
|
|
|
loopcount++;
|
2015-08-12 17:13:19 +02:00
|
|
|
if (loopcount >= 100) {
|
|
|
|
warningstream << "collisionMoveSimple: Loop count exceeded, aborting to avoid infiniite loop" << std::endl;
|
2012-03-19 04:25:09 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
aabb3f movingbox = box_0;
|
2016-01-25 00:06:01 +01:00
|
|
|
movingbox.MinEdge += *pos_f;
|
|
|
|
movingbox.MaxEdge += *pos_f;
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
int nearest_collided = -1;
|
|
|
|
f32 nearest_dtime = dtime;
|
2016-02-20 09:44:22 +01:00
|
|
|
int nearest_boxindex = -1;
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Go through every nodebox, find nearest collision
|
|
|
|
*/
|
2016-01-09 23:07:46 +01:00
|
|
|
for (u32 boxindex = 0; boxindex < cinfo.size(); boxindex++) {
|
2018-04-04 00:43:08 +02:00
|
|
|
const NearbyCollisionInfo &box_info = cinfo[boxindex];
|
2016-03-01 11:15:08 +01:00
|
|
|
// Ignore if already stepped up this nodebox.
|
2016-01-09 23:07:46 +01:00
|
|
|
if (box_info.is_step_up)
|
2016-03-01 11:15:08 +01:00
|
|
|
continue;
|
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
// Find nearest collision of the two boxes (raytracing-like)
|
|
|
|
f32 dtime_tmp;
|
2016-01-09 23:07:46 +01:00
|
|
|
int collided = axisAlignedCollision(box_info.box,
|
|
|
|
movingbox, *speed_f, d, &dtime_tmp);
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2015-08-12 17:13:19 +02:00
|
|
|
if (collided == -1 || dtime_tmp >= nearest_dtime)
|
2011-04-10 14:16:27 +02:00
|
|
|
continue;
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
nearest_dtime = dtime_tmp;
|
|
|
|
nearest_collided = collided;
|
|
|
|
nearest_boxindex = boxindex;
|
2011-04-10 14:16:27 +02:00
|
|
|
}
|
2012-03-19 04:25:09 +01:00
|
|
|
|
2015-08-12 17:13:19 +02:00
|
|
|
if (nearest_collided == -1) {
|
2012-03-19 04:25:09 +01:00
|
|
|
// No collision with any collision box.
|
2016-01-25 00:06:01 +01:00
|
|
|
*pos_f += *speed_f * dtime;
|
2012-03-19 04:25:09 +01:00
|
|
|
dtime = 0; // Set to 0 to avoid "infinite" loop due to small FP numbers
|
2015-08-12 17:13:19 +02:00
|
|
|
} else {
|
2012-03-19 04:25:09 +01:00
|
|
|
// Otherwise, a collision occurred.
|
2016-01-09 23:07:46 +01:00
|
|
|
NearbyCollisionInfo &nearest_info = cinfo[nearest_boxindex];
|
|
|
|
const aabb3f& cbox = nearest_info.box;
|
2012-03-19 04:25:09 +01:00
|
|
|
// Check for stairs.
|
|
|
|
bool step_up = (nearest_collided != 1) && // must not be Y direction
|
|
|
|
(movingbox.MinEdge.Y < cbox.MaxEdge.Y) &&
|
|
|
|
(movingbox.MinEdge.Y + stepheight > cbox.MaxEdge.Y) &&
|
2016-01-09 23:07:46 +01:00
|
|
|
(!wouldCollideWithCeiling(cinfo, movingbox,
|
2012-03-19 04:25:09 +01:00
|
|
|
cbox.MaxEdge.Y - movingbox.MinEdge.Y,
|
|
|
|
d));
|
|
|
|
|
2012-09-01 11:58:37 +02:00
|
|
|
// Get bounce multiplier
|
2017-08-20 19:37:55 +02:00
|
|
|
float bounce = -(float)nearest_info.bouncy / 100.0f;
|
2012-09-01 11:58:37 +02:00
|
|
|
|
2012-03-19 04:25:09 +01:00
|
|
|
// Move to the point of collision and reduce dtime by nearest_dtime
|
2015-08-12 17:13:19 +02:00
|
|
|
if (nearest_dtime < 0) {
|
2012-03-19 04:25:09 +01:00
|
|
|
// Handle negative nearest_dtime (can be caused by the d allowance)
|
2015-08-12 17:13:19 +02:00
|
|
|
if (!step_up) {
|
|
|
|
if (nearest_collided == 0)
|
2016-01-25 00:06:01 +01:00
|
|
|
pos_f->X += speed_f->X * nearest_dtime;
|
2015-08-12 17:13:19 +02:00
|
|
|
if (nearest_collided == 1)
|
2016-01-25 00:06:01 +01:00
|
|
|
pos_f->Y += speed_f->Y * nearest_dtime;
|
2015-08-12 17:13:19 +02:00
|
|
|
if (nearest_collided == 2)
|
2016-01-25 00:06:01 +01:00
|
|
|
pos_f->Z += speed_f->Z * nearest_dtime;
|
2012-03-19 04:25:09 +01:00
|
|
|
}
|
2015-08-12 17:13:19 +02:00
|
|
|
} else {
|
2016-01-25 00:06:01 +01:00
|
|
|
*pos_f += *speed_f * nearest_dtime;
|
2012-03-19 04:25:09 +01:00
|
|
|
dtime -= nearest_dtime;
|
|
|
|
}
|
2015-07-20 23:30:43 +02:00
|
|
|
|
2012-09-01 11:58:37 +02:00
|
|
|
bool is_collision = true;
|
2016-01-09 23:07:46 +01:00
|
|
|
if (nearest_info.is_unloaded)
|
2012-09-01 11:58:37 +02:00
|
|
|
is_collision = false;
|
|
|
|
|
|
|
|
CollisionInfo info;
|
2016-01-09 23:07:46 +01:00
|
|
|
if (nearest_info.is_object)
|
2013-01-12 18:59:19 +01:00
|
|
|
info.type = COLLISION_OBJECT;
|
2016-03-01 11:15:08 +01:00
|
|
|
else
|
2013-01-12 18:59:19 +01:00
|
|
|
info.type = COLLISION_NODE;
|
2015-08-12 17:13:19 +02:00
|
|
|
|
2016-01-09 23:07:46 +01:00
|
|
|
info.node_p = nearest_info.position;
|
2016-01-25 00:06:01 +01:00
|
|
|
info.old_speed = *speed_f;
|
2012-03-19 04:25:09 +01:00
|
|
|
|
|
|
|
// Set the speed component that caused the collision to zero
|
2015-08-12 17:13:19 +02:00
|
|
|
if (step_up) {
|
2012-03-19 04:25:09 +01:00
|
|
|
// Special case: Handle stairs
|
2016-01-09 23:07:46 +01:00
|
|
|
nearest_info.is_step_up = true;
|
2012-09-01 11:58:37 +02:00
|
|
|
is_collision = false;
|
2016-01-09 23:07:46 +01:00
|
|
|
} else if (nearest_collided == 0) { // X
|
2016-01-25 00:06:01 +01:00
|
|
|
if (fabs(speed_f->X) > BS * 3)
|
|
|
|
speed_f->X *= bounce;
|
2012-09-01 11:58:37 +02:00
|
|
|
else
|
2016-01-25 00:06:01 +01:00
|
|
|
speed_f->X = 0;
|
2012-03-19 04:25:09 +01:00
|
|
|
result.collides = true;
|
2016-01-09 23:07:46 +01:00
|
|
|
} else if (nearest_collided == 1) { // Y
|
|
|
|
if(fabs(speed_f->Y) > BS * 3)
|
2016-01-25 00:06:01 +01:00
|
|
|
speed_f->Y *= bounce;
|
2016-03-01 11:15:08 +01:00
|
|
|
else
|
2016-01-25 00:06:01 +01:00
|
|
|
speed_f->Y = 0;
|
2012-03-19 04:25:09 +01:00
|
|
|
result.collides = true;
|
2016-01-09 23:07:46 +01:00
|
|
|
} else if (nearest_collided == 2) { // Z
|
2016-01-25 00:06:01 +01:00
|
|
|
if (fabs(speed_f->Z) > BS * 3)
|
|
|
|
speed_f->Z *= bounce;
|
2012-09-01 11:58:37 +02:00
|
|
|
else
|
2016-01-25 00:06:01 +01:00
|
|
|
speed_f->Z = 0;
|
2012-03-19 04:25:09 +01:00
|
|
|
result.collides = true;
|
|
|
|
}
|
2012-09-01 11:58:37 +02:00
|
|
|
|
2016-01-25 00:06:01 +01:00
|
|
|
info.new_speed = *speed_f;
|
2017-08-20 19:37:55 +02:00
|
|
|
if (info.new_speed.getDistanceFrom(info.old_speed) < 0.1f * BS)
|
2012-09-01 11:58:37 +02:00
|
|
|
is_collision = false;
|
|
|
|
|
2015-08-12 17:13:19 +02:00
|
|
|
if (is_collision) {
|
2012-09-01 11:58:37 +02:00
|
|
|
result.collisions.push_back(info);
|
|
|
|
}
|
2012-03-19 04:25:09 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-01 11:15:08 +01:00
|
|
|
/*
|
|
|
|
Final touches: Check if standing on ground, step up stairs.
|
|
|
|
*/
|
|
|
|
aabb3f box = box_0;
|
|
|
|
box.MinEdge += *pos_f;
|
|
|
|
box.MaxEdge += *pos_f;
|
2017-08-17 20:23:54 +02:00
|
|
|
for (const auto &box_info : cinfo) {
|
2016-01-09 23:07:46 +01:00
|
|
|
const aabb3f &cbox = box_info.box;
|
2016-03-01 11:15:08 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
See if the object is touching ground.
|
|
|
|
|
|
|
|
Object touches ground if object's minimum Y is near node's
|
|
|
|
maximum Y and object's X-Z-area overlaps with the node's
|
|
|
|
X-Z-area.
|
|
|
|
|
|
|
|
Use 0.15*BS so that it is easier to get on a node.
|
|
|
|
*/
|
|
|
|
if (cbox.MaxEdge.X - d > box.MinEdge.X && cbox.MinEdge.X + d < box.MaxEdge.X &&
|
|
|
|
cbox.MaxEdge.Z - d > box.MinEdge.Z &&
|
|
|
|
cbox.MinEdge.Z + d < box.MaxEdge.Z) {
|
2016-01-09 23:07:46 +01:00
|
|
|
if (box_info.is_step_up) {
|
|
|
|
pos_f->Y += cbox.MaxEdge.Y - box.MinEdge.Y;
|
2016-03-01 11:15:08 +01:00
|
|
|
box = box_0;
|
|
|
|
box.MinEdge += *pos_f;
|
|
|
|
box.MaxEdge += *pos_f;
|
|
|
|
}
|
2018-04-03 18:16:17 +02:00
|
|
|
if (std::fabs(cbox.MaxEdge.Y - box.MinEdge.Y) < 0.15f * BS) {
|
2016-03-01 11:15:08 +01:00
|
|
|
result.touching_ground = true;
|
|
|
|
|
2016-01-09 23:07:46 +01:00
|
|
|
if (box_info.is_object)
|
2016-03-01 11:15:08 +01:00
|
|
|
result.standing_on_object = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-10 14:16:27 +02:00
|
|
|
return result;
|
|
|
|
}
|