minenux/minetest-engine-minetest
minenux/minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Slippery: Simplify, make more efficient (#7086)

Browse Source 
Use already existing collision results for the nearest colliding node
Fix slippery effect in free_move mode
This commit is contained in:
SmallJoker 2018-03-03 10:59:14 +01:00 committed by luk3yx
parent 5181fb9b2c
commit 920ccfe9c2
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/localplayer.cpp
View File

@ -829,7 +829,7 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
std::vector<CollisionInfo> *collision_info) std::vector<CollisionInfo> *collision_info)
{ {
Map *map = &env->getMap(); Map *map = &env->getMap();
INodeDefManager *nodemgr = m_client->ndef(); NodeDefManager *nodemgr = m_client->ndef();
v3f position = getPosition(); v3f position = getPosition();
@ -1127,49 +1127,20 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
float LocalPlayer::getSlipFactor(Environment *env, const v3f &speedH) float LocalPlayer::getSlipFactor(Environment *env, const v3f &speedH)
{ {
if (!touching_ground)
return 1.0f;
float slip_factor = 1.0f;
// Slip on slippery nodes // Slip on slippery nodes
const INodeDefManager *nodemgr = env->getGameDef()->ndef(); const INodeDefManager *nodemgr = env->getGameDef()->ndef();
Map *map = &env->getMap(); Map *map = &env->getMap();
const ContentFeatures &f = nodemgr->get(map->getNodeNoEx( const ContentFeatures &f = nodemgr->get(map->getNodeNoEx(
floatToInt(getPosition() - v3f(0, 0.05f * BS, 0), BS))); getStandingNodePos()));
int slippery = 0; int slippery = 0;
if (f.walkable) { if (f.walkable)
slippery = itemgroup_get(f.groups, "slippery"); slippery = itemgroup_get(f.groups, "slippery");
} else if (is_slipping) {
// slipping over an edge? Check surroundings for slippery nodes
slippery = 2 << 16; // guard value, bigger than all realistic ones
for (int z = 0; z <= 1; z++) {
for (int x = 0; x <= 1; x++) {
// this should cover all nodes surrounding player position
v3f offset((x - 0.5f) * BS, 0.05f * BS, (z - 0.5f) * BS);
const ContentFeatures &f2 = nodemgr->get(map->getNodeNoEx(
floatToInt(getPosition() - offset, BS)));
if (f2.walkable) {
// find least slippery node we might be standing on
int s = itemgroup_get(f2.groups, "slippery");
if (s < slippery)
slippery = s;
}
}
}
// without any hits, ignore slippery
if (slippery >= (2 << 16))
slippery = 0;
}
if (slippery >= 1) { if (slippery >= 1) {
if (speedH == v3f(0.0f)) { if (speedH == v3f(0.0f)) {
slippery = slippery * 2; slippery = slippery * 2;
} }
slip_factor = core::clamp(1.0f / (slippery + 1), 0.001f, 1.0f); return core::clamp(1.0f / (slippery + 1), 0.001f, 1.0f);
is_slipping = true;
} else {
// remember this to avoid checking the edge case above too often
is_slipping = false;
} }
return slip_factor; return 1.0f;
} }

1
src/localplayer.h
View File

@ -62,7 +62,6 @@ public:
bool is_climbing = false; bool is_climbing = false;
bool swimming_vertical = false; bool swimming_vertical = false;
bool swimming_pitch = false; bool swimming_pitch = false;
bool is_slipping = false;
float physics_override_speed = 1.0f; float physics_override_speed = 1.0f;
float physics_override_jump = 1.0f; float physics_override_jump = 1.0f;