Meta-set nodedef: Part 4

Mainly a refactor of parts of minetest#1118
Thomas--S · Jun 7, 2017 · 75955f8 · 75955f8
1 parent 5072d47
commit 75955f8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 19 deletions.
diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
@@ -669,12 +669,10 @@ ClientActiveObject * ClientEnvironment::getSelectedActiveObject(
 /*
 	Check if a node is pointable
 */
-static inline bool isPointableNode(const MapNode &n,
+static inline bool isPointableNode(const ContentFeatures &f,
 	INodeDefManager *ndef, bool liquids_pointable)
 {
-	const ContentFeatures &features = ndef->get(n);
-	return features.pointable ||
-		(liquids_pointable && features.isLiquid());
+	return f.pointable || (liquids_pointable && f.isLiquid());
 }
 
 PointedThing ClientEnvironment::getPointedThing(
@@ -769,12 +767,14 @@ PointedThing ClientEnvironment::getPointedThing(
 					bool is_valid_position;
 
 					n = m_map->getNodeNoEx(np, &is_valid_position);
+					HybridPtr<const ContentFeatures> f_ptr = m_map->getNodeDefNoEx(np);
+					const ContentFeatures &f = *f_ptr;
 					if (!(is_valid_position &&
-						isPointableNode(n, nodedef, liquids_pointable))) {
+						isPointableNode(f, nodedef, liquids_pointable))) {
 						continue;
 					}
 					std::vector<aabb3f> boxes;
-					n.getSelectionBoxes(nodedef, &boxes,
+					n.getSelectionBoxes(f, &boxes,
 						n.getNeighbors(np, m_map));
 
 					v3f npf = intToFloat(np, BS);

diff --git a/src/collision.cpp b/src/collision.cpp
@@ -283,7 +283,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 
 			any_position_valid = true;
 			INodeDefManager *nodedef = gamedef->getNodeDefManager();
-			const ContentFeatures &f = nodedef->get(n);
+			HybridPtr<const ContentFeatures> f_ptr = map->getNodeDefNoEx(p);
+			const ContentFeatures &f = *f_ptr;
 			if(f.walkable == false)
 				continue;
 			int n_bouncy_value = itemgroup_get(f.groups, "bouncy");
@@ -316,7 +317,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 				getNeighborConnectingFace(p2, nodedef, map, n, 32, &neighbors);
 			}
 			std::vector<aabb3f> nodeboxes;
-			n.getCollisionBoxes(gamedef->ndef(), &nodeboxes, neighbors);
+			n.getCollisionBoxes(f, &nodeboxes, neighbors);
 			for(std::vector<aabb3f>::iterator
 					i = nodeboxes.begin();
 					i != nodeboxes.end(); ++i)

diff --git a/src/game.cpp b/src/game.cpp
@@ -3668,8 +3668,10 @@ PointedThing Game::updatePointedThing(
 	} else if (result.type == POINTEDTHING_NODE) {
 		// Update selection boxes
 		MapNode n = map.getNodeNoEx(result.node_undersurface);
+		HybridPtr<const ContentFeatures> f_ptr = map.getNodeDefNoEx(result.node_undersurface);
+		const ContentFeatures &f = *f_ptr;
 		std::vector<aabb3f> boxes;
-		n.getSelectionBoxes(nodedef, &boxes,
+		n.getSelectionBoxes(f, &boxes,
 			n.getNeighbors(result.node_undersurface, &map));
 
 		f32 d = 0.002 * BS;

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
@@ -270,13 +270,15 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 	v3s16 pp2 = floatToInt(position + v3f(0,-0.2*BS,0), BS);
 	node = map->getNodeNoEx(pp, &is_valid_position);
 	bool is_valid_position2;
-	MapNode node2 = map->getNodeNoEx(pp2, &is_valid_position2);
+	HybridPtr<const ContentFeatures> f_ptr = map->getNodeDefNoEx(pp);
+	HybridPtr<const ContentFeatures> f_ptr2 = map->getNodeDefNoEx(pp2, &is_valid_position2);
 
 	if (!(is_valid_position && is_valid_position2)) {
 		is_climbing = false;
 	} else {
-		is_climbing = (nodemgr->get(node.getContent()).climbable
-				|| nodemgr->get(node2.getContent()).climbable) && !free_move;
+		const ContentFeatures &f = *f_ptr;
+		const ContentFeatures &f2 = *f_ptr2;
+		is_climbing = (f.climbable || f2.climbable) && !free_move;
 	}
 
 
@@ -445,8 +447,10 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 		if (sneak_node_found) {
 			// Update saved top bounding box of sneak node
 			MapNode n = map->getNodeNoEx(m_sneak_node);
+			HybridPtr<const ContentFeatures> f_ptr = map->getNodeDefNoEx(m_sneak_node);
+			const ContentFeatures &f = *f_ptr;
 			std::vector<aabb3f> nodeboxes;
-			n.getCollisionBoxes(nodemgr, &nodeboxes);
+			n.getCollisionBoxes(f, &nodeboxes);
 			m_sneak_node_bb_top = getTopBoundingBox(nodeboxes);
 
 			m_sneak_ladder_detected = physics_override_sneak_glitch &&
@@ -908,13 +912,16 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
 	v3s16 pp2 = floatToInt(position + v3f(0, -0.2 * BS, 0), BS);
 	node = map->getNodeNoEx(pp, &is_valid_position);
 	bool is_valid_position2;
-	MapNode node2 = map->getNodeNoEx(pp2, &is_valid_position2);
+	HybridPtr<const ContentFeatures> f_ptr = map->getNodeDefNoEx(pp);
+	HybridPtr<const ContentFeatures> f_ptr2 = map->getNodeDefNoEx(pp2, &is_valid_position2);
 
-	if (!(is_valid_position && is_valid_position2))
+	if (!(is_valid_position && is_valid_position2)) {
 		is_climbing = false;
-	else
-		is_climbing = (nodemgr->get(node.getContent()).climbable ||
-				nodemgr->get(node2.getContent()).climbable) && !free_move;
+	} else {
+    	const ContentFeatures &f = *f_ptr;
+    	const ContentFeatures &f2 = *f_ptr2;
+		is_climbing = (f.climbable || f2.climbable) && !free_move;
+	}
 
 	/*
 		Collision uncertainty radius
@@ -1049,8 +1056,10 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
 		if (sneak_node_found) {
 			f32 cb_max = 0;
 			MapNode n = map->getNodeNoEx(m_sneak_node);
+			HybridPtr<const ContentFeatures> f_ptr = map->getNodeDefNoEx(m_sneak_node);
+            const ContentFeatures &f = *f_ptr;
 			std::vector<aabb3f> nodeboxes;
-			n.getCollisionBoxes(nodemgr, &nodeboxes);
+			n.getCollisionBoxes(f, &nodeboxes);
 			for (std::vector<aabb3f>::iterator it = nodeboxes.begin();
 					it != nodeboxes.end(); ++it) {
 				aabb3f box = *it;