Merge pull request #565 from ulteq/resetPositionFix

[Bugfix] Fixes Otter.airplane spawn error (#447)
RigsOfRods · Jan 18, 2016 · cda022f · cda022f
2 parents 7e2c8e0 + 18afcf5
commit cda022f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 45 deletions.
diff --git a/source/main/gameplay/RoRFrameListener.cpp b/source/main/gameplay/RoRFrameListener.cpp
@@ -387,7 +387,7 @@ bool RoRFrameListener::updateEvents(float dt)
 	{
 		// get out first
 		if (curr_truck) BeamFactory::getSingleton().setCurrentTruck(-1);
-		reload_pos = gEnv->player->getPosition() + Vector3(0.0f, 1.0f, 0.0f); // 1 meter above the character
+		reload_pos = gEnv->player->getPosition();
 		freeTruckPosition = true;
 		loading_state = RELOADING;
 		Application::GetGuiManager()->getMainSelector()->Show(LT_AllBeam);

diff --git a/source/main/gui/GUIMenu.cpp b/source/main/gui/GUIMenu.cpp
@@ -337,7 +337,7 @@ void GUI_MainMenu::onMenuBtn(MyGUI::MenuCtrlPtr _sender, MyGUI::MenuItemPtr _ite
 		if (gEnv->frameListener->loading_state == NONE_LOADED) return;
 		// get out first
 		if (BeamFactory::getSingleton().getCurrentTruckNumber() != -1) BeamFactory::getSingleton().setCurrentTruck(-1);
-		gEnv->frameListener->reload_pos = gEnv->player->getPosition() + Vector3(0.0f, 1.0f, 0.0f); // 1 meter above the character
+		gEnv->frameListener->reload_pos = gEnv->player->getPosition();
 		gEnv->frameListener->freeTruckPosition = true;
 		gEnv->frameListener->loading_state = RELOADING;
 		Application::GetGuiManager()->getMainSelector()->Show(LT_AllBeam);

diff --git a/source/main/physics/Beam.cpp b/source/main/physics/Beam.cpp
@@ -1063,38 +1063,6 @@ void Beam::resetAngle(float rot)
 	resetSlideNodePositions();
 }
 
-void Beam::resetPosition(float px, float pz, bool setInitPosition)
-{
-	// horizontal displacement
-	Vector3 offset = Vector3(px, 0, pz) - nodes[0].AbsPosition;
-	for (int i=0; i<free_node; i++)
-	{
-		nodes[i].AbsPosition += offset;
-	}
-
-	// vertical displacement
-	float vertical_offset = -nodes[lowestnode].AbsPosition.y;
-	if (gEnv->terrainManager->getWater())
-	{
-		vertical_offset += gEnv->terrainManager->getWater()->getHeight();
-	}
-
-	for (int i=1; i<free_node; i++)
-	{
-		Vector3 pos = nodes[i].AbsPosition;
-		pos.y = gEnv->terrainManager->getHeightFinder()->getHeightAt(pos.x, pos.z);
-		gEnv->collisions->collisionCorrect(&pos);
-		vertical_offset += std::max(0.0f, pos.y - (nodes[i].AbsPosition.y + vertical_offset));
-	}
-
-	for (int i=0; i<free_node; i++)
-	{
-		nodes[i].AbsPosition.y += vertical_offset;
-	}
-
-	resetPosition(Vector3::ZERO, setInitPosition);
-}
-
 void Beam::resetPosition(float px, float pz, bool setInitPosition, float miny)
 {
 	// horizontal displacement
@@ -1110,6 +1078,11 @@ void Beam::resetPosition(float px, float pz, bool setInitPosition, float miny)
 	{
 		vertical_offset += std::max(0.0f, gEnv->terrainManager->getWater()->getHeight() - (nodes[lowestnode].AbsPosition.y + vertical_offset));
 	}
+	for (int i=1; i<free_node; i++)
+	{
+		float terrainHeight = gEnv->terrainManager->getHeightFinder()->getHeightAt(nodes[i].AbsPosition.x, nodes[i].AbsPosition.z);
+		vertical_offset += std::max(0.0f, terrainHeight - (nodes[i].AbsPosition.y + vertical_offset));
+	}
 
 	for (int i=0; i<free_node; i++)
 	{
@@ -1298,7 +1271,7 @@ void Beam::SyncReset()
 		cur_dir = nodes[0].RelPosition - nodes[furthest_node].RelPosition;
 	}
 	float cur_rot = atan2(cur_dir.dotProduct(Vector3::UNIT_X), cur_dir.dotProduct(-Vector3::UNIT_Z));
-	cur_rot = std::round(cur_rot * 100) / 100;
+	cur_rot = floor(cur_rot * 100 + 0.5) / 100;
 	if (engine) engine->start();
 	for (int i=0; i<free_node; i++)
 	{
@@ -1375,11 +1348,7 @@ void Beam::SyncReset()
 	if (reset_requested == 2)
 	{
 		resetAngle(cur_rot);
-
-		if (yPos != 0)
-			resetPosition(cur_position.x, cur_position.z, false, yPos + 0.02f);
-		else
-			resetPosition(cur_position.x, cur_position.z, false);
+		resetPosition(cur_position.x, cur_position.z, false, yPos + global_dt * 1.0f);
 	}
 
 	// reset commands (self centering && push once/twice forced to terminate moving commands)
@@ -6151,12 +6120,12 @@ bool Beam::LoadTruck(
 		// check if over-sized
 		RigSpawner::RecalculateBoundingBoxes(this);
 		vehicle_position.x -= (boundingBox.getMaximum().x + boundingBox.getMinimum().x) / 2.0 - vehicle_position.x;
-		vehicle_position.z -= (boundingBox.getMaximum().z + boundingBox.getMinimum().z)/2.0 - vehicle_position.z;
+		vehicle_position.z -= (boundingBox.getMaximum().z + boundingBox.getMinimum().z) / 2.0 - vehicle_position.z;
 
 		if (freePositioned)
-			resetPosition(vehicle_position, true);
+			resetPosition(vehicle_position.x, vehicle_position.z, true, vehicle_position.y + 0.1f);
 		else
-			resetPosition(vehicle_position.x, vehicle_position.z, true);
+			resetPosition(vehicle_position.x, vehicle_position.z, true, 0.0f);
 
 		if (spawn_box != nullptr)
 		{

diff --git a/source/main/physics/Beam.h b/source/main/physics/Beam.h
@@ -99,7 +99,6 @@ class Beam :
 	Ogre::Vector3 getPosition();
 	void resetAngle(float rot);
 	void resetPosition(float px, float pz, bool setInitPosition, float miny);
-	void resetPosition(float px, float pz, bool setInitPosition);
 
 	Ogre::Vector3 getVehiclePosition();
 

diff --git a/source/main/physics/BeamFactory.cpp b/source/main/physics/BeamFactory.cpp
@@ -708,7 +708,7 @@ void BeamFactory::repairTruck(Collisions *collisions, const Ogre::String &inst,
 #endif // USE_OPENAL
 		Vector3 ipos=trucks[rtruck]->nodes[0].AbsPosition;
 		trucks[rtruck]->reset();
-		trucks[rtruck]->resetPosition(ipos.x, ipos.z, false);
+		trucks[rtruck]->resetPosition(ipos.x, ipos.z, false, 0);
 		trucks[rtruck]->updateVisual();
 	}
 }