diff options
| author | TeTpaAka <TeTpaAka@users.noreply.github.com> | 2017-07-29 19:24:10 +0200 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2017-07-29 19:24:10 +0200 |
| commit | d504831ee2adf59421e82202e350f82701bd3cd0 (patch) | |
| tree | 60995a1066acd095d386add25362b2a1c660fde8 /src/camera.cpp | |
| parent | 765fd9a0bc0bb9f08d12713dc586e7f4c59c421d (diff) | |
| download | minetest-d504831ee2adf59421e82202e350f82701bd3cd0.tar.xz | |
Move the nametag back to the top of the player (#6179)
read the actual height of the collisionbox
Diffstat (limited to 'src/camera.cpp')
| -rw-r--r-- | src/camera.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/camera.cpp b/src/camera.cpp index 027e0ffc8..efd8a3389 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -617,7 +617,7 @@ void Camera::drawNametags() // shadow can remain. continue; } - v3f pos = nametag->parent_node->getAbsolutePosition() + v3f(0.0, 1.1 * BS, 0.0); + v3f pos = nametag->parent_node->getAbsolutePosition() + nametag->nametag_pos * BS; f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f }; trans.multiplyWith1x4Matrix(transformed_pos); if (transformed_pos[3] > 0) { @@ -641,9 +641,10 @@ void Camera::drawNametags() } Nametag *Camera::addNametag(scene::ISceneNode *parent_node, - std::string nametag_text, video::SColor nametag_color) + const std::string &nametag_text, video::SColor nametag_color, + const v3f &pos) { - Nametag *nametag = new Nametag(parent_node, nametag_text, nametag_color); + Nametag *nametag = new Nametag(parent_node, nametag_text, nametag_color, pos); m_nametags.push_back(nametag); return nametag; } |