nakidai
/
shooter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

struct Button -> class Button

master
Vectozavr 2021-10-03 11:52:30 +07:00
parent 122d30a980
commit 4997202edc
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Client.h
View File

@ -23,7 +23,7 @@ private:
std::function<void(const std::string&, const Point4D&)> _addBonusCallBack;
std::function<void(const std::string&)> _removeBonusCallBack;
public:
Client(std::shared_ptr<Player> player) : _player(player){};
explicit Client(std::shared_ptr<Player> player) : _player(player){};
void updatePacket() override;

1
Player.h
View File

@ -46,7 +46,6 @@ private:
std::function<void(sf::Uint16 targetId, double)> _damagePlayerCallBack;
std::function<void(const Point4D&, const Point4D&)> _addTraceCallBack;
std::function<void(const std::string&)> _takeBonusCallBack;
std::function<void(const std::string&)> _fireCallBack;
std::function<void(std::shared_ptr<Weapon>)> _addWeaponCallBack;
std::function<void(std::shared_ptr<Weapon>)> _removeWeaponCallBack;

6
engine/Mesh.h
View File

@ -45,14 +45,12 @@ public:
[[nodiscard]] sf::Color color() const { return _color; }
void setColor(sf::Color c);
Mesh static Obj(const std::string& filename);
Mesh static LineTo(const Point4D& from, const Point4D& to, double line_width = 0.1, sf::Color color = {150, 150, 150, 255});
void setVisible(bool visibility) { _visible = visibility; }
[[nodiscard]] bool isVisible() const { return _visible; }
Mesh static Obj(const std::string& filename);
std::vector<std::shared_ptr<Mesh>> static LoadObjects(const std::string& filename, const std::string &materials = "", const Point4D& scale = Point4D{1, 1, 1});
Mesh static LineTo(const Point4D& from, const Point4D& to, double line_width = 0.1, sf::Color color = {150, 150, 150, 255});
};
#endif //INC_3DZAVR_MESH_H