Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simple fix for camera blinking black when jumping into ceiling with current smaller collision box

master
Perttu Ahola 2012-03-29 21:21:34 +03:00
parent 92ae11bd3b
commit 42bbd5c9ae
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/player.cpp
View File

@ -40,6 +40,7 @@ Player::Player(IGameDef *gamedef):
in_water_stable(false), in_water_stable(false),
is_climbing(false), is_climbing(false),
swimming_up(false), swimming_up(false),
camera_barely_in_ceiling(false),
inventory(gamedef->idef()), inventory(gamedef->idef()),
hp(PLAYER_MAX_HP), hp(PLAYER_MAX_HP),
peer_id(PEER_ID_INEXISTENT), peer_id(PEER_ID_INEXISTENT),
@ -604,6 +605,17 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
MtEvent *e = new SimpleTriggerEvent("PlayerRegainGround"); MtEvent *e = new SimpleTriggerEvent("PlayerRegainGround");
m_gamedef->event()->put(e); m_gamedef->event()->put(e);
} }
{
camera_barely_in_ceiling = false;
v3s16 camera_np = floatToInt(getEyePosition(), BS);
MapNode n = map.getNodeNoEx(camera_np);
if(n.getContent() != CONTENT_IGNORE){
if(nodemgr->get(n).walkable){
camera_barely_in_ceiling = true;
}
}
}
} }
void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d) void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d)

8
src/player.h
View File

@ -66,9 +66,12 @@ public:
v3f getEyeOffset() v3f getEyeOffset()
{ {
// This is at the height of the eyes of the current figure // This is at the height of the eyes of the current figure
// return v3f(0, BS+BS/2, 0); // return v3f(0, BS*1.5, 0);
// This is more like in minecraft // This is more like in minecraft
return v3f(0,BS+(5*BS)/8,0); if(camera_barely_in_ceiling)
return v3f(0,BS*1.5,0);
else
return v3f(0,BS*1.625,0);
} }
v3f getEyePosition() v3f getEyePosition()
@ -143,6 +146,7 @@ public:
bool in_water_stable; bool in_water_stable;
bool is_climbing; bool is_climbing;
bool swimming_up; bool swimming_up;
bool camera_barely_in_ceiling;
u8 light; u8 light;