minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Ease selection of entities behind nodes (#7739)

This commit is contained in:
SmallJoker 2018-10-26 19:23:33 +02:00 committed by GitHub
parent 622e2235ee
commit 45b52f6d5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/raycast.cpp
View File

@ -28,12 +28,22 @@ bool RaycastSort::operator() (const PointedThing &pt1,
// "nothing" can not be sorted
assert(pt1.type != POINTEDTHING_NOTHING);
assert(pt2.type != POINTEDTHING_NOTHING);
f32 pt1_distSq = pt1.distanceSq;
// Add some bonus when one of them is an object
if (pt1.type != pt2.type) {
if (pt1.type == POINTEDTHING_OBJECT)
pt1_distSq -= BS * BS;
else if (pt2.type == POINTEDTHING_OBJECT)
pt1_distSq += BS * BS;
}
// returns false if pt1 is nearer than pt2
if (pt1.distanceSq < pt2.distanceSq) {
if (pt1_distSq < pt2.distanceSq) {
return false;
}
if (pt1.distanceSq == pt2.distanceSq) {
if (pt1_distSq == pt2.distanceSq) {
// Sort them to allow only one order
if (pt1.type == POINTEDTHING_OBJECT)
return (pt2.type == POINTEDTHING_OBJECT