summaryrefslogtreecommitdiff
path: root/src/camera.h
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-04-18 20:00:16 +0200
committerWeblate <42@minetest.ru>2013-04-18 20:00:16 +0200
commit9e6376bd95ba9309365b39b878ab2f499776437a (patch)
treea354a250daedf036cc36e33d3d1ebb9fafc4ac27 /src/camera.h
parente385af7cc01d156164b85d10b00a7047a5372e66 (diff)
parente60eb32050a44d344795e4a1515a56038bb97e02 (diff)
downloadminetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.gz
minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.bz2
minetest-9e6376bd95ba9309365b39b878ab2f499776437a.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'src/camera.h')
-rw-r--r--src/camera.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/camera.h b/src/camera.h
index fc43d1176..0ed5c20d2 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -166,6 +166,8 @@ private:
s32 m_view_bobbing_state;
// Speed of view bobbing animation
f32 m_view_bobbing_speed;
+ // Fall view bobbing
+ f32 m_view_bobbing_fall;
// Digging animation frame (0 <= m_digging_anim < 1)
f32 m_digging_anim;
@@ -173,6 +175,9 @@ private:
// If 0, left-click digging animation
// If 1, right-click digging animation
s32 m_digging_button;
+
+ //dummymesh for camera
+ irr::scene::IAnimatedMesh* m_dummymesh;
};
#endif