summaryrefslogtreecommitdiff
path: root/src/camera.cpp
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-06-01 13:18:52 +0200
committerWeblate <42@minetest.ru>2013-06-01 13:18:52 +0200
commit1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124 (patch)
tree54660f353f3342f89b6259ea6a5dfedfa20dc16f /src/camera.cpp
parentec039a3d123120f9918812b13f5971e94546b9af (diff)
parent64627817fcca52f20948c24b60ce192b218f6ce2 (diff)
downloadminetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.gz
minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.bz2
minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/camera.cpp')
-rw-r--r--src/camera.cpp66
1 files changed, 53 insertions, 13 deletions
diff --git a/src/camera.cpp b/src/camera.cpp
index 6224a2b8e..3d8713d6a 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -71,7 +71,12 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
m_digging_anim(0),
m_digging_button(-1),
- m_dummymesh(createCubeMesh(v3f(1,1,1)))
+ m_dummymesh(createCubeMesh(v3f(1,1,1))),
+
+ m_wield_change_timer(0.125),
+ m_wield_mesh_next(NULL),
+ m_previous_playeritem(-1),
+ m_previous_itemname("")
{
//dstream<<__FUNCTION_NAME<<std::endl;
@@ -142,6 +147,22 @@ void Camera::step(f32 dtime)
m_view_bobbing_fall = -1; // Mark the effect as finished
}
+ bool was_under_zero = m_wield_change_timer < 0;
+ if(m_wield_change_timer < 0.125)
+ m_wield_change_timer += dtime;
+ if(m_wield_change_timer > 0.125)
+ m_wield_change_timer = 0.125;
+
+ if(m_wield_change_timer >= 0 && was_under_zero) {
+ if(m_wield_mesh_next) {
+ m_wieldnode->setMesh(m_wield_mesh_next);
+ m_wieldnode->setVisible(true);
+ } else {
+ m_wieldnode->setVisible(false);
+ }
+ m_wield_mesh_next = NULL;
+ }
+
if (m_view_bobbing_state != 0)
{
//f32 offset = dtime * m_view_bobbing_speed * 0.035;
@@ -342,8 +363,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
m_fov_y = fov_degrees * M_PI / 180.0;
// Increase vertical FOV on lower aspect ratios (<16:10)
m_fov_y *= MYMAX(1.0, MYMIN(1.4, sqrt(16./10. / m_aspect)));
- // WTF is this? It can't be right
- m_fov_x = 2 * atan(0.5 * m_aspect * tan(m_fov_y));
+ m_fov_x = 2 * atan(m_aspect * tan(0.5 * m_fov_y));
m_cameranode->setAspectRatio(m_aspect);
m_cameranode->setFOV(m_fov_y);
@@ -352,6 +372,10 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
v3f wield_position = v3f(55, -35, 65);
//v3f wield_rotation = v3f(-100, 120, -100);
v3f wield_rotation = v3f(-100, 120, -100);
+ if(m_wield_change_timer < 0)
+ wield_position.Y -= 40 + m_wield_change_timer*320;
+ else
+ wield_position.Y -= 40 - m_wield_change_timer*320;
if(m_digging_anim < 0.05 || m_digging_anim > 0.5){
f32 frac = 1.0;
if(m_digging_anim > 0.5)
@@ -560,18 +584,34 @@ void Camera::setDigging(s32 button)
m_digging_button = button;
}
-void Camera::wield(const ItemStack &item)
+void Camera::wield(const ItemStack &item, u16 playeritem)
{
IItemDefManager *idef = m_gamedef->idef();
- scene::IMesh *wield_mesh = idef->getWieldMesh(item.getDefinition(idef).name, m_gamedef);
- if(wield_mesh)
- {
- m_wieldnode->setMesh(wield_mesh);
- m_wieldnode->setVisible(true);
- }
- else
- {
- m_wieldnode->setVisible(false);
+ std::string itemname = item.getDefinition(idef).name;
+ m_wield_mesh_next = idef->getWieldMesh(itemname, m_gamedef);
+ if(playeritem != m_previous_playeritem &&
+ !(m_previous_itemname == "" && itemname == "")) {
+ m_previous_playeritem = playeritem;
+ m_previous_itemname = itemname;
+ if(m_wield_change_timer >= 0.125)
+ m_wield_change_timer = -0.125;
+ else if(m_wield_change_timer > 0) {
+ m_wield_change_timer = -m_wield_change_timer;
+ }
+ } else {
+ if(m_wield_mesh_next) {
+ m_wieldnode->setMesh(m_wield_mesh_next);
+ m_wieldnode->setVisible(true);
+ } else {
+ m_wieldnode->setVisible(false);
+ }
+ m_wield_mesh_next = NULL;
+ if(m_previous_itemname != itemname) {
+ m_previous_itemname = itemname;
+ m_wield_change_timer = 0;
+ }
+ else
+ m_wield_change_timer = 0.125;
}
}