From 720b2e0ddd520ac575bab39c8f55a90662f7530f Mon Sep 17 00:00:00 2001 From: Vectozavr <60608292+vectozavr@users.noreply.github.com> Date: Sun, 19 Sep 2021 20:05:11 +0700 Subject: [PATCH] 1) Create PlayerController 2) Split Screen.cpp into (Screen.cpp & Keyboard.cpp & Mouse.cpp) --- PlayerController.cpp | 1 - PlayerController.h | 1 - engine/Camera.h | 1 - engine/Mesh.h | 1 - 4 files changed, 4 deletions(-) diff --git a/PlayerController.cpp b/PlayerController.cpp index 7b463c8..9d21218 100644 --- a/PlayerController.cpp +++ b/PlayerController.cpp @@ -10,7 +10,6 @@ PlayerController::PlayerController(std::shared_ptr player, std::shared_ptr mouse) : _player(player), _world(world), _keyboard(keyboard), _mouse(mouse) { _slowMoSound.setBuffer(*ResourceManager::loadSoundBuffer("../sound/slow_mo.ogg")); _unSlowMoSound.setBuffer(*ResourceManager::loadSoundBuffer("../sound/unslow_mo.ogg")); - _changeWeaponSound.setBuffer(*ResourceManager::loadSoundBuffer("../sound/weapons/change_weapon.ogg")); } void PlayerController::update() { diff --git a/PlayerController.h b/PlayerController.h index 5fe8952..2f88bfb 100644 --- a/PlayerController.h +++ b/PlayerController.h @@ -25,7 +25,6 @@ private: sf::Sound _slowMoSound; sf::Sound _unSlowMoSound; - sf::Sound _changeWeaponSound; sf::Sound _walkSound; double _jumpHeight = 3; diff --git a/engine/Camera.h b/engine/Camera.h index 9f3ccee..fe74659 100755 --- a/engine/Camera.h +++ b/engine/Camera.h @@ -38,7 +38,6 @@ public: Camera() = default; Camera(const Camera& camera) = delete; - void init(int width, int height, double fov = 110.0, double ZNear = 0.1, double ZFar = 5000.0); std::vector& project(std::shared_ptr mesh); diff --git a/engine/Mesh.h b/engine/Mesh.h index 2dfcdd2..4b1ab2f 100755 --- a/engine/Mesh.h +++ b/engine/Mesh.h @@ -18,7 +18,6 @@ private: bool _visible = true; Mesh& operator*=(const Matrix4x4& matrix4X4); - public: Mesh() = default; Mesh(const Mesh& mesh);