Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-10 01:33:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zeg9 2012-12-27 14:22:59 +01:00 committed by PilzAdam
parent f85c1165c2
commit c1bf6f9f7a
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/camera.cpp
View File

@ -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)

1
src/content_cao.cpp
View File

@ -1129,6 +1129,7 @@ public:
{
LocalPlayer *player = m_env->getLocalPlayer();
player->overridePosition = getParent()->getPosition();
m_env->getLocalPlayer()->parent = getParent();
}
}
else

1
src/localplayer.cpp
View File

@ -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)),

4
src/localplayer.h
View File

@ -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:
@ -36,6 +38,8 @@ public:
return true;
}
ClientActiveObject *parent;
bool isAttached;
v3f overridePosition;