Breaking world limit 3: Network compatible with old clients/servers [WIP]

.gitignore

@@ -28,6 +28,7 @@ gtags.files
 # Visual Studio Code & plugins
 .vscode/
 build/.cmake/
+.cache
 # Gradle
 .gradle
 

builtin/game/chat.lua

@@ -524,7 +524,7 @@ end
 
 -- Teleports player <name> to <p> if possible
 local function teleport_to_pos(name, p)
-	local lm = 31007 -- equals MAX_MAP_GENERATION_LIMIT in C++
+	local lm = tonumber(core.settings:get("mapgen_limit")) -- equals MAX_MAP_GENERATION_LIMIT in C++
 	if p.x < -lm or p.x > lm or p.y < -lm or p.y > lm
 			or p.z < -lm or p.z > lm then
 		return false, S("Cannot teleport out of map bounds!")

src/CMakeLists.txt

@@ -31,6 +31,8 @@ if(NOT (BUILD_CLIENT OR BUILD_SERVER))
 	set(BUILD_SERVER TRUE)
 endif()
 
+option(USE_POS32 "32 bit node/block positions (experimental, not compatible with 16 bit)" FALSE)
+option(USE_OPOS64 "64 bit object positions (experimental, not compatible with 32 bit)" ${USE_POS32})
 
 option(ENABLE_CURL "Enable cURL support for fetching media" TRUE)
 set(USE_CURL FALSE)

src/activeobject.h

@@ -103,7 +103,7 @@ class ActiveObject
 	 * The box's coordinates are world coordinates.
 	 * @returns true if the object has a collision box.
 	 */
-	virtual bool getCollisionBox(aabb3f *toset) const = 0;
+	virtual bool getCollisionBox(aabb3o *toset) const = 0;
 
 
 	/*!

src/client/activeobjectmgr.cpp

@@ -90,7 +90,7 @@ void ActiveObjectMgr::removeObject(u16 id)
 }
 
 // clang-format on
-void ActiveObjectMgr::getActiveObjects(const v3f &origin, f32 max_d,
+void ActiveObjectMgr::getActiveObjects(const v3opos_t &origin, f32 max_d,
 		std::vector<DistanceSortedActiveObject> &dest)
 {
 	f32 max_d2 = max_d * max_d;

src/client/activeobjectmgr.h

@@ -35,7 +35,7 @@ class ActiveObjectMgr : public ::ActiveObjectMgr<ClientActiveObject>
 	bool registerObject(ClientActiveObject *obj) override;
 	void removeObject(u16 id) override;
 
-	void getActiveObjects(const v3f &origin, f32 max_d,
+	void getActiveObjects(const v3opos_t &origin, f32 max_d,
 			std::vector<DistanceSortedActiveObject> &dest);
 };
 } // namespace client

src/client/camera.cpp

@@ -313,7 +313,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 	// Get player position
 	// Smooth the movement when walking up stairs
 	v3f old_player_position = m_playernode->getPosition();
-	v3f player_position = player->getPosition();
+	auto player_position = player->getPosition();
 
 	// This is worse than `LocalPlayer::getPosition()` but
 	// mods expect the player head to be at the parent's position
@@ -338,7 +338,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 	}
 
 	// Set player node transformation
-	m_playernode->setPosition(player_position);
+	m_playernode->setPosition(oposToV3f(player_position));
 	m_playernode->setRotation(v3f(0, -1 * player->getYaw(), 0));
 	m_playernode->updateAbsolutePosition();
 
@@ -405,14 +405,16 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 	}
 
 	// Compute absolute camera position and target
-	m_headnode->getAbsoluteTransformation().transformVect(m_camera_position, rel_cam_pos);
+	auto tmp = oposToV3f(m_camera_position); // TODO use offset?
+	m_headnode->getAbsoluteTransformation().transformVect(tmp, rel_cam_pos);
+	m_camera_position = v3fToOpos(tmp);
 	m_headnode->getAbsoluteTransformation().rotateVect(m_camera_direction, rel_cam_target - rel_cam_pos);
 
 	v3f abs_cam_up;
 	m_headnode->getAbsoluteTransformation().rotateVect(abs_cam_up, rel_cam_up);
 
 	// Seperate camera position for calculation
-	v3f my_cp = m_camera_position;
+	auto my_cp = m_camera_position;
 
 	// Reposition the camera for third person view
 	if (m_camera_mode > CAMERA_MODE_FIRST)
@@ -452,17 +454,17 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 
 	// Update offset if too far away from the center of the map
 	m_camera_offset.X += CAMERA_OFFSET_STEP*
-			(((s16)(my_cp.X/BS) - m_camera_offset.X)/CAMERA_OFFSET_STEP);
+			(((pos_t)(my_cp.X/BS) - m_camera_offset.X)/CAMERA_OFFSET_STEP);
 	m_camera_offset.Y += CAMERA_OFFSET_STEP*
-			(((s16)(my_cp.Y/BS) - m_camera_offset.Y)/CAMERA_OFFSET_STEP);
+			(((pos_t)(my_cp.Y/BS) - m_camera_offset.Y)/CAMERA_OFFSET_STEP);
 	m_camera_offset.Z += CAMERA_OFFSET_STEP*
-			(((s16)(my_cp.Z/BS) - m_camera_offset.Z)/CAMERA_OFFSET_STEP);
+			(((pos_t)(my_cp.Z/BS) - m_camera_offset.Z)/CAMERA_OFFSET_STEP);
 
 	// Set camera node transformation
-	m_cameranode->setPosition(my_cp-intToFloat(m_camera_offset, BS));
+	m_cameranode->setPosition(oposToV3f(my_cp-posToOpos(m_camera_offset, BS)));
 	m_cameranode->setUpVector(abs_cam_up);
 	// *100.0 helps in large map coordinates
-	m_cameranode->setTarget(my_cp-intToFloat(m_camera_offset, BS) + 100 * m_camera_direction);
+	m_cameranode->setTarget(oposToV3f(my_cp-posToOpos(m_camera_offset, BS) + v3fToOpos(100 * m_camera_direction)));
 
 	// update the camera position in third-person mode to render blocks behind player
 	// and correctly apply liquid post FX.

src/client/camera.h

@@ -91,15 +91,15 @@ class Camera
 
 	// Get the camera position (in absolute scene coordinates).
 	// This has view bobbing applied.
-	inline v3f getPosition() const
+	inline v3opos_t getPosition() const
 	{
 		return m_camera_position;
 	}
 
 	// Returns the absolute position of the head SceneNode in the world
-	inline v3f getHeadPosition() const
+	inline v3opos_t getHeadPosition() const
 	{
-		return m_headnode->getAbsolutePosition();
+		return v3fToOpos(m_headnode->getAbsolutePosition());
 	}
 
 	// Get the camera direction (in absolute camera coordinates).
@@ -110,7 +110,7 @@ class Camera
 	}
 
 	// Get the camera offset
-	inline v3s16 getOffset() const
+	inline v3pos_t getOffset() const
 	{
 		return m_camera_offset;
 	}
@@ -207,11 +207,11 @@ class Camera
 	f32 m_cache_fov;
 
 	// Absolute camera position
-	v3f m_camera_position;
+	v3opos_t m_camera_position;
 	// Absolute camera direction
 	v3f m_camera_direction;
 	// Camera offset
-	v3s16 m_camera_offset;
+	v3pos_t m_camera_offset;
 
 	bool m_stepheight_smooth_active = false;