Content menu, content-pack dependencies
This commit is contained in:
@@ -21,12 +21,13 @@ const float JUMP_FORCE = 8.0f;
|
||||
Player::Player(glm::vec3 position, float speed) :
|
||||
speed(speed),
|
||||
chosenSlot(0),
|
||||
inventory(new Inventory(40)),
|
||||
camera(new Camera(position, glm::radians(90.0f))),
|
||||
spCamera(new Camera(position, glm::radians(90.0f))),
|
||||
tpCamera(new Camera(position, glm::radians(90.0f))),
|
||||
currentCamera(camera),
|
||||
hitbox(new Hitbox(position, glm::vec3(0.3f,0.9f,0.3f))),
|
||||
inventory(new Inventory(40)) {
|
||||
hitbox(new Hitbox(position, glm::vec3(0.3f,0.9f,0.3f)))
|
||||
{
|
||||
}
|
||||
|
||||
Player::~Player() {
|
||||
|
||||
@@ -35,11 +35,11 @@ class Player {
|
||||
float speed;
|
||||
int chosenSlot;
|
||||
glm::vec3 spawnpoint {};
|
||||
std::shared_ptr<Inventory> inventory;
|
||||
public:
|
||||
std::shared_ptr<Camera> camera, spCamera, tpCamera;
|
||||
std::shared_ptr<Camera> currentCamera;
|
||||
std::unique_ptr<Hitbox> hitbox;
|
||||
std::shared_ptr<Inventory> inventory;
|
||||
bool flight = false;
|
||||
bool noclip = false;
|
||||
bool debug = false;
|
||||
|
||||
Reference in New Issue
Block a user