Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2025-01-24 06:51:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Optimize raycast performance (#15233)"

Browse Source 
This reverts commit f7a695c212bea96887b32b859645f621fd8f1b48.
This commit is contained in:
Lars Müller 2024-12-14 18:50:21 +01:00
parent 52a6673dab
commit f99a1a7c7c
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/lua_api.md
View File

@ -9948,8 +9948,6 @@ Used by `core.register_node`.
selection_box = { selection_box = {
-- see [Node boxes] for possibilities -- see [Node boxes] for possibilities
-- Selection boxes that oversize node size can cause
-- significant performance drop of Raycasts.
}, },
-- Custom selection box definition. Multiple boxes can be defined. -- Custom selection box definition. Multiple boxes can be defined.
-- If "nodebox" drawtype is used and selection_box is nil, then node_box -- If "nodebox" drawtype is used and selection_box is nil, then node_box

6
src/environment.cpp
View File

@ -163,8 +163,6 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result_p)
break; // About to go out of bounds break; // About to go out of bounds
} }
const v3s16 pos_on_ray = state->m_iterator.m_current_node_pos;
// For each untested node // For each untested node
for (s16 z = new_nodes.MinEdge.Z; z <= new_nodes.MaxEdge.Z; z++) for (s16 z = new_nodes.MinEdge.Z; z <= new_nodes.MaxEdge.Z; z++)
for (s16 y = new_nodes.MinEdge.Y; y <= new_nodes.MaxEdge.Y; y++) for (s16 y = new_nodes.MinEdge.Y; y <= new_nodes.MaxEdge.Y; y++)
@ -177,10 +175,6 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result_p)
if (!is_valid_position) if (!is_valid_position)
continue; continue;
// Optimization: Skip non-oversized selection boxes for other positions.
if ((pos_on_ray != np) && !nodedef->get(n).has_big_selection_box)
continue;
PointabilityType pointable = isPointableNode(n, nodedef, PointabilityType pointable = isPointableNode(n, nodedef,
state->m_liquids_pointable, state->m_liquids_pointable,
state->m_pointabilities); state->m_pointabilities);

12
src/nodedef.cpp
View File

@ -1257,15 +1257,6 @@ inline void NodeDefManager::fixSelectionBoxIntUnion()
m_selection_box_union.MaxEdge.Z / BS - 0.5f); m_selection_box_union.MaxEdge.Z / BS - 0.5f);
} }
inline void NodeDefManager::calcBigSelectionBox(content_t id, const ContentFeatures &def)
{
aabb3f box_union;
getNodeBoxUnion(def.selection_box, def, &box_union);
m_content_features[id].has_big_selection_box =
(box_union.MinEdge.X < -BS/2) || (box_union.MaxEdge.X > BS/2) ||
(box_union.MinEdge.Y < -BS/2) || (box_union.MaxEdge.Y > BS/2) ||
(box_union.MinEdge.Z < -BS/2) || (box_union.MaxEdge.Z > BS/2);
}
void NodeDefManager::eraseIdFromGroups(content_t id) void NodeDefManager::eraseIdFromGroups(content_t id)
{ {
@ -1321,7 +1312,6 @@ content_t NodeDefManager::set(const std::string &name, const ContentFeatures &de
getNodeBoxUnion(def.selection_box, def, &m_selection_box_union); getNodeBoxUnion(def.selection_box, def, &m_selection_box_union);
fixSelectionBoxIntUnion(); fixSelectionBoxIntUnion();
calcBigSelectionBox(id, def);
// Add this content to the list of all groups it belongs to // Add this content to the list of all groups it belongs to
for (const auto &group : def.groups) { for (const auto &group : def.groups) {
const std::string &group_name = group.first; const std::string &group_name = group.first;
@ -1535,8 +1525,6 @@ void NodeDefManager::deSerialize(std::istream &is, u16 protocol_version)
getNodeBoxUnion(f.selection_box, f, &m_selection_box_union); getNodeBoxUnion(f.selection_box, f, &m_selection_box_union);
fixSelectionBoxIntUnion(); fixSelectionBoxIntUnion();
calcBigSelectionBox(i, f);
} }
// Since liquid_alternative_flowing_id and liquid_alternative_source_id // Since liquid_alternative_flowing_id and liquid_alternative_source_id

5
src/nodedef.h
View File

@ -425,8 +425,6 @@ struct ContentFeatures
NodeBox node_box; NodeBox node_box;
NodeBox selection_box; NodeBox selection_box;
NodeBox collision_box; NodeBox collision_box;
//! Whether any selection box extent is > BS/2.
bool has_big_selection_box;
// --- SOUND PROPERTIES --- // --- SOUND PROPERTIES ---
@ -776,9 +774,6 @@ private:
*/ */
void fixSelectionBoxIntUnion(); void fixSelectionBoxIntUnion();
//! Calculates ContentFeatures::&has_big_selection_box
void calcBigSelectionBox(content_t id, const ContentFeatures &def);
//! Features indexed by ID. //! Features indexed by ID.
std::vector<ContentFeatures> m_content_features; std::vector<ContentFeatures> m_content_features;