BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Camera: Fix shootline line offsets II (#9730)

Browse Source
This commit is contained in:
SmallJoker 2020-04-23 12:16:36 +02:00 committed by GitHub
parent 6ba44d7452
commit ce5b0932f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/client/game.cpp
View File

@ -3029,7 +3029,6 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
{ {
LocalPlayer *player = client->getEnv().getLocalPlayer(); LocalPlayer *player = client->getEnv().getLocalPlayer();
const v3f head_position = camera->getHeadPosition();
const v3f camera_direction = camera->getDirection(); const v3f camera_direction = camera->getDirection();
const v3s16 camera_offset = camera->getOffset(); const v3s16 camera_offset = camera->getOffset();
@ -3045,13 +3044,22 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
core::line3d<f32> shootline; core::line3d<f32> shootline;
if (camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT) { switch (camera->getCameraMode()) {
shootline = core::line3d<f32>(head_position, case CAMERA_MODE_FIRST:
head_position + camera_direction * BS * d); // Shoot from camera position, with bobbing
} else { shootline.start = camera->getPosition();
break;
case CAMERA_MODE_THIRD:
// Shoot from player head, no bobbing
shootline.start = camera->getHeadPosition();
break;
case CAMERA_MODE_THIRD_FRONT:
shootline.start = camera->getHeadPosition();
// prevent player pointing anything in front-view // prevent player pointing anything in front-view
shootline = core::line3d<f32>(head_position, head_position); d = 0;
break;
} }
shootline.end = shootline.start + camera_direction * BS * d;
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI