New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Development 4 map #16

Open

MicheleMichetti wants to merge 65 commits into develop from development-4-Map

Collaborator

MicheleMichetti commented Feb 17, 2024

Doneness checkbox:

Testing
Documentation

MicheleMichetti and others added 13 commits

February 17, 2024 00:57


          Created Map.h

ff53af4


          Created Map.cpp

58e9e9f


          Created test for Map

6a0ad5f


          Added Map.h and Map.cpp

8ce95b8


          Added destructor and included Tile.h

f238951


          populated destructor, doesItCollide, doesItInteract

8d2e6f1


          Imported prototype test map definition.

09b2ef2


          doc: Update README.md

10ca6b4


          Update README.md

07ccf18


          doc: Update README.md

3f9de8a


          doc: Update README.md

1e3bc7e


          feat: Pull request template

8e97c0a


          feat: Update PULL_REQUEST_TEMPLATE.md

71175ed

marc-gav reviewed

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

Docker/README.md Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

include/Map.h Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

include/Map.h Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

include/Map.h Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

include/Map.h Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

include/Map.h Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

include/Map.h Outdated Show resolved Hide resolved

marc-gav reviewed

View reviewed changes

test/MapTest.cpp Outdated Show resolved Hide resolved

MicheleMichetti and others added 8 commits

February 18, 2024 00:53


          switched tiles_ from std::map to boost::multi_array.

9386af1


          feat: Tile class basic structure

6a477ca


          feat: Update gitignore

06f8d35


          feat: Tile class logic

79b3916


          feat: Include coordinate into Tile class

783473f


          refactor: Coordinate not needed for tile

1023daa


          fix: Direction enum utils.hpp


          feat: Skeleton of testing capabilities

72fc2ec


          Install boost lib in docker and include in CMakeLists. Not in a worki…

983abbd

…ng state yet, to be debugged.

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 12:44

— with

GitHub Actions Inactive


          Autoformat code

Collaborator Author

MicheleMichetti commented Feb 18, 2024 •

edited

Loading

@marc-gav with the boost library we need has to be added to Docker and CMakeLists. I get this error when calling
docker compose run test

Could you check Docker and CMakeLists in my last push and let me know the issue, please?


          Use consistent variable format "my_variable"

bb09edc

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 13:03

— with

GitHub Actions Inactive


          Using consistent member name format "my_member"

5aa42de

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 13:07

— with

GitHub Actions Inactive


          Autoformat code

23904ce

Collaborator Author

MicheleMichetti commented Feb 18, 2024

This is how to handle the installation on Docker dowloading the repo directly from the Boost webpage:

# Download boost, untar, setup install with bootstrap and only do the Program Options library,
# and then install
RUN cd /home && wget http://downloads.sourceforge.net/project/boost/boost/1.84.0/boost_1_84_0.tar.gz \
  && tar xfz boost_1_84_0.tar.gz \
  && rm boost_1_84_0.tar.gz \
  && cd boost_1_84_0 \
  && ./bootstrap.sh --prefix=/usr/local --with-libraries=program_options \
  && ./b2 install \
  && cd /home \
  && rm -rf boost_1_84_0


          fix: Find Boost library CMakeLists.txt

0aed526

marc-gav deployed to marc-gav_environment

February 18, 2024 13:54

— with

GitHub Actions Active

MicheleMichetti added 2 commits

February 18, 2024 16:59


          feat: install spdlog to Docker container and include it in CMake.

fd45343


          feat: Added tile matrix of dimension 0 error. Made some variables for…

3d0d8c2

…mat coherent.

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 16:07

— with

GitHub Actions Inactive


          fix: changed the argument type of the functions Tile::isCollision and…

a06f53d

… isInteraction to uint8_t

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 16:10

— with

GitHub Actions Inactive


          fix: changed the argument type of the functions Map::doesItCollide an…

140381e

…d doesItInteract to uint8_t

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 16:13

— with

GitHub Actions Inactive


          fix: fixed passage of coordinates to collision and interaction functions

cb7268c

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 16:23

— with

GitHub Actions Inactive


          fix: swapTiles() in Map class coherence between cpp and hpp

6e7fbfa

MicheleMichetti temporarily deployed to MicheleMichetti_environment

February 18, 2024 16:25

— with

GitHub Actions Inactive

MicheleMichetti requested a review from marc-gav

February 25, 2024 15:29

marc-gav approved these changes

View reviewed changes

game/src/Map.cpp

-              Map::Map(const uint16_t& id, const uint8_t& current_type, const std::string& map_name, const std::string& bitmap_name, const tileArray& tiles, const uint16_t& dimensionX, const uint16_t& dimensionY,
+              #include "spdlog/spdlog.h"
+              Map::Map(const uint16_t& id, const uint8_t& current_type, const std::string& map_name, const std::string& bitmap_name, const tileArray& tiles, const uint16_t& length_x, const uint16_t& length_y,

Collaborator

marc-gav Feb 18, 2024

Let's create an enum of possible map types

game/src/Map.cpp Outdated

+              void Map::setTiles(const tileArray& tiles, const uint16_t& length_x, const uint16_t& length_y) {
+                  if (length_x == 0 || length_y == 0) {
+                      SPDLOG_ERROR("The tile matrix that is being set has a dimension of value 0. Exiting. ");
+                      throw;

Collaborator

marc-gav Feb 18, 2024

Throw this: https://en.cppreference.com/w/cpp/error/invalid_argument

game/src/Map.cpp Outdated

Comment on lines 41 to 43

    
                  Tile tiletmp = tile_1;

                  tile_1 = tile_2;

                  tile_2 = tiletmp;

Collaborator

marc-gav Feb 18, 2024

Suggested change

      
                Tile tiletmp = tile_1;
          
                tile_1 = tile_2;
          
                tile_2 = tiletmp;
          
                std::swap(tile_1, tile_2);


          Added map type enum. Throw invalid_argument. Use std::swap

026a9d5

MicheleMichetti temporarily deployed to MicheleMichetti_environment

March 9, 2024 19:36

— with

GitHub Actions Inactive

MicheleMichetti and others added 2 commits

March 9, 2024 19:36


          Autoformat code

38b83be


          Merge branch 'develop' into development-4-Map

f94d728

MicheleMichetti temporarily deployed to MicheleMichetti_environment

March 9, 2024 19:37

— with

GitHub Actions Inactive

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet