1
0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-20 00:25:20 +01:00

Break include chains and tidy (part 2)

This commit is contained in:
SmallJoker
2025-11-06 19:31:13 +01:00
committed by GitHub
parent 8593d38030
commit 98fb381910
60 changed files with 259 additions and 153 deletions

View File

@@ -5,11 +5,8 @@
#pragma once
#include "irrlichttypes.h"
#include "inventory.h"
#include "inventory.h" // ItemStack
#include "util/numeric.h"
#include "client/localplayer.h"
#include <ICameraSceneNode.h>
#include <ISceneNode.h>
#include <plane3d.h>
#include <array>
#include <list>
@@ -21,6 +18,14 @@ class Client;
class RenderingEngine;
class WieldMeshSceneNode;
enum CameraMode : int;
namespace scene {
class ICameraSceneNode;
class ISceneManager;
class ISceneNode;
};
struct Nametag
{
scene::ISceneNode *parent_node = nullptr;
@@ -75,10 +80,7 @@ public:
}
// Returns the absolute position of the head SceneNode in the world
inline v3f getHeadPosition() const
{
return m_headnode->getAbsolutePosition();
}
v3f getHeadPosition() const;
// Get the camera direction (in absolute camera coordinates).
// This has view bobbing applied.
@@ -156,15 +158,7 @@ public:
void drawWieldedTool(core::matrix4* translation=NULL);
// Toggle the current camera mode
void toggleCameraMode()
{
if (m_camera_mode == CAMERA_MODE_FIRST)
m_camera_mode = CAMERA_MODE_THIRD;
else if (m_camera_mode == CAMERA_MODE_THIRD)
m_camera_mode = CAMERA_MODE_THIRD_FRONT;
else
m_camera_mode = CAMERA_MODE_FIRST;
}
void toggleCameraMode();
// Set the current camera mode
inline void setCameraMode(CameraMode mode)
@@ -255,7 +249,7 @@ private:
f32 m_wield_change_timer = 0.125f;
ItemStack m_wield_item_next;
CameraMode m_camera_mode = CAMERA_MODE_FIRST;
CameraMode m_camera_mode;
f32 m_cache_view_bobbing_amount;
bool m_arm_inertia;