Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change BS constant from implicit double to float (#6286)

Browse Source 
the BS constant
implicitly promotes all position calculations it is used in to double even
though positions (= v3f) are only meant to be floats.

There are many, many similar occurrences everywhere, but I'm not willing to
hunt down all; I only fixed the little part I'm already familiar with.
This commit is contained in:
Jens Rottmann 2017-08-20 19:37:55 +02:00 committed by Loïc Blot
parent ae9b5e0098
commit 9d8cb510b3
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/collision.cpp
View File

@ -227,13 +227,13 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
/* /*
Calculate new velocity Calculate new velocity
*/ */
if (dtime > 0.5) { if (dtime > 0.5f) {
if (!time_notification_done) { if (!time_notification_done) {
time_notification_done = true; time_notification_done = true;
infostream << "collisionMoveSimple: maximum step interval exceeded," infostream << "collisionMoveSimple: maximum step interval exceeded,"
" lost movement details!"<<std::endl; " lost movement details!"<<std::endl;
} }
dtime = 0.5; dtime = 0.5f;
} else { } else {
time_notification_done = false; time_notification_done = false;
} }
@ -259,7 +259,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
v3f newpos_f = *pos_f + *speed_f * dtime; v3f newpos_f = *pos_f + *speed_f * dtime;
v3f minpos_f( v3f minpos_f(
MYMIN(pos_f->X, newpos_f.X), MYMIN(pos_f->X, newpos_f.X),
MYMIN(pos_f->Y, newpos_f.Y) + 0.01 * BS, // bias rounding, player often at +/-n.5 MYMIN(pos_f->Y, newpos_f.Y) + 0.01f * BS, // bias rounding, player often at +/-n.5
MYMIN(pos_f->Z, newpos_f.Z) MYMIN(pos_f->Z, newpos_f.Z)
); );
v3f maxpos_f( v3f maxpos_f(
@ -355,7 +355,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
if (c_env != 0) { if (c_env != 0) {
f32 distance = speed_f->getLength(); f32 distance = speed_f->getLength();
std::vector<DistanceSortedActiveObject> clientobjects; std::vector<DistanceSortedActiveObject> clientobjects;
c_env->getActiveObjects(*pos_f, distance * 1.5, clientobjects); c_env->getActiveObjects(*pos_f, distance * 1.5f, clientobjects);
for (auto &clientobject : clientobjects) { for (auto &clientobject : clientobjects) {
if (!self || (self != clientobject.obj)) { if (!self || (self != clientobject.obj)) {
objects.push_back((ActiveObject*) clientobject.obj); objects.push_back((ActiveObject*) clientobject.obj);
@ -369,7 +369,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
if (s_env != NULL) { if (s_env != NULL) {
f32 distance = speed_f->getLength(); f32 distance = speed_f->getLength();
std::vector<u16> s_objects; std::vector<u16> s_objects;
s_env->getObjectsInsideRadius(s_objects, *pos_f, distance * 1.5); s_env->getObjectsInsideRadius(s_objects, *pos_f, distance * 1.5f);
for (u16 obj_id : s_objects) { for (u16 obj_id : s_objects) {
ServerActiveObject *current = s_env->getActiveObject(obj_id); ServerActiveObject *current = s_env->getActiveObject(obj_id);
if (!self || (self != current)) { if (!self || (self != current)) {
@ -401,7 +401,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
Collision uncertainty radius Collision uncertainty radius
Make it a bit larger than the maximum distance of movement Make it a bit larger than the maximum distance of movement
*/ */
f32 d = pos_max_d * 1.1; f32 d = pos_max_d * 1.1f;
// A fairly large value in here makes moving smoother // A fairly large value in here makes moving smoother
//f32 d = 0.15*BS; //f32 d = 0.15*BS;
@ -410,7 +410,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
int loopcount = 0; int loopcount = 0;
while(dtime > BS * 1e-10) { while(dtime > BS * 1e-10f) {
//TimeTaker tt3("collisionMoveSimple dtime loop"); //TimeTaker tt3("collisionMoveSimple dtime loop");
ScopeProfiler sp2(g_profiler, "collisionMoveSimple dtime loop avg", SPT_AVG); ScopeProfiler sp2(g_profiler, "collisionMoveSimple dtime loop avg", SPT_AVG);
@ -468,7 +468,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
d)); d));
// Get bounce multiplier // Get bounce multiplier
float bounce = -(float)nearest_info.bouncy / 100.0; float bounce = -(float)nearest_info.bouncy / 100.0f;
// Move to the point of collision and reduce dtime by nearest_dtime // Move to the point of collision and reduce dtime by nearest_dtime
if (nearest_dtime < 0) { if (nearest_dtime < 0) {
@ -525,7 +525,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
} }
info.new_speed = *speed_f; info.new_speed = *speed_f;
if (info.new_speed.getDistanceFrom(info.old_speed) < 0.1 * BS) if (info.new_speed.getDistanceFrom(info.old_speed) < 0.1f * BS)
is_collision = false; is_collision = false;
if (is_collision) { if (is_collision) {
@ -561,7 +561,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
box.MinEdge += *pos_f; box.MinEdge += *pos_f;
box.MaxEdge += *pos_f; box.MaxEdge += *pos_f;
} }
if (fabs(cbox.MaxEdge.Y - box.MinEdge.Y) < 0.15 * BS) { if (fabs(cbox.MaxEdge.Y - box.MinEdge.Y) < 0.15f * BS) {
result.touching_ground = true; result.touching_ground = true;
if (box_info.is_object) if (box_info.is_object)

2
src/constants.h
View File

@ -71,7 +71,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// floating-point and integer positions, which potentially give wrong // floating-point and integer positions, which potentially give wrong
// results. (negative coordinates, values between nodes, ...) // results. (negative coordinates, values between nodes, ...)
// Use floatToInt(p, BS) and intToFloat(p, BS). // Use floatToInt(p, BS) and intToFloat(p, BS).
#define BS (10.0) #define BS 10.0f
// Dimension of a MapBlock // Dimension of a MapBlock
#define MAP_BLOCKSIZE 16 #define MAP_BLOCKSIZE 16

12
src/util/numeric.h
View File

@ -268,12 +268,12 @@ inline v3f intToFloat(v3s16 p, f32 d)
inline aabb3f getNodeBox(v3s16 p, float d) inline aabb3f getNodeBox(v3s16 p, float d)
{ {
return aabb3f( return aabb3f(
(float)p.X * d - 0.5 * d, (float)p.X * d - 0.5f * d,
(float)p.Y * d - 0.5 * d, (float)p.Y * d - 0.5f * d,
(float)p.Z * d - 0.5 * d, (float)p.Z * d - 0.5f * d,
(float)p.X * d + 0.5 * d, (float)p.X * d + 0.5f * d,
(float)p.Y * d + 0.5 * d, (float)p.Y * d + 0.5f * d,
(float)p.Z * d + 0.5 * d (float)p.Z * d + 0.5f * d
); );
} }