diff --git a/assets/map/hole.png b/assets/map/hole.png index 3a79a9e0..f8038fa3 100644 Binary files a/assets/map/hole.png and b/assets/map/hole.png differ diff --git a/lib/Ray/sources/Model/Model.cpp b/lib/Ray/sources/Model/Model.cpp index 59a508c6..9e8947d8 100644 --- a/lib/Ray/sources/Model/Model.cpp +++ b/lib/Ray/sources/Model/Model.cpp @@ -1,4 +1,4 @@ -/* +/*z ** EPITECH PROJECT, 2021 ** Bomberman ** File description: @@ -25,9 +25,9 @@ namespace RAY::Drawables::Drawables3D bool lonely, std::optional> texture, const RAY::Vector3 &scale, + float rotationAngle, const RAY::Vector3 &position, - const RAY::Vector3 &rotationAxis, - float rotationAngle) + const RAY::Vector3 &rotationAxis) : ADrawable3D(position, WHITE), _model(_modelsCache.fetch(filename, lonely)), _rotationAxis(rotationAxis), @@ -41,9 +41,9 @@ namespace RAY::Drawables::Drawables3D Model::Model(const Mesh::AMesh &mesh, std::optional> texture, const RAY::Vector3 &scale, + float rotationAngle, const RAY::Vector3 &position, - const RAY::Vector3 &rotationAxis, - float rotationAngle) + const RAY::Vector3 &rotationAxis) : ADrawable3D(position, WHITE), _model(std::make_shared<::Model>(LoadModelFromMesh(*mesh.getRaylibMesh()))), _rotationAxis(rotationAxis), diff --git a/lib/Ray/sources/Model/Model.hpp b/lib/Ray/sources/Model/Model.hpp index 1d44352e..877cb769 100644 --- a/lib/Ray/sources/Model/Model.hpp +++ b/lib/Ray/sources/Model/Model.hpp @@ -31,18 +31,18 @@ namespace RAY::Drawables::Drawables3D { Model(const std::string &filePath, bool lonely = false, std::optional> texture = std::nullopt, const RAY::Vector3 &scale = RAY::Vector3(1, 1, 1), + float rotationAngle = 0, const RAY::Vector3 &position = {0, 0, 0}, - const RAY::Vector3 &rotationAxis = RAY::Vector3(0, 1, 0), - float rotationAngle = 0); + const RAY::Vector3 &rotationAxis = RAY::Vector3(0, 1, 0)); //! @brief Create an model, loading a file //! @param mesh: mesh to load Model(const Mesh::AMesh &mesh, std::optional> texture = std::nullopt, const RAY::Vector3 &scale = RAY::Vector3(1, 1, 1), + float rotationAngle = 0, const RAY::Vector3 &position = {0, 0, 0}, - const RAY::Vector3 &rotationAxis = RAY::Vector3(0, 1, 0), - float rotationAngle = 0); + const RAY::Vector3 &rotationAxis = RAY::Vector3(0, 1, 0)); //! @brief A copy constructor Model(const Model &model) = default; diff --git a/sources/Items/Bonus.cpp b/sources/Items/Bonus.cpp index 17266a5f..5a0d915b 100644 --- a/sources/Items/Bonus.cpp +++ b/sources/Items/Bonus.cpp @@ -2,6 +2,7 @@ // Created by HENRY Benjamin on 02/06/2021. // +#include #include #include #include @@ -57,6 +58,7 @@ namespace BBM { Bonus::BonusType Bonus::getRandomBonusType() { + return (SPEEDUP); static std::default_random_engine generator(time(nullptr)); std::map chanceValue = { {NOTHING, 100.0f}, diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp index aa59f470..058f022f 100644 --- a/sources/Map/Map.cpp +++ b/sources/Map/Map.cpp @@ -298,7 +298,7 @@ namespace BBM WAL::Callback(), &MapGenerator::holeCollide, Vector3f(0.25, 0.25, 0.25),Vector3f(0.75, 1.75, 0.75)); if (coords.y == 0) - holeEntity.addComponent(holeObj, false, std::make_pair(MAP_DIFFUSE, holePng)); + holeEntity.addComponent(holeObj, false, std::make_pair(MAP_DIFFUSE, holePng), Vector3f(1,1,1), 180); else holeEntity.addComponent(secondFloorObj, false, std::make_pair(MAP_DIFFUSE, secondFloorPng));