Fix camera "jumping" when attached and the parent goes too fast

Zeg9 · PilzAdam · commit c1bf6f9f7a6d · 2013-04-03T23:22:40.000+02:00
diff --git a/src/camera.cpp b/src/camera.cpp
@@ -218,6 +218,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
 	// Smooth the movement when walking up stairs
 	v3f old_player_position = m_playernode->getPosition();
 	v3f player_position = player->getPosition();
+	if (player->isAttached && player->parent)
+		player_position = player->parent->getPosition();
 	//if(player->touching_ground && player_position.Y > old_player_position.Y)
 	if(player->touching_ground &&
 			player_position.Y > old_player_position.Y)
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
@@ -1129,6 +1129,7 @@ class GenericCAO : public ClientActiveObject
 			{
 				LocalPlayer *player = m_env->getLocalPlayer();
 				player->overridePosition = getParent()->getPosition();
+				m_env->getLocalPlayer()->parent = getParent();
 			}
 		}
 		else
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 LocalPlayer::LocalPlayer(IGameDef *gamedef):
 	Player(gamedef),
+	parent(0),
 	isAttached(false),
 	overridePosition(v3f(0,0,0)),
 	last_position(v3f(0,0,0)),
diff --git a/src/localplayer.h b/src/localplayer.h
@@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class ClientEnvironment;
 
+class ClientActiveObject;
+
 class LocalPlayer : public Player
 {
 public:
@@ -35,6 +37,8 @@ class LocalPlayer : public Player
 	{
 		return true;
 	}
+	
+	ClientActiveObject *parent;
 
 	bool isAttached;
 

Original file line number	Diff line number	Diff line change
`@@ -1129,6 +1129,7 @@ class GenericCAO : public ClientActiveObject`
`1129`	`1129`	`{`
`1130`	`1130`	`LocalPlayer *player = m_env->getLocalPlayer();`
`1131`	`1131`	`player->overridePosition = getParent()->getPosition();`
	`1132`	`+ m_env->getLocalPlayer()->parent = getParent();`
`1132`	`1133`	`}`
`1133`	`1134`	`}`
`1134`	`1135`	`else`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`25`	`25`
`26`	`26`	`class ClientEnvironment;`
`27`	`27`
	`28`	`+class ClientActiveObject;`
	`29`	`+`
`28`	`30`	`class LocalPlayer : public Player`
`29`	`31`	`{`
`30`	`32`	`public:`
`@@ -35,6 +37,8 @@ class LocalPlayer : public Player`
`35`	`37`	`{`
`36`	`38`	`return true;`
`37`	`39`	`}`
	`40`	`+`
	`41`	`+ ClientActiveObject *parent;`
`38`	`42`
`39`	`43`	`bool isAttached;`
`40`	`44`