feat(gui/inventory): add tile inventory with raycasting, when you click on a tile the inventory appears, player inventory, when you press p the player inventory appears and you can see all the inventory thanks to the mouse wheel. assets of ressources 0 and 3 changed for better quality

gui/src/Buttons/Button.cpp

@@ -2,7 +2,7 @@
 #include <iostream>
 namespace Zappy
 {
-Button::Button(Texture &texture, float x, float y, float width, float height, std::function<void()> function) : _function(function), _width(width), _height(height), _x(x), _y(y), _hovered(false)
+Button::Button(Texture &texture, float x, float y, float width, float height, std::function<void()> function, WindowSize &ws) : _function(function), _width(width), _height(height), _x(x), _y(y), _hovered(false), _ws(ws)
 {
     _sprite = std::make_unique<Sprite>(texture);
     _sprite->setPosition(x, y);
@@ -14,7 +14,7 @@ Button::Button(Texture &texture, float x, float y, float width, float height, st
 void Button::draw(Shader &shader)
 {
     if (_sprite) {
-        Zappy::Math::mat4 orthoProjection = Zappy::Math::ortho(0.0f, WIDTH, HEIGHT, 0.0f, -1.0f, 1.0f);
+        Zappy::Math::mat4 orthoProjection = Zappy::Math::ortho(0.0f, _ws.width, _ws.height, 0.0f, -1.0f, 1.0f);
         Zappy::Math::mat4 view;
         _sprite->draw(shader, view, orthoProjection);
     }
@@ -24,6 +24,9 @@ void Button::setPosition(float x, float y)
 {
     _x = x;
     _y = y;
+    if (_sprite) {
+        _sprite->setPosition(x, y);
+    }
 }
 
 void Button::update(const std::vector<Zappy::Event> &events)

gui/src/Buttons/Button.hpp

@@ -16,8 +16,9 @@ namespace Zappy
             float _x;
             float _y;
             bool _hovered;
+            WindowSize &_ws;
         public:
-            Button(Texture& texture, float x, float y, float width, float height, std::function<void()> function);
+            Button(Texture& texture, float x, float y, float width, float height, std::function<void()> function, WindowSize &ws);
             void draw(Shader &shader);
             void setPosition(float x, float y);
             void update(const std::vector<Zappy::Event> &events);

gui/src/Core/Core.cpp

@@ -8,6 +8,7 @@
 #include <chrono>
 #include <thread>
 
+
 namespace Zappy {
 
 Core::Core() : _isRunning(true) {}
@@ -34,7 +35,7 @@ void Core::init(const std::string &ip, int port) {
   if (!isConnected)
     LOG_WARN("Failed to connect to the server.");
 
-  _networkManager = std::make_unique<Zappy::NetworkManager>(*_networkClient);
+  _networkManager = std::make_unique<Zappy::NetworkManager>(*_networkClient, ip, port);
   _sceneManager.changeScene(std::make_unique<IntroScene>(
       _sceneManager.getTextureManager(), _sceneManager.getAudioManager()));
 }
@@ -43,6 +44,9 @@ void Core::run() {
   const std::chrono::microseconds frameDelay(16666);
 
   auto lastTime = std::chrono::steady_clock::now();
+
+  static WindowSize windowSize;
+
   while (_isRunning) {
 
     auto timeStart = std::chrono::steady_clock::now();
@@ -59,13 +63,14 @@ void Core::run() {
     if (_networkManager)
       _networkManager->update();
 
+    _window.getSize(windowSize.width, windowSize.height);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     if (_networkManager)
       _sceneManager.update(events, *_networkManager, deltaTime);
 
     _defaultShader->bind();
-    _sceneManager.draw(*_defaultShader);
+    _sceneManager.draw(*_defaultShader, windowSize);
     _window.swapBuffers();
 
     auto timeEnd = std::chrono::steady_clock::now();

gui/src/Event.hpp

@@ -7,7 +7,8 @@ enum class EventType {
   KeyReleased,
   MousePressed,
   MouseReleased,
-  MouseMoved
+  MouseMoved,
+  MouseWheelMove
 };
 
 enum class Key {
@@ -67,5 +68,6 @@ struct Event {
   int mouseY = 0;
   int button = 0;
   Key keyCode = Key::NONE;
+  int wheelDelta = 0;
 };
 } // namespace Zappy

gui/src/IScene/IScene.hpp

@@ -9,6 +9,12 @@
 #define WIDTH 1920.0f
 #define HEIGHT 1080.0f
 
+struct WindowSize
+{
+  unsigned int width = 1;
+  unsigned int height = 1;
+};
+
 namespace Zappy {
 enum class SceneState { NONE, INTRO, TITLE, MENU, LOAD_NETWORK, GAME };
 
@@ -21,7 +27,7 @@ class IScene {
                             const Zappy::GameState &gameState,
                             const std::vector<Zappy::NetworkEvent> &netEvents,
                             float deltaTime) = 0;
-  virtual void draw(Shader &shader) = 0;
+  virtual void draw(Shader &shader, WindowSize &windowSize) = 0;
   virtual void onExit() = 0;
 };
 } // namespace Zappy

gui/src/Network/NetworkManager.cpp

@@ -6,7 +6,8 @@
 
 namespace Zappy {
 
-NetworkManager::NetworkManager(INetworkClient &client) : _netClient(client) {
+NetworkManager::NetworkManager(INetworkClient &client, std::string ip, int port) : _netClient(client), _ip(ip), _port(port)
+{
   initCommandHandlers();
 }
 
@@ -38,7 +39,16 @@ void NetworkManager::initCommandHandlers() {
   _commandHandlers["suc"] = [this](const auto &args) { handleSuc(args); };
   _commandHandlers["sbp"] = [this](const auto &args) { handleSbp(args); };
 }
-bool NetworkManager::connectToServer(const std::string &host, int port) {
+
+
+bool NetworkManager::connectToServer() 
+{
+  std::cout << "IP:" << _ip << " Port:" << _port << std::endl;
+  return _netClient.connectToServer(_ip, _port);
+}
+
+bool NetworkManager::connectToServer(const std::string &host, int port)
+{
   return _netClient.connectToServer(host, port);
 }
 void NetworkManager::update() {

gui/src/Network/NetworkManager.hpp

@@ -14,9 +14,10 @@ namespace Zappy {
 
 class NetworkManager {
 public:
-  NetworkManager(INetworkClient &client);
+  NetworkManager(INetworkClient &client, std::string ip, int port);
   ~NetworkManager();
 
+  bool connectToServer();
   bool connectToServer(const std::string &host, int port);
   void update();
   void sendCommand(const std::string &cmd);
@@ -33,6 +34,8 @@ class NetworkManager {
   std::vector<NetworkEvent> _eventQueue;
   INetworkClient &_netClient;
 
+  std::string _ip;
+  int _port;
   std::unordered_map<std::string,
                      std::function<void(const std::vector<std::string> &)>>
       _commandHandlers;

gui/src/Render/Render.hpp

@@ -157,10 +157,25 @@ class Renderer {
     _skybox->draw();
     glDepthFunc(GL_LESS);
   }
+
   void
   render(const Camera &camera, InstancedGrid &floor,
          const std::vector<std::unique_ptr<Sprite>> &players,
-         const std::vector<std::reference_wrapper<Sprite>> &resources = {}) {
+         const std::vector<std::reference_wrapper<Sprite>> &resources = {},
+         const WindowSize &windowSize = {}){
+
+
+if (windowSize.width != _width || windowSize.height != _height) {
+    _width = windowSize.width;
+    _height = windowSize.height;
+
+    glBindTexture(GL_TEXTURE_2D, sceneColorTex);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _width, _height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+
+    glBindTexture(GL_TEXTURE_2D, sceneDepthTex);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, _width, _height, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
+}
+
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, 0);
 
@@ -174,13 +189,14 @@ class Renderer {
     Zappy::Math::mat4 lightSpaceMatrix = lightProjection * lightView;
 
     Zappy::Math::mat4 projection = Zappy::Math::perspective(
-        Zappy::Math::radians(45.0f),
-        static_cast<float>(_width) / static_cast<float>(_height), 0.1f,
-        1000.0f);
+    Zappy::Math::radians(45.0f),
+    static_cast<float>(_width) / static_cast<float>(_height),
+      0.1f,
+    1000.0f);
     Zappy::Math::mat4 view = camera.getViewMatrix();
     Zappy::Math::mat4 viewProj = projection * view;
 
-    glViewport(0, 0, 2048, 2048);
+    glViewport(0, 0, _width, _height);
     glBindFramebuffer(GL_FRAMEBUFFER, depthMapFBO);
     glClear(GL_DEPTH_BUFFER_BIT);
     glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);