From b667e3ac7192f24ce53b88bb6efa97062bdf9bd9 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 28 May 2021 17:35:50 +0200 Subject: [PATCH 01/45] some steps, x11 not found --- CMakeLists.txt | 6 ++++++ emsdk.sh | 19 +++++++++++++++++++ lib/raylib/Findraylib.cmake | 3 +++ lib/wal/sources/Wal.hpp | 34 ++++++++++++++++++++++++++++++++++ wasm-server.py | 24 ++++++++++++++++++++++++ 5 files changed, 86 insertions(+) create mode 100755 emsdk.sh create mode 100644 wasm-server.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 45d0247d..37b6a26b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,12 @@ include_directories(bomberman sources) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) +if (EMSCRIPTEN) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_EXECUTABLE_SUFFIX ".html") # This line is used to set your executable to build with the emscripten html template so taht you can directly open it. +endif () + + set(SOURCES sources/Models/GameState.hpp sources/Runner/Runner.cpp diff --git a/emsdk.sh b/emsdk.sh new file mode 100755 index 00000000..93816bb0 --- /dev/null +++ b/emsdk.sh @@ -0,0 +1,19 @@ +#! /bin/bash +PRJECTDIR=`pwd` +EMSDK_PATH=$HOME/emsdk +cd $EMSDK_PATH && git pull && +./emcmdprompt +./emsdk install latest && +./emsdk activate latest && +source ./emsdk_env.sh && +HELLO=WORLD +EMSCRIPTEN_PATH=$EMSDK_PATH/upstream/emscripten +CLANG_PATH=$EMSDK_PATH/upstream/bin +NODE_PATH=$EMSDK_PATH/node/12.9.1_64bit/bin +PATH=$PATH:$EMSDK_PATH:$EMSCRIPTEN_PATH:$CLANG_PATH:$NODE_PATH && +cd $PRJECTDIR && +emcmake cmake -S . -B build && +make PLATFORM=PLATFORM_WEB -B && +cmake --build build && +make -C build PLATFORM=PLATFORM_WEB -B && +python3 wasm-server.py diff --git a/lib/raylib/Findraylib.cmake b/lib/raylib/Findraylib.cmake index 4baf8bd8..d836183b 100644 --- a/lib/raylib/Findraylib.cmake +++ b/lib/raylib/Findraylib.cmake @@ -14,6 +14,9 @@ if (NOT raylib_FOUND) SET(FETCHCONTENT_QUIET NO) FetchContent_Populate(raylib) SET(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) + if (EMSCRIPTEN) + SET(PLATFORM Web) + endif() ADD_SUBDIRECTORY(${raylib_SOURCE_DIR} ${raylib_BINARY_DIR}) SET(raylib_FOUND TRUE) endif() diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index 50a87188..c222862f 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -15,6 +15,12 @@ #include "System/System.hpp" #include "Models/Callback.hpp" +#ifdef PLATFORM_WEB +#include +WAL::Wal *walPtr = nullptr; +void *callbackPtr = nullptr; +#endif + namespace WAL { //! @brief The main WAL class, it is used to setup and run the ECS. @@ -109,7 +115,14 @@ namespace WAL void run(const std::function &callback, T state = T()) { Callback update(callback); + + #ifdef PLATFORM_WEB + walPtr = this; + callbackPtr = &callback; + return emscripten_set_main_loop_arg(runWASM, &state, 0, 1); + #else return this->run(update, state); + #endif } //! @brief Start the game loop @@ -137,6 +150,27 @@ namespace WAL } } + #ifdef PLATFORM_WEB + template + static void runIteration(T *state) + { + static std::function callback = callbackPtr; + static auto lastTick = std::chrono::steady_clock::now(); + static std::chrono::nanoseconds fBehind(0); + + auto now = std::chrono::steady_clock::now(); + std::chrono::nanoseconds dtime = now - lastTick; + fBehind += dtime; + lastTick = now; + while (fBehind > Wal::timestep) { + fBehind -= Wal::timestep; + this->_fixedUpdate(); + } + walPtr->_update(dtime); + callback(wal, state); + } + #endif + //! @brief A default constructor Wal() = default; //! @brief A WAL can't be copy constructed diff --git a/wasm-server.py b/wasm-server.py new file mode 100644 index 00000000..77aad1db --- /dev/null +++ b/wasm-server.py @@ -0,0 +1,24 @@ +# Python 3 + +import sys +import socketserver +from http.server import SimpleHTTPRequestHandler + +class WasmHandler(SimpleHTTPRequestHandler): + def end_headers(self): + # Include additional response headers here. CORS for example: + #self.send_header('Access-Control-Allow-Origin', '*') + SimpleHTTPRequestHandler.end_headers(self) + + +# Python 3.7.5 adds in the WebAssembly Media Type. If this is an older +# version, add in the Media Type. +if sys.version_info < (3, 7, 5): + WasmHandler.extensions_map['.wasm'] = 'application/wasm' + + +if __name__ == '__main__': + PORT = 8080 + with socketserver.TCPServer(("", PORT), WasmHandler) as httpd: + print("Listening on port {}. Press Ctrl+C to stop.".format(PORT)) + httpd.serve_forever() From 7915985b7418378127f412140f0eae7eaaa94c85 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 28 May 2021 18:05:26 +0200 Subject: [PATCH 02/45] workflow --- .github/workflows/webassembly.yml | 17 +++++++++++++++++ emsdk.sh | 9 +++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/webassembly.yml diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml new file mode 100644 index 00000000..c2999586 --- /dev/null +++ b/.github/workflows/webassembly.yml @@ -0,0 +1,17 @@ +name: Web Building +on: + push: + branches: + wasm + +jobs: + Push: + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + with: + submodules: true + ref: master + - name: Exec + shell: bash + run: ./emsdk.sh \ No newline at end of file diff --git a/emsdk.sh b/emsdk.sh index 93816bb0..3cd21922 100755 --- a/emsdk.sh +++ b/emsdk.sh @@ -1,15 +1,16 @@ #! /bin/bash PRJECTDIR=`pwd` EMSDK_PATH=$HOME/emsdk -cd $EMSDK_PATH && git pull && -./emcmdprompt +if [[ ! -d $HOME/emsdk ]]; then + git clone https://github.com/emscripten-core/emsdk.git +fi +cd $EMSDK_PATH && +./emsdk install tot && ./emsdk install latest && ./emsdk activate latest && source ./emsdk_env.sh && -HELLO=WORLD EMSCRIPTEN_PATH=$EMSDK_PATH/upstream/emscripten CLANG_PATH=$EMSDK_PATH/upstream/bin -NODE_PATH=$EMSDK_PATH/node/12.9.1_64bit/bin PATH=$PATH:$EMSDK_PATH:$EMSCRIPTEN_PATH:$CLANG_PATH:$NODE_PATH && cd $PRJECTDIR && emcmake cmake -S . -B build && From 7a8c8c8457338d29c07f47bb7d9aadd93d174edc Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 28 May 2021 18:06:53 +0200 Subject: [PATCH 03/45] workflow --- .github/workflows/webassembly.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index c2999586..c839c9ef 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -14,4 +14,20 @@ jobs: ref: master - name: Exec shell: bash - run: ./emsdk.sh \ No newline at end of file + run: | + PRJECTDIR=`pwd` + EMSDK_PATH=$HOME/emsdk + cd $EMSDK_PATH && + ./emsdk install tot && + ./emsdk install latest && + ./emsdk activate latest && + source ./emsdk_env.sh && + EMSCRIPTEN_PATH=$EMSDK_PATH/upstream/emscripten + CLANG_PATH=$EMSDK_PATH/upstream/bin + PATH=$PATH:$EMSDK_PATH:$EMSCRIPTEN_PATH:$CLANG_PATH:$NODE_PATH && + cd $PRJECTDIR && + emcmake cmake -S . -B build && + make PLATFORM=PLATFORM_WEB -B && + cmake --build build && + make -C build PLATFORM=PLATFORM_WEB -B && + python3 wasm-server.py \ No newline at end of file From 2b26c9714c2b8f71d818a55a038b241878222ab0 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 28 May 2021 18:08:51 +0200 Subject: [PATCH 04/45] workflow --- .github/workflows/webassembly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index c839c9ef..db8befd4 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -16,6 +16,7 @@ jobs: shell: bash run: | PRJECTDIR=`pwd` + git clone https://github.com/emscripten-core/emsdk.git EMSDK_PATH=$HOME/emsdk cd $EMSDK_PATH && ./emsdk install tot && From f9e307e73b639972f7fd61fa968cc55cc7edfe36 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 28 May 2021 18:11:59 +0200 Subject: [PATCH 05/45] workflow --- .github/workflows/webassembly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index db8befd4..02c8c5af 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -17,7 +17,7 @@ jobs: run: | PRJECTDIR=`pwd` git clone https://github.com/emscripten-core/emsdk.git - EMSDK_PATH=$HOME/emsdk + EMSDK_PATH=$PRJECTDIR/emsdk cd $EMSDK_PATH && ./emsdk install tot && ./emsdk install latest && From 0ffb8b2a1533026124140f466fb2c6a31cda5401 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 28 May 2021 22:41:46 +0200 Subject: [PATCH 06/45] more step toward wasm compilation, still not it --- .github/workflows/webassembly.yml | 1 + .gitignore | 3 ++- CMakeLists.txt | 3 ++- emsdk | 1 + emsdk.sh | 24 ++++++++---------------- lib/Ray/sources/Exceptions/RayError.hpp | 1 + lib/wal/sources/Wal.cpp | 6 +++--- lib/wal/sources/Wal.hpp | 20 +++++++++++--------- 8 files changed, 29 insertions(+), 30 deletions(-) create mode 160000 emsdk diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index 02c8c5af..3682dcb6 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -27,6 +27,7 @@ jobs: CLANG_PATH=$EMSDK_PATH/upstream/bin PATH=$PATH:$EMSDK_PATH:$EMSCRIPTEN_PATH:$CLANG_PATH:$NODE_PATH && cd $PRJECTDIR && + emcmake cmake -S . -B build && make PLATFORM=PLATFORM_WEB -B && cmake --build build && diff --git a/.gitignore b/.gitignore index 42cd6b29..51721e91 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ cmake-build-debug ./bomberman .vscode build/* -docs/* \ No newline at end of file +docs/* +emsdk/* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 37b6a26b..6d851867 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,9 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) if (EMSCRIPTEN) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_EXECUTABLE_SUFFIX ".html") # This line is used to set your executable to build with the emscripten html template so taht you can directly open it. + set(CMAKE_EXECUTABLE_SUFFIX ".html") endif () diff --git a/emsdk b/emsdk new file mode 160000 index 00000000..f26ebb74 --- /dev/null +++ b/emsdk @@ -0,0 +1 @@ +Subproject commit f26ebb74c0aa12d783a8552888cd9516b635838e diff --git a/emsdk.sh b/emsdk.sh index 3cd21922..75885814 100755 --- a/emsdk.sh +++ b/emsdk.sh @@ -1,20 +1,12 @@ #! /bin/bash PRJECTDIR=`pwd` -EMSDK_PATH=$HOME/emsdk -if [[ ! -d $HOME/emsdk ]]; then +EMSDK_PATH=./emsdk +if [[ ! -d ./emsdk ]]; then git clone https://github.com/emscripten-core/emsdk.git fi -cd $EMSDK_PATH && -./emsdk install tot && -./emsdk install latest && -./emsdk activate latest && -source ./emsdk_env.sh && -EMSCRIPTEN_PATH=$EMSDK_PATH/upstream/emscripten -CLANG_PATH=$EMSDK_PATH/upstream/bin -PATH=$PATH:$EMSDK_PATH:$EMSCRIPTEN_PATH:$CLANG_PATH:$NODE_PATH && -cd $PRJECTDIR && -emcmake cmake -S . -B build && -make PLATFORM=PLATFORM_WEB -B && -cmake --build build && -make -C build PLATFORM=PLATFORM_WEB -B && -python3 wasm-server.py +./emsdk/emsdk install tot +./emsdk/emsdk activate latest +source ./emsdk/emsdk_env.sh +mkdir -p build && +cmake -S . -B build && +cmake --build build \ No newline at end of file diff --git a/lib/Ray/sources/Exceptions/RayError.hpp b/lib/Ray/sources/Exceptions/RayError.hpp index 52068b22..f700ac17 100644 --- a/lib/Ray/sources/Exceptions/RayError.hpp +++ b/lib/Ray/sources/Exceptions/RayError.hpp @@ -9,6 +9,7 @@ #define RAYERROR_HPP_ #include +#include namespace RAY::Exception { //! @brief base exception class for RAY lib diff --git a/lib/wal/sources/Wal.cpp b/lib/wal/sources/Wal.cpp index 875e3bd8..6ab6542a 100644 --- a/lib/wal/sources/Wal.cpp +++ b/lib/wal/sources/Wal.cpp @@ -41,8 +41,8 @@ namespace WAL { // TODO use an hashmap to cache results. const auto &dependency = system.getDependencies(); - return std::ranges::all_of(dependency.begin(), dependency.end(), [&entity](const auto &dependency) { - return entity.hasComponent(dependency); - }); + //return std::ranges::all_of(dependency.begin(), dependency.end(), [&entity](const auto &dependency) { + // return entity.hasComponent(dependency); + //}); } } // namespace WAL \ No newline at end of file diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index c222862f..bce38bec 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -17,8 +17,8 @@ #ifdef PLATFORM_WEB #include -WAL::Wal *walPtr = nullptr; -void *callbackPtr = nullptr; +void *walPtr = nullptr; +void *statePtr = nullptr; #endif namespace WAL @@ -118,8 +118,8 @@ namespace WAL #ifdef PLATFORM_WEB walPtr = this; - callbackPtr = &callback; - return emscripten_set_main_loop_arg(runWASM, &state, 0, 1); + statePtr = &state; + return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration, (void *)&callback, 0, 1); #else return this->run(update, state); #endif @@ -152,9 +152,11 @@ namespace WAL #ifdef PLATFORM_WEB template - static void runIteration(T *state) + static void runIteration(void *callbackPtr) { - static std::function callback = callbackPtr; + static const Callback callback = *((Callback *)callbackPtr); + static Wal *wal = (Wal *)walPtr; + static T *state = (T *)statePtr; static auto lastTick = std::chrono::steady_clock::now(); static std::chrono::nanoseconds fBehind(0); @@ -164,10 +166,10 @@ namespace WAL lastTick = now; while (fBehind > Wal::timestep) { fBehind -= Wal::timestep; - this->_fixedUpdate(); + wal->_fixedUpdate(); } - walPtr->_update(dtime); - callback(wal, state); + wal->_update(dtime); + callback(*wal, *state); } #endif From 5498649829312dea5dcb59de32fd01ef73021502 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Sat, 29 May 2021 12:54:39 +0200 Subject: [PATCH 07/45] add missing compilation flag --- CMakeLists.txt | 12 ++++++------ emsdk | 1 - emsdk.sh | 2 +- lib/wal/sources/Wal.hpp | 16 +++++++--------- 4 files changed, 14 insertions(+), 17 deletions(-) delete mode 160000 emsdk diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d851867..d2cc777a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,12 @@ project(bomberman) set(CMAKE_CXX_STANDARD 20) +if (EMSCRIPTEN) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_EXECUTABLE_SUFFIX ".html") +endif () + include_directories(bomberman lib/Ray/sources) include_directories(bomberman lib/wal/sources) include_directories(bomberman sources) @@ -10,12 +16,6 @@ include_directories(bomberman sources) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) -if (EMSCRIPTEN) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_EXECUTABLE_SUFFIX ".html") -endif () - set(SOURCES sources/Models/GameState.hpp diff --git a/emsdk b/emsdk deleted file mode 160000 index f26ebb74..00000000 --- a/emsdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f26ebb74c0aa12d783a8552888cd9516b635838e diff --git a/emsdk.sh b/emsdk.sh index 75885814..4b88ab77 100755 --- a/emsdk.sh +++ b/emsdk.sh @@ -8,5 +8,5 @@ fi ./emsdk/emsdk activate latest source ./emsdk/emsdk_env.sh mkdir -p build && -cmake -S . -B build && +emcmake cmake -S . -B build -DPLATFORM=Web && cmake --build build \ No newline at end of file diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index bce38bec..8feb2507 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -17,8 +17,6 @@ #ifdef PLATFORM_WEB #include -void *walPtr = nullptr; -void *statePtr = nullptr; #endif namespace WAL @@ -117,9 +115,8 @@ namespace WAL Callback update(callback); #ifdef PLATFORM_WEB - walPtr = this; - statePtr = &state; - return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration, (void *)&callback, 0, 1); + void *paramPtr[3] = {this, &callback, &state}; + return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration, (void *)¶mPtr, 0, 1); #else return this->run(update, state); #endif @@ -152,11 +149,12 @@ namespace WAL #ifdef PLATFORM_WEB template - static void runIteration(void *callbackPtr) + static void runIteration(void *param) { - static const Callback callback = *((Callback *)callbackPtr); - static Wal *wal = (Wal *)walPtr; - static T *state = (T *)statePtr; + void *paramsPtr[3] = *param; + static const Callback callback = *((Callback *)param[1]); + static Wal *wal = (Wal *)param[0]; + static T *state = (T *)param[2]; static auto lastTick = std::chrono::steady_clock::now(); static std::chrono::nanoseconds fBehind(0); From ab8ee23e4015edf07a42ca8d05ba1f04df17d106 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Sat, 29 May 2021 13:46:28 +0200 Subject: [PATCH 08/45] ok --- CMakeLists.txt | 11 +++++------ emsdk.sh | 4 ++-- lib/wal/sources/Wal.hpp | 16 ++++++++-------- wasm-server.py | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2cc777a..143502f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,12 +3,6 @@ project(bomberman) set(CMAKE_CXX_STANDARD 20) -if (EMSCRIPTEN) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_EXECUTABLE_SUFFIX ".html") -endif () - include_directories(bomberman lib/Ray/sources) include_directories(bomberman lib/wal/sources) include_directories(bomberman sources) @@ -16,6 +10,11 @@ include_directories(bomberman sources) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) +if (EMSCRIPTEN) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_EXECUTABLE_SUFFIX ".html") +endif () set(SOURCES sources/Models/GameState.hpp diff --git a/emsdk.sh b/emsdk.sh index 4b88ab77..4ffd22d2 100755 --- a/emsdk.sh +++ b/emsdk.sh @@ -4,9 +4,9 @@ EMSDK_PATH=./emsdk if [[ ! -d ./emsdk ]]; then git clone https://github.com/emscripten-core/emsdk.git fi -./emsdk/emsdk install tot +./emsdk/emsdk install latest ./emsdk/emsdk activate latest source ./emsdk/emsdk_env.sh -mkdir -p build && +mkdir -p build emcmake cmake -S . -B build -DPLATFORM=Web && cmake --build build \ No newline at end of file diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index 8feb2507..6d3121de 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -15,7 +15,7 @@ #include "System/System.hpp" #include "Models/Callback.hpp" -#ifdef PLATFORM_WEB +#if defined(PLATFORM_WEB) #include #endif @@ -115,8 +115,8 @@ namespace WAL Callback update(callback); #ifdef PLATFORM_WEB - void *paramPtr[3] = {this, &callback, &state}; - return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration, (void *)¶mPtr, 0, 1); + void *paramPtr[3] = {(void *)this, (void *)&callback, (void *)&state}; + return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration, (void *)paramPtr, 0, 1); #else return this->run(update, state); #endif @@ -147,14 +147,14 @@ namespace WAL } } - #ifdef PLATFORM_WEB + #if defined(PLATFORM_WEB) template static void runIteration(void *param) { - void *paramsPtr[3] = *param; - static const Callback callback = *((Callback *)param[1]); - static Wal *wal = (Wal *)param[0]; - static T *state = (T *)param[2]; + void **paramsPtr = (void **)param; + static const Callback callback = *((Callback *)paramsPtr[1]); + static Wal *wal = (Wal *)paramsPtr[0]; + static T *state = (T *)paramsPtr[2]; static auto lastTick = std::chrono::steady_clock::now(); static std::chrono::nanoseconds fBehind(0); diff --git a/wasm-server.py b/wasm-server.py index 77aad1db..d9dde32c 100644 --- a/wasm-server.py +++ b/wasm-server.py @@ -18,7 +18,7 @@ if sys.version_info < (3, 7, 5): if __name__ == '__main__': - PORT = 8080 + PORT = 8081 with socketserver.TCPServer(("", PORT), WasmHandler) as httpd: print("Listening on port {}. Press Ctrl+C to stop.".format(PORT)) httpd.serve_forever() From 80735abea55f5792fc3a9570e787a8b0e114ee65 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Sat, 29 May 2021 21:11:29 +0200 Subject: [PATCH 09/45] fix ranges loop, which didn't let the compuilation go with em++ --- .gitignore | 2 +- emsdk.sh | 1 + lib/wal/sources/Wal.cpp | 8 +++++--- lib/wal/sources/Wal.hpp | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 51721e91..06e5830c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ cmake-build-debug .vscode build/* docs/* -emsdk/* \ No newline at end of file +emsdk/ \ No newline at end of file diff --git a/emsdk.sh b/emsdk.sh index 4ffd22d2..70cd7654 100755 --- a/emsdk.sh +++ b/emsdk.sh @@ -1,4 +1,5 @@ #! /bin/bash +rm -rf build PRJECTDIR=`pwd` EMSDK_PATH=./emsdk if [[ ! -d ./emsdk ]]; then diff --git a/lib/wal/sources/Wal.cpp b/lib/wal/sources/Wal.cpp index 6ab6542a..371c5774 100644 --- a/lib/wal/sources/Wal.cpp +++ b/lib/wal/sources/Wal.cpp @@ -41,8 +41,10 @@ namespace WAL { // TODO use an hashmap to cache results. const auto &dependency = system.getDependencies(); - //return std::ranges::all_of(dependency.begin(), dependency.end(), [&entity](const auto &dependency) { - // return entity.hasComponent(dependency); - //}); + for (const auto &dependency : system.getDependencies()) { + if (!entity.hasComponent(dependency)) + return false; + } + return true; } } // namespace WAL \ No newline at end of file diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index 6d3121de..7b9ea705 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -115,7 +115,7 @@ namespace WAL Callback update(callback); #ifdef PLATFORM_WEB - void *paramPtr[3] = {(void *)this, (void *)&callback, (void *)&state}; + void *paramPtr[3] = {(void *)this, (void *)&update, (void *)&state}; return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration, (void *)paramPtr, 0, 1); #else return this->run(update, state); From 1dc217cdaa9c68832d64636755e278dfb15a36ca Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Sat, 29 May 2021 22:52:40 +0200 Subject: [PATCH 10/45] assets preloaded, updating workflow --- .github/workflows/webassembly.yml | 24 ++++++------------------ CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index 3682dcb6..33f1671b 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -14,22 +14,10 @@ jobs: ref: master - name: Exec shell: bash + run: ./emsdk.sh + - name: Check files creation run: | - PRJECTDIR=`pwd` - git clone https://github.com/emscripten-core/emsdk.git - EMSDK_PATH=$PRJECTDIR/emsdk - cd $EMSDK_PATH && - ./emsdk install tot && - ./emsdk install latest && - ./emsdk activate latest && - source ./emsdk_env.sh && - EMSCRIPTEN_PATH=$EMSDK_PATH/upstream/emscripten - CLANG_PATH=$EMSDK_PATH/upstream/bin - PATH=$PATH:$EMSDK_PATH:$EMSCRIPTEN_PATH:$CLANG_PATH:$NODE_PATH && - cd $PRJECTDIR && - - emcmake cmake -S . -B build && - make PLATFORM=PLATFORM_WEB -B && - cmake --build build && - make -C build PLATFORM=PLATFORM_WEB -B && - python3 wasm-server.py \ No newline at end of file + test -f build/bomberman.html + test -f build/bomberman.js + test -f build/bomberman.wasm + test -f build/bomberman.data diff --git a/CMakeLists.txt b/CMakeLists.txt index 143502f5..84be48cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) if (EMSCRIPTEN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY --preload-file ../assets") set(CMAKE_EXECUTABLE_SUFFIX ".html") endif () From f4c94c6cc58a22e44a081a7eb763d67e36417d22 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Sat, 29 May 2021 22:54:12 +0200 Subject: [PATCH 11/45] fixing workflow, using action wit current branch --- .github/workflows/webassembly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index 33f1671b..70cc786e 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -11,7 +11,6 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - ref: master - name: Exec shell: bash run: ./emsdk.sh From 74ace1cfda65d10996a22b035e244fce134acfa2 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Sat, 29 May 2021 22:56:52 +0200 Subject: [PATCH 12/45] worflow now based on linux --- .github/workflows/webassembly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index 70cc786e..b514e6eb 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -6,7 +6,7 @@ on: jobs: Push: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 with: From 0f41290b0fbe29dd777591f5c700464691d2ec3e Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Mon, 31 May 2021 09:17:13 +0200 Subject: [PATCH 13/45] seperate std buld from build for web --- .gitignore | 3 ++- emsdk.sh | 8 +++----- lib/wal/sources/Wal.hpp | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 06e5830c..9e44c2a3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ cmake-build-debug .vscode build/* docs/* -emsdk/ \ No newline at end of file +emsdk/ +build_web/ \ No newline at end of file diff --git a/emsdk.sh b/emsdk.sh index 70cd7654..b5975bba 100755 --- a/emsdk.sh +++ b/emsdk.sh @@ -1,6 +1,4 @@ #! /bin/bash -rm -rf build -PRJECTDIR=`pwd` EMSDK_PATH=./emsdk if [[ ! -d ./emsdk ]]; then git clone https://github.com/emscripten-core/emsdk.git @@ -8,6 +6,6 @@ fi ./emsdk/emsdk install latest ./emsdk/emsdk activate latest source ./emsdk/emsdk_env.sh -mkdir -p build -emcmake cmake -S . -B build -DPLATFORM=Web && -cmake --build build \ No newline at end of file +mkdir -p build_web +emcmake cmake -S . -B build_web -DPLATFORM=Web && +cmake --build build_web \ No newline at end of file diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index 7b9ea705..a2feacbe 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -114,9 +114,9 @@ namespace WAL { Callback update(callback); - #ifdef PLATFORM_WEB + #if defined(PLATFORM_WEB) void *paramPtr[3] = {(void *)this, (void *)&update, (void *)&state}; - return emscripten_set_main_loop_arg((em_arg_callback_func)&runIteration, (void *)paramPtr, 0, 1); + return emscripten_set_main_loop_arg((em_arg_callback_func)runIteration, (void *)paramPtr, 0, 1); #else return this->run(update, state); #endif @@ -151,9 +151,9 @@ namespace WAL template static void runIteration(void *param) { - void **paramsPtr = (void **)param; - static const Callback callback = *((Callback *)paramsPtr[1]); + static void **paramsPtr = (void **)param; static Wal *wal = (Wal *)paramsPtr[0]; + static const Callback callback = *((Callback *)paramsPtr[1]); static T *state = (T *)paramsPtr[2]; static auto lastTick = std::chrono::steady_clock::now(); static std::chrono::nanoseconds fBehind(0); From 1cc6907ff024b9efab303dd78f97f26c5c0705f3 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Tue, 1 Jun 2021 13:52:52 +0200 Subject: [PATCH 14/45] CI: update build folder name --- .github/workflows/webassembly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index b514e6eb..0b729418 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -16,7 +16,7 @@ jobs: run: ./emsdk.sh - name: Check files creation run: | - test -f build/bomberman.html - test -f build/bomberman.js - test -f build/bomberman.wasm - test -f build/bomberman.data + test -f build_web/bomberman.html + test -f build_web/bomberman.js + test -f build_web/bomberman.wasm + test -f build_web/bomberman.data From e298ce03eb784c5f0908417b427e6f51b0405bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Tue, 1 Jun 2021 15:52:47 +0200 Subject: [PATCH 15/45] starting to implement a AnimationComponent.cpp/.hpp --- CMakeLists.txt | 2 ++ .../Animation/AnimationComponent.cpp | 16 ++++++++++ .../Animation/AnimationComponent.hpp | 31 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 sources/Component/Animation/AnimationComponent.cpp create mode 100644 sources/Component/Animation/AnimationComponent.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 763064ac..81b3c154 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,8 @@ set(SOURCES sources/Component/Renderer/CameraComponent.hpp sources/System/Renderer/Render2DScreenSystem.cpp sources/System/Renderer/Render2DScreenSystem.hpp + sources/Component/Animation/AnimationComponent.cpp + sources/Component/Animation/AnimationComponent.hpp ) add_executable(bomberman diff --git a/sources/Component/Animation/AnimationComponent.cpp b/sources/Component/Animation/AnimationComponent.cpp new file mode 100644 index 00000000..d1f8210b --- /dev/null +++ b/sources/Component/Animation/AnimationComponent.cpp @@ -0,0 +1,16 @@ +// +// Created by cbihan on 01/06/2021. +// + +#include "AnimationComponent.hpp" +#include "Entity/Entity.hpp" + +namespace BBM +{ + AnimationComponent::AnimationComponent(WAL::Entity &entity, RAY::ModelAnimation &modelAnimation) + : WAL::Component(entity), + _modelAnimation(modelAnimation) + { + + } +} \ No newline at end of file diff --git a/sources/Component/Animation/AnimationComponent.hpp b/sources/Component/Animation/AnimationComponent.hpp new file mode 100644 index 00000000..36946c16 --- /dev/null +++ b/sources/Component/Animation/AnimationComponent.hpp @@ -0,0 +1,31 @@ +// +// Created by cbihan on 01/06/2021. +// + +#pragma once + +#include +#include "Component/Component.hpp" +#include "Entity/Entity.hpp" +#include "Model/Model.hpp" + +namespace BBM +{ + + class AnimationComponent : public WAL::Component + { + private: + //! @brief To get the animation data + RAY::ModelAnimation &_modelAnimation; + public: + //! @brief ctor entity and the path of the animation file + explicit AnimationComponent(WAL::Entity &entity, RAY::ModelAnimation &modelAnimation); + //! @brief copy ctor + AnimationComponent(const AnimationComponent &) = default; + //! @brief dtor + ~AnimationComponent() override = default; + //! @brief assignment operator + AnimationComponent &operator=(const AnimationComponent &) = delete; + }; + +} From b4d783d6c21788a9469e13331138488aada318e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Tue, 1 Jun 2021 17:26:01 +0200 Subject: [PATCH 16/45] adding AnimationsSystem.cpp --- CMakeLists.txt | 9 ++-- .../Animation/AnimationComponent.cpp | 16 ------- .../Animation/AnimationComponent.hpp | 31 ------------ .../Animation/AnimationsComponent.cpp | 43 +++++++++++++++++ .../Animation/AnimationsComponent.hpp | 47 +++++++++++++++++++ sources/System/Animation/AnimationsSystem.cpp | 27 +++++++++++ sources/System/Animation/AnimationsSystem.hpp | 25 ++++++++++ .../Controllable/ControllableSystem.cpp | 2 - .../Controllable/ControllableSystem.hpp | 2 +- 9 files changed, 149 insertions(+), 53 deletions(-) delete mode 100644 sources/Component/Animation/AnimationComponent.cpp delete mode 100644 sources/Component/Animation/AnimationComponent.hpp create mode 100644 sources/Component/Animation/AnimationsComponent.cpp create mode 100644 sources/Component/Animation/AnimationsComponent.hpp create mode 100644 sources/System/Animation/AnimationsSystem.cpp create mode 100644 sources/System/Animation/AnimationsSystem.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 81b3c154..b17dc1aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,13 +54,16 @@ set(SOURCES sources/Component/Renderer/CameraComponent.hpp sources/System/Renderer/Render2DScreenSystem.cpp sources/System/Renderer/Render2DScreenSystem.hpp - sources/Component/Animation/AnimationComponent.cpp - sources/Component/Animation/AnimationComponent.hpp + sources/Component/Animation/AnimationsComponent.cpp + sources/Component/Animation/AnimationsComponent.hpp + sources/System/Animation/AnimationsSystem.cpp + sources/System/Animation/AnimationsSystem.hpp ) add_executable(bomberman sources/main.cpp - ${SOURCES}) + ${SOURCES} + ) target_include_directories(bomberman PUBLIC sources) target_link_libraries(bomberman PUBLIC wal ray) diff --git a/sources/Component/Animation/AnimationComponent.cpp b/sources/Component/Animation/AnimationComponent.cpp deleted file mode 100644 index d1f8210b..00000000 --- a/sources/Component/Animation/AnimationComponent.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// -// Created by cbihan on 01/06/2021. -// - -#include "AnimationComponent.hpp" -#include "Entity/Entity.hpp" - -namespace BBM -{ - AnimationComponent::AnimationComponent(WAL::Entity &entity, RAY::ModelAnimation &modelAnimation) - : WAL::Component(entity), - _modelAnimation(modelAnimation) - { - - } -} \ No newline at end of file diff --git a/sources/Component/Animation/AnimationComponent.hpp b/sources/Component/Animation/AnimationComponent.hpp deleted file mode 100644 index 36946c16..00000000 --- a/sources/Component/Animation/AnimationComponent.hpp +++ /dev/null @@ -1,31 +0,0 @@ -// -// Created by cbihan on 01/06/2021. -// - -#pragma once - -#include -#include "Component/Component.hpp" -#include "Entity/Entity.hpp" -#include "Model/Model.hpp" - -namespace BBM -{ - - class AnimationComponent : public WAL::Component - { - private: - //! @brief To get the animation data - RAY::ModelAnimation &_modelAnimation; - public: - //! @brief ctor entity and the path of the animation file - explicit AnimationComponent(WAL::Entity &entity, RAY::ModelAnimation &modelAnimation); - //! @brief copy ctor - AnimationComponent(const AnimationComponent &) = default; - //! @brief dtor - ~AnimationComponent() override = default; - //! @brief assignment operator - AnimationComponent &operator=(const AnimationComponent &) = delete; - }; - -} diff --git a/sources/Component/Animation/AnimationsComponent.cpp b/sources/Component/Animation/AnimationsComponent.cpp new file mode 100644 index 00000000..d32c6818 --- /dev/null +++ b/sources/Component/Animation/AnimationsComponent.cpp @@ -0,0 +1,43 @@ +// +// Created by cbihan on 01/06/2021. +// + +#include "AnimationsComponent.hpp" +#include "Entity/Entity.hpp" +#include "Model/ModelAnimations.hpp" + +namespace BBM +{ + AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation) + : WAL::Component(entity), + _modelAnimation(modelAnimation), + _animFrameCounter(0) + { + } + + WAL::Component *AnimationsComponent::clone(WAL::Entity &entity) const + { + return new AnimationsComponent(entity, this->_modelAnimation); + } + + size_t AnimationsComponent::getAnimFrameCounter() const + { + return this->_animFrameCounter; + } + + RAY::ModelAnimation AnimationsComponent::getCurrentModelAnim() const + { + return this->_modelAnimation[static_cast(this->_animFrameCounter)]; + } + + void AnimationsComponent::setAnimFrameCounter(size_t animFrameCounter) + { + this->_animFrameCounter = animFrameCounter; + this->_animFrameCounter %= this->_modelAnimation.getAnimationsCount(); + } + + void AnimationsComponent::resetAnimFrameCounter() + { + this->_animFrameCounter = 0; + } +} \ No newline at end of file diff --git a/sources/Component/Animation/AnimationsComponent.hpp b/sources/Component/Animation/AnimationsComponent.hpp new file mode 100644 index 00000000..a3d741a9 --- /dev/null +++ b/sources/Component/Animation/AnimationsComponent.hpp @@ -0,0 +1,47 @@ +// +// Created by cbihan on 01/06/2021. +// + +#pragma once + +#include +#include +#include +#include + +namespace BBM +{ + class AnimationsComponent : public WAL::Component + { + private: + //! @brief To get the animation data + RAY::ModelAnimations &_modelAnimation; + //! @brief the frame animation counter + size_t _animFrameCounter; + public: + //! @inherit + WAL::Component *clone(WAL::Entity &entity) const override; + + //! @brief get animation frame counter + size_t getAnimFrameCounter() const; + + //! @brief get the current + RAY::ModelAnimation getCurrentModelAnim() const; + + //! @brief + void setAnimFrameCounter(size_t animFrameCounter); + + //! @brief Set the internal anim counter to 0 + void resetAnimFrameCounter(); + + //! @brief ctor entity and the path of the animation file + explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation); + //! @brief copy ctor + AnimationsComponent(const AnimationsComponent &) = default; + //! @brief dtor + ~AnimationsComponent() override = default; + //! @brief assignment operator + AnimationsComponent &operator=(const AnimationsComponent &) = delete; + }; + +} diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp new file mode 100644 index 00000000..42425acf --- /dev/null +++ b/sources/System/Animation/AnimationsSystem.cpp @@ -0,0 +1,27 @@ +// +// Created by cbihan on 01/06/2021. +// + +#include "AnimationsSystem.hpp" +#include "Component/Animation/AnimationsComponent.hpp" +#include "Model/Model.hpp" +#include "Component/Renderer/Drawable3DComponent.hpp" + +namespace BBM +{ + + AnimationsSystem::AnimationsSystem() + : WAL::System({typeid(AnimationsComponent), + typeid(Drawable3DComponent)}) + { + } + + void AnimationsSystem::onFixedUpdate(WAL::Entity &entity) + { + auto &model = entity.getComponent>(); + auto &anim = entity.getComponent(); + + model.member.setAnimation(anim.getCurrentModelAnim()); + anim.setAnimFrameCounter(anim.getAnimFrameCounter() + 1); + } +} \ No newline at end of file diff --git a/sources/System/Animation/AnimationsSystem.hpp b/sources/System/Animation/AnimationsSystem.hpp new file mode 100644 index 00000000..eb508b3e --- /dev/null +++ b/sources/System/Animation/AnimationsSystem.hpp @@ -0,0 +1,25 @@ +// +// Created by cbihan on 01/06/2021. +// + +#pragma once + +#include + +namespace BBM +{ + class AnimationsSystem : public WAL::System + { + //! @inherit + void onFixedUpdate(WAL::Entity &entity) override; + + //! @brief A default constructor + AnimationsSystem(); + //! @brief A Controllable system is copy constructable + AnimationsSystem(const AnimationsSystem &) = default; + //! @brief A default destructor + ~AnimationsSystem() override = default; + //! @brief A Controllable system is assignable. + AnimationsSystem &operator=(const AnimationsSystem &) = default; + }; +} \ No newline at end of file diff --git a/sources/System/Controllable/ControllableSystem.cpp b/sources/System/Controllable/ControllableSystem.cpp index 0a9c789c..41c54895 100644 --- a/sources/System/Controllable/ControllableSystem.cpp +++ b/sources/System/Controllable/ControllableSystem.cpp @@ -10,8 +10,6 @@ namespace BBM { - float ControllableSystem::speed = .25f; - ControllableSystem::ControllableSystem() : WAL::System({ typeid(ControllableComponent), diff --git a/sources/System/Controllable/ControllableSystem.hpp b/sources/System/Controllable/ControllableSystem.hpp index fac4db08..ec6eef9d 100644 --- a/sources/System/Controllable/ControllableSystem.hpp +++ b/sources/System/Controllable/ControllableSystem.hpp @@ -14,7 +14,7 @@ namespace BBM { public: //! @brief The speed applied to every controllable entities. - static float speed; + static constexpr const float speed = .25f; //! @inherit void onFixedUpdate(WAL::Entity &entity) override; From ef0c323d945f2e8d8f6a70e8ab0eb8e1199d44b1 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Wed, 2 Jun 2021 14:33:52 +0200 Subject: [PATCH 17/45] addition + correct drawing modes --- lib/Ray/sources/Window.cpp | 5 +++++ lib/Ray/sources/Window.hpp | 4 +++- sources/Runner/Runner.cpp | 17 +++++++++++------ .../System/Renderer/Render2DScreenSystem.cpp | 8 +++++--- .../System/Renderer/Render2DScreenSystem.hpp | 3 --- sources/System/Renderer/RenderScreenSystem.cpp | 14 +++++++++++--- sources/System/Renderer/Renderer2DSystem.hpp | 3 ++- sources/System/Renderer/Renderer3DSystem.hpp | 2 +- 8 files changed, 38 insertions(+), 18 deletions(-) diff --git a/lib/Ray/sources/Window.cpp b/lib/Ray/sources/Window.cpp index c30c2575..9deba6e0 100644 --- a/lib/Ray/sources/Window.cpp +++ b/lib/Ray/sources/Window.cpp @@ -167,3 +167,8 @@ void RAY::Window::setIcon(RAY::Image &img) { SetWindowIcon(img); } + +bool RAY::Window::isReady() const +{ + return IsWindowReady(); +} \ No newline at end of file diff --git a/lib/Ray/sources/Window.hpp b/lib/Ray/sources/Window.hpp index 91acd870..c16eae4b 100644 --- a/lib/Ray/sources/Window.hpp +++ b/lib/Ray/sources/Window.hpp @@ -7,7 +7,7 @@ #ifndef WINDOW_HPP_ #define WINDOW_HPP_ - +#define INTERNAL public #include #include #include @@ -131,6 +131,8 @@ namespace RAY { //! @brief Draw a 3d mesh with material and transform void draw(const Mesh &mesh, const Material &material, const Matrix &transform); + bool isReady() const; + private: //! @brief Creates window, and opens it if openNow is set to true diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index 9e256b05..c97c125d 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -34,27 +35,31 @@ namespace BBM void enableRaylib(WAL::Wal &wal) { - RAY::TraceLog::setLevel(LOG_WARNING); - RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE); + //RAY::TraceLog::setLevel(LOG_WARNING); + RAY::Window &window = RAY::Window::getInstance(800, 600, "Bomberman", FLAG_WINDOW_RESIZABLE); - wal.addSystem>(); + wal.addSystem(window) + .addSystem>() + .addSystem>(); wal.addSystem(window) .addSystem>(); - wal.addSystem(window); } std::shared_ptr loadGameScene() { auto scene = std::make_shared(); scene->addEntity("cube") + .addComponent(10, 10, 0) + .addComponent>(Vector2f(), Vector2f(10, 10), GREEN); + scene->addEntity("cube2") .addComponent() - .addComponent>(Vector2f(), Vector2f(10, 10), RED); + .addComponent>(Vector3f(), Vector3f(1, 1, 1), RED); scene->addEntity("player") .addComponent() .addComponent>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png")); scene->addEntity("camera") - .addComponent(10, 10, 10) + .addComponent(10, 10, 15) .addComponent(); return scene; } diff --git a/sources/System/Renderer/Render2DScreenSystem.cpp b/sources/System/Renderer/Render2DScreenSystem.cpp index 938d107f..b21c35da 100644 --- a/sources/System/Renderer/Render2DScreenSystem.cpp +++ b/sources/System/Renderer/Render2DScreenSystem.cpp @@ -8,12 +8,14 @@ namespace BBM { Render2DScreenSystem::Render2DScreenSystem(RAY::Window &window) : WAL::System({}), - _window(window), - _camera(RAY::Vector2(10, 10), RAY::Vector2(), 0) + _window(window) {} void Render2DScreenSystem::onSelfUpdate() { - this->_window.useCamera(this->_camera); + EndMode3D(); + printf("EndMode3D\n"); + DrawText("Try selecting the box with mouse!", 10, 10, 20, WHITE); + //this->_window.unuseCamera(); } } \ No newline at end of file diff --git a/sources/System/Renderer/Render2DScreenSystem.hpp b/sources/System/Renderer/Render2DScreenSystem.hpp index 12adaf34..4fa00ba1 100644 --- a/sources/System/Renderer/Render2DScreenSystem.hpp +++ b/sources/System/Renderer/Render2DScreenSystem.hpp @@ -13,9 +13,6 @@ namespace BBM { //! @brief The window to render on RAY::Window &_window; - - //! @brief The camera used to render. - RAY::Camera::Camera2D _camera; public: //! @brief A method called after all entities that this system manage has been updated. //! @note render on screen here diff --git a/sources/System/Renderer/RenderScreenSystem.cpp b/sources/System/Renderer/RenderScreenSystem.cpp index 5523ee48..1550bd65 100644 --- a/sources/System/Renderer/RenderScreenSystem.cpp +++ b/sources/System/Renderer/RenderScreenSystem.cpp @@ -15,18 +15,26 @@ namespace BBM }), _window(window), _camera(Vector3f(), Vector3f(), Vector3f(0, 1, 0), 50, CAMERA_PERSPECTIVE) - {} + { + this->_camera.setMode(CAMERA_FREE); + } void RenderScreenSystem::onSelfUpdate() { - this->_window.draw(); + //this->_window.draw(); + //EndMode2D(); + EndDrawing(); + this->_camera.update(); + BeginDrawing(); this->_window.clear(); - this->_window.useCamera(this->_camera); + BeginMode3D(this->_camera); + printf("BeginMode3D\n"); } void RenderScreenSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) { const auto &pos = entity.getComponent(); _camera.setPosition(pos.position); + //this->_camera.update(); } } \ No newline at end of file diff --git a/sources/System/Renderer/Renderer2DSystem.hpp b/sources/System/Renderer/Renderer2DSystem.hpp index a1622c0d..3fd55346 100644 --- a/sources/System/Renderer/Renderer2DSystem.hpp +++ b/sources/System/Renderer/Renderer2DSystem.hpp @@ -35,7 +35,8 @@ namespace BBM auto &pos = entity.getComponent(); comp.member.setPosition({pos.getX(), pos.getY()}); - comp.member.drawOn(this->_window); + this->_window.draw(comp.member); + printf("Drawing smth\n"); } //! @brief default copy ctor diff --git a/sources/System/Renderer/Renderer3DSystem.hpp b/sources/System/Renderer/Renderer3DSystem.hpp index 8dba98f6..0fa3a9bb 100644 --- a/sources/System/Renderer/Renderer3DSystem.hpp +++ b/sources/System/Renderer/Renderer3DSystem.hpp @@ -35,7 +35,7 @@ namespace BBM auto &pos = entity.getComponent(); comp.member.setPosition(static_cast(pos.position)); - comp.member.drawOn(this->_window); + this->_window.draw(comp.member); } //! @brief Default copy ctor From d986a24c47025bc4de9127aadd9ebe15c74fe920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 15:08:46 +0200 Subject: [PATCH 18/45] animation component should theoretically work --- lib/Ray/sources/Model/ModelAnimations.cpp | 2 +- .../Animation/AnimationsComponent.cpp | 37 +++++++++++++------ .../Animation/AnimationsComponent.hpp | 23 ++++++++---- sources/System/Animation/AnimationsSystem.cpp | 2 +- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/lib/Ray/sources/Model/ModelAnimations.cpp b/lib/Ray/sources/Model/ModelAnimations.cpp index 224b9979..2b7328f4 100644 --- a/lib/Ray/sources/Model/ModelAnimations.cpp +++ b/lib/Ray/sources/Model/ModelAnimations.cpp @@ -13,7 +13,7 @@ RAY::ModelAnimations::ModelAnimations(const std::string &filePath): ::ModelAnimation *ptr = this->_animationsPtr.get(); for (int i = 0; i < this->_animationCount; i++) - this->_animations.push_back(RAY::ModelAnimation(ptr[i])); + this->_animations.emplace_back(RAY::ModelAnimation(ptr[i])); } RAY::ModelAnimations::~ModelAnimations() diff --git a/sources/Component/Animation/AnimationsComponent.cpp b/sources/Component/Animation/AnimationsComponent.cpp index d32c6818..ce29964d 100644 --- a/sources/Component/Animation/AnimationsComponent.cpp +++ b/sources/Component/Animation/AnimationsComponent.cpp @@ -8,36 +8,51 @@ namespace BBM { - AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation) + AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation, int animIndex) : WAL::Component(entity), _modelAnimation(modelAnimation), - _animFrameCounter(0) + _currentAnimIndex(animIndex) { + this->_modelAnimation[this->_currentAnimIndex].setFrameCounter(0); } WAL::Component *AnimationsComponent::clone(WAL::Entity &entity) const { - return new AnimationsComponent(entity, this->_modelAnimation); + return new AnimationsComponent(entity, this->_modelAnimation, this->_currentAnimIndex); } - size_t AnimationsComponent::getAnimFrameCounter() const + size_t AnimationsComponent::getCurrentAnimFrameCounter() const { - return this->_animFrameCounter; + return this->_modelAnimation[this->_currentAnimIndex].getFrameCounter(); } RAY::ModelAnimation AnimationsComponent::getCurrentModelAnim() const { - return this->_modelAnimation[static_cast(this->_animFrameCounter)]; + return this->_modelAnimation[this->_currentAnimIndex]; } - void AnimationsComponent::setAnimFrameCounter(size_t animFrameCounter) + void AnimationsComponent::setCurrentAnimFrameCounter(size_t animFrameCounter) { - this->_animFrameCounter = animFrameCounter; - this->_animFrameCounter %= this->_modelAnimation.getAnimationsCount(); + this->_modelAnimation[this->_currentAnimIndex].setFrameCounter(animFrameCounter); } - void AnimationsComponent::resetAnimFrameCounter() + void AnimationsComponent::resetCurrentAnimFrameCounter() { - this->_animFrameCounter = 0; + this->_modelAnimation[this->_currentAnimIndex].setFrameCounter(0); + } + + size_t AnimationsComponent::getCurrentAnimIndex() const + { + return this->_currentAnimIndex; + } + + void AnimationsComponent::setAnimIndex(int animIndex) + { + this->_currentAnimIndex = animIndex % static_cast(this->_modelAnimation.getAnimationsCount()); + } + + void AnimationsComponent::incCurrentAnimFrameCounter() + { + this->_modelAnimation[this->_currentAnimIndex].incrementFrameCounter(); } } \ No newline at end of file diff --git a/sources/Component/Animation/AnimationsComponent.hpp b/sources/Component/Animation/AnimationsComponent.hpp index a3d741a9..239c9470 100644 --- a/sources/Component/Animation/AnimationsComponent.hpp +++ b/sources/Component/Animation/AnimationsComponent.hpp @@ -16,26 +16,35 @@ namespace BBM private: //! @brief To get the animation data RAY::ModelAnimations &_modelAnimation; - //! @brief the frame animation counter - size_t _animFrameCounter; + //! @brief The index of the + int _currentAnimIndex; public: //! @inherit WAL::Component *clone(WAL::Entity &entity) const override; + //! @brief get the current animation index + size_t getCurrentAnimIndex() const; + + //! @brief Set the animation index to use + void setAnimIndex(int animIndex); + //! @brief get animation frame counter - size_t getAnimFrameCounter() const; + size_t getCurrentAnimFrameCounter() const; //! @brief get the current RAY::ModelAnimation getCurrentModelAnim() const; - //! @brief - void setAnimFrameCounter(size_t animFrameCounter); + //! @brief set the anim frame counter + void setCurrentAnimFrameCounter(size_t animFrameCounter); //! @brief Set the internal anim counter to 0 - void resetAnimFrameCounter(); + void resetCurrentAnimFrameCounter(); + + //! @brief Increment the internal anim counter + void incCurrentAnimFrameCounter(); //! @brief ctor entity and the path of the animation file - explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation); + explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation, int animIndex); //! @brief copy ctor AnimationsComponent(const AnimationsComponent &) = default; //! @brief dtor diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp index 42425acf..f9f7c9ef 100644 --- a/sources/System/Animation/AnimationsSystem.cpp +++ b/sources/System/Animation/AnimationsSystem.cpp @@ -22,6 +22,6 @@ namespace BBM auto &anim = entity.getComponent(); model.member.setAnimation(anim.getCurrentModelAnim()); - anim.setAnimFrameCounter(anim.getAnimFrameCounter() + 1); + anim.setCurrentAnimFrameCounter(anim.getCurrentAnimFrameCounter() + 1); } } \ No newline at end of file From f245fe727b0d6619c639a2b1697dafe5ed8b0b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 15:58:37 +0200 Subject: [PATCH 19/45] Animation is working segfault on unload --- lib/Ray/sources/Model/ModelAnimations.cpp | 15 +++++++++++++-- lib/Ray/sources/Model/ModelAnimations.hpp | 12 ++++++++++++ .../Component/Animation/AnimationsComponent.cpp | 12 +++++++----- .../Component/Animation/AnimationsComponent.hpp | 6 +++--- sources/Runner/Runner.cpp | 5 +++++ sources/System/Animation/AnimationsSystem.cpp | 9 ++++++--- sources/System/Animation/AnimationsSystem.hpp | 3 ++- 7 files changed, 48 insertions(+), 14 deletions(-) diff --git a/lib/Ray/sources/Model/ModelAnimations.cpp b/lib/Ray/sources/Model/ModelAnimations.cpp index 7ab39f41..5d5d297f 100644 --- a/lib/Ray/sources/Model/ModelAnimations.cpp +++ b/lib/Ray/sources/Model/ModelAnimations.cpp @@ -10,7 +10,8 @@ RAY::Cache<::ModelAnimation> RAY::ModelAnimations::_animationsCache(LoadModelAnimations, UnloadModelAnimations); RAY::ModelAnimations::ModelAnimations(const std::string &filePath): - _animationsPtr(_animationsCache.fetch(filePath, &this->_animationCount)) + _animationsPtr(_animationsCache.fetch(filePath, &this->_animationCount)), + _filePath(filePath) { ::ModelAnimation *ptr = this->_animationsPtr.get(); @@ -20,7 +21,7 @@ RAY::ModelAnimations::ModelAnimations(const std::string &filePath): RAY::ModelAnimation &RAY::ModelAnimations::operator[](int index) { - return this->_animations[index]; + return this->_animations.at(index); } size_t RAY::ModelAnimations::getAnimationsCount() const @@ -28,3 +29,13 @@ size_t RAY::ModelAnimations::getAnimationsCount() const return this->_animationCount; } +std::string RAY::ModelAnimations::getFilePath() const +{ + return this->_filePath; +} + +const RAY::ModelAnimation &RAY::ModelAnimations::at(int index) const +{ + return this->_animations.at(index); +} + diff --git a/lib/Ray/sources/Model/ModelAnimations.hpp b/lib/Ray/sources/Model/ModelAnimations.hpp index ba46a0e4..9188955a 100644 --- a/lib/Ray/sources/Model/ModelAnimations.hpp +++ b/lib/Ray/sources/Model/ModelAnimations.hpp @@ -27,15 +27,24 @@ namespace RAY { //! @brief Default constructor ~ModelAnimations() = default; + //! @brief Default move ctor + ModelAnimations(ModelAnimations &&) = default; + //! @brief Only single entity can hold these animations pointers ModelAnimations &operator=(const ModelAnimations &) = delete; //! @brief Castin Object to raw model animation pointer ModelAnimation &operator[](int index); + //! @brief Same usage as the operator[] but const + const ModelAnimation &at(int index) const; + //! @return the number of loaded animations size_t getAnimationsCount() const; + //! @brief Get the creation file + std::string getFilePath() const; + private: //! @brief Holds the pointer returned by the loading function std::shared_ptr<::ModelAnimation> _animationsPtr; @@ -46,6 +55,9 @@ namespace RAY { //! @brief the number of loaded animations int _animationCount; + //! @brief The file where the animations were loaded (used to create a copy of this class) + const std::string _filePath; + static Cache<::ModelAnimation> _animationsCache; }; } diff --git a/sources/Component/Animation/AnimationsComponent.cpp b/sources/Component/Animation/AnimationsComponent.cpp index ce29964d..843dcbcc 100644 --- a/sources/Component/Animation/AnimationsComponent.cpp +++ b/sources/Component/Animation/AnimationsComponent.cpp @@ -8,9 +8,9 @@ namespace BBM { - AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation, int animIndex) + AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex) : WAL::Component(entity), - _modelAnimation(modelAnimation), + _modelAnimation(std::move(modelAnimation)), _currentAnimIndex(animIndex) { this->_modelAnimation[this->_currentAnimIndex].setFrameCounter(0); @@ -18,15 +18,17 @@ namespace BBM WAL::Component *AnimationsComponent::clone(WAL::Entity &entity) const { - return new AnimationsComponent(entity, this->_modelAnimation, this->_currentAnimIndex); + return new AnimationsComponent(entity, + RAY::ModelAnimations(this->_modelAnimation.getFilePath()), + this->_currentAnimIndex); } size_t AnimationsComponent::getCurrentAnimFrameCounter() const { - return this->_modelAnimation[this->_currentAnimIndex].getFrameCounter(); + return this->_modelAnimation.at(this->_currentAnimIndex).getFrameCounter(); } - RAY::ModelAnimation AnimationsComponent::getCurrentModelAnim() const + RAY::ModelAnimation AnimationsComponent::getCurrentModelAnim() { return this->_modelAnimation[this->_currentAnimIndex]; } diff --git a/sources/Component/Animation/AnimationsComponent.hpp b/sources/Component/Animation/AnimationsComponent.hpp index 239c9470..ffaf0599 100644 --- a/sources/Component/Animation/AnimationsComponent.hpp +++ b/sources/Component/Animation/AnimationsComponent.hpp @@ -15,7 +15,7 @@ namespace BBM { private: //! @brief To get the animation data - RAY::ModelAnimations &_modelAnimation; + RAY::ModelAnimations _modelAnimation; //! @brief The index of the int _currentAnimIndex; public: @@ -32,7 +32,7 @@ namespace BBM size_t getCurrentAnimFrameCounter() const; //! @brief get the current - RAY::ModelAnimation getCurrentModelAnim() const; + RAY::ModelAnimation getCurrentModelAnim(); //! @brief set the anim frame counter void setCurrentAnimFrameCounter(size_t animFrameCounter); @@ -44,7 +44,7 @@ namespace BBM void incCurrentAnimFrameCounter(); //! @brief ctor entity and the path of the animation file - explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations &modelAnimation, int animIndex); + explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex); //! @brief copy ctor AnimationsComponent(const AnimationsComponent &) = default; //! @brief dtor diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index d2a1adc9..6ca30a27 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -22,6 +22,9 @@ #include "Component/Renderer/CameraComponent.hpp" #include "Runner.hpp" #include "Models/GameState.hpp" +#include +#include "Component/Animation/AnimationsComponent.hpp" +#include "System/Animation/AnimationsSystem.hpp" #include "Map/Map.hpp" namespace RAY2D = RAY::Drawables::Drawables2D; @@ -53,6 +56,7 @@ namespace BBM RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE); wal.addSystem>(); + wal.addSystem(); wal.addSystem(window) .addSystem>(); @@ -73,6 +77,7 @@ namespace BBM .addComponent>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png")) .addComponent() .addComponent() + .addComponent(RAY::ModelAnimations("assets/player/player.iqm"), 3) .addComponent(); scene->addEntity("camera") .addComponent(8, 20, 7) diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp index f9f7c9ef..66d1253e 100644 --- a/sources/System/Animation/AnimationsSystem.cpp +++ b/sources/System/Animation/AnimationsSystem.cpp @@ -2,6 +2,7 @@ // Created by cbihan on 01/06/2021. // +#include #include "AnimationsSystem.hpp" #include "Component/Animation/AnimationsComponent.hpp" #include "Model/Model.hpp" @@ -11,12 +12,14 @@ namespace BBM { AnimationsSystem::AnimationsSystem() - : WAL::System({typeid(AnimationsComponent), - typeid(Drawable3DComponent)}) + : WAL::System({ + typeid(Drawable3DComponent), + typeid(AnimationsComponent) + }) { } - void AnimationsSystem::onFixedUpdate(WAL::Entity &entity) + void AnimationsSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) { auto &model = entity.getComponent>(); auto &anim = entity.getComponent(); diff --git a/sources/System/Animation/AnimationsSystem.hpp b/sources/System/Animation/AnimationsSystem.hpp index eb508b3e..fb08b2ef 100644 --- a/sources/System/Animation/AnimationsSystem.hpp +++ b/sources/System/Animation/AnimationsSystem.hpp @@ -10,8 +10,9 @@ namespace BBM { class AnimationsSystem : public WAL::System { + public: //! @inherit - void onFixedUpdate(WAL::Entity &entity) override; + void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) override; //! @brief A default constructor AnimationsSystem(); From b3eae9ebdfe024548a4683b38ba4ecd869338854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 16:11:14 +0200 Subject: [PATCH 20/45] adding the possibility to pause/resume an animation --- .../Component/Animation/AnimationsComponent.cpp | 15 +++++++++++++-- .../Component/Animation/AnimationsComponent.hpp | 10 +++++++++- sources/System/Animation/AnimationsSystem.cpp | 2 ++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sources/Component/Animation/AnimationsComponent.cpp b/sources/Component/Animation/AnimationsComponent.cpp index 843dcbcc..72be399f 100644 --- a/sources/Component/Animation/AnimationsComponent.cpp +++ b/sources/Component/Animation/AnimationsComponent.cpp @@ -8,10 +8,11 @@ namespace BBM { - AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex) + AnimationsComponent::AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex, bool play) : WAL::Component(entity), _modelAnimation(std::move(modelAnimation)), - _currentAnimIndex(animIndex) + _currentAnimIndex(animIndex), + _animDisabled(play) { this->_modelAnimation[this->_currentAnimIndex].setFrameCounter(0); } @@ -57,4 +58,14 @@ namespace BBM { this->_modelAnimation[this->_currentAnimIndex].incrementFrameCounter(); } + + void AnimationsComponent::setAnimDisabled(bool disable) + { + this->_animDisabled = disable; + } + + bool AnimationsComponent::isAnimDisabled() const + { + return this->_animDisabled; + } } \ No newline at end of file diff --git a/sources/Component/Animation/AnimationsComponent.hpp b/sources/Component/Animation/AnimationsComponent.hpp index ffaf0599..62e2e13b 100644 --- a/sources/Component/Animation/AnimationsComponent.hpp +++ b/sources/Component/Animation/AnimationsComponent.hpp @@ -18,6 +18,8 @@ namespace BBM RAY::ModelAnimations _modelAnimation; //! @brief The index of the int _currentAnimIndex; + //! @brief Bool allowing to play pause an animation + bool _animDisabled; public: //! @inherit WAL::Component *clone(WAL::Entity &entity) const override; @@ -43,8 +45,14 @@ namespace BBM //! @brief Increment the internal anim counter void incCurrentAnimFrameCounter(); + //! @brief Allow to play pause animations + void setAnimDisabled(bool disable); + + //! @brief To know if the animation will be updated or not + bool isAnimDisabled() const; + //! @brief ctor entity and the path of the animation file - explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex); + explicit AnimationsComponent(WAL::Entity &entity, RAY::ModelAnimations modelAnimation, int animIndex, bool play = true); //! @brief copy ctor AnimationsComponent(const AnimationsComponent &) = default; //! @brief dtor diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp index 66d1253e..7e54adbd 100644 --- a/sources/System/Animation/AnimationsSystem.cpp +++ b/sources/System/Animation/AnimationsSystem.cpp @@ -24,6 +24,8 @@ namespace BBM auto &model = entity.getComponent>(); auto &anim = entity.getComponent(); + if (anim.isDisabled()) + return; model.member.setAnimation(anim.getCurrentModelAnim()); anim.setCurrentAnimFrameCounter(anim.getCurrentAnimFrameCounter() + 1); } From 09d8b1a90b23ef8b9423dd491d3c446cc2b24a29 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 2 Jun 2021 16:18:26 +0200 Subject: [PATCH 21/45] Reworking drawable components --- CMakeLists.txt | 12 ++--- lib/wal/CMakeLists.txt | 2 +- lib/wal/sources/Entity/Entity.hpp | 13 +++++ lib/wal/sources/Models/TypeHolder.hpp | 13 +++++ .../Renderer/Drawable2DComponent.hpp | 20 ++++---- .../Renderer/Drawable3DComponent.hpp | 16 +++--- sources/Runner/Runner.cpp | 27 +++++----- .../System/Renderer/Render2DScreenSystem.cpp | 19 ------- .../System/Renderer/Render2DScreenSystem.hpp | 33 ------------- .../System/Renderer/RenderScreenSystem.cpp | 32 ------------ sources/System/Renderer/RenderSystem.cpp | 49 +++++++++++++++++++ ...enderScreenSystem.hpp => RenderSystem.hpp} | 14 ++++-- sources/System/Renderer/Renderer2DSystem.hpp | 48 ------------------ sources/System/Renderer/Renderer3DSystem.hpp | 48 ------------------ sources/main.cpp | 40 --------------- 15 files changed, 118 insertions(+), 268 deletions(-) create mode 100644 lib/wal/sources/Models/TypeHolder.hpp delete mode 100644 sources/System/Renderer/Render2DScreenSystem.cpp delete mode 100644 sources/System/Renderer/Render2DScreenSystem.hpp delete mode 100644 sources/System/Renderer/RenderScreenSystem.cpp create mode 100644 sources/System/Renderer/RenderSystem.cpp rename sources/System/Renderer/{RenderScreenSystem.hpp => RenderSystem.hpp} (69%) delete mode 100644 sources/System/Renderer/Renderer2DSystem.hpp delete mode 100644 sources/System/Renderer/Renderer3DSystem.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 84be48cd..01c04fb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,17 +28,13 @@ set(SOURCES sources/System/Movable/MovableSystem.cpp sources/Models/Vector3.hpp sources/Models/Vector2.hpp - sources/Component/Renderer/Drawable3DComponent.hpp sources/Component/Renderer/Drawable2DComponent.hpp - sources/System/Renderer/Renderer3DSystem.hpp - sources/System/Renderer/Renderer2DSystem.hpp - sources/System/Renderer/RenderScreenSystem.hpp - sources/System/Renderer/RenderScreenSystem.cpp + sources/Component/Renderer/Drawable3DComponent.hpp + sources/System/Renderer/RenderSystem.hpp + sources/System/Renderer/RenderSystem.cpp sources/Component/Renderer/CameraComponent.cpp sources/Component/Renderer/CameraComponent.hpp - sources/System/Renderer/Render2DScreenSystem.cpp - sources/System/Renderer/Render2DScreenSystem.hpp -) + ) add_executable(bomberman sources/main.cpp diff --git a/lib/wal/CMakeLists.txt b/lib/wal/CMakeLists.txt index e8cd8655..d216b9f3 100644 --- a/lib/wal/CMakeLists.txt +++ b/lib/wal/CMakeLists.txt @@ -17,6 +17,6 @@ add_library(wal sources/Component/Component.cpp sources/System/System.cpp sources/Models/Callback.hpp -) + sources/Models/TypeHolder.hpp) target_include_directories(wal PUBLIC sources) \ No newline at end of file diff --git a/lib/wal/sources/Entity/Entity.hpp b/lib/wal/sources/Entity/Entity.hpp index 8e157c6e..b64bfb82 100644 --- a/lib/wal/sources/Entity/Entity.hpp +++ b/lib/wal/sources/Entity/Entity.hpp @@ -10,6 +10,7 @@ #include #include "Component/Component.hpp" #include "Exception/WalError.hpp" +#include "Models/TypeHolder.hpp" namespace WAL { @@ -83,6 +84,18 @@ namespace WAL return *this; } + //! @brief Add a component to this entity. The component is constructed in place. + //! @throw DuplicateError is thrown if a component with the same type already exist. + //! @return This entity is returned + template + Entity &addComponent(Types &&...params) + { + if (this->hasComponent()) + throw DuplicateError("A component of the type \"" + std::string(typeid(T).name()) + "\" already exists."); + this->_components.push_back(std::make_unique(*this, TypeHolder(), std::forward(params)...)); + return *this; + } + //! @brief Copy a component to this entity. //! @return This entity is returned. Entity &addComponent(const Component &component); diff --git a/lib/wal/sources/Models/TypeHolder.hpp b/lib/wal/sources/Models/TypeHolder.hpp new file mode 100644 index 00000000..45057ed1 --- /dev/null +++ b/lib/wal/sources/Models/TypeHolder.hpp @@ -0,0 +1,13 @@ +// +// Created by Zoe Roux on 2021-06-02. +// + + +#pragma once + +namespace WAL +{ + //! @brief A class only used to specify template arguments. + template + class TypeHolder {}; +} \ No newline at end of file diff --git a/sources/Component/Renderer/Drawable2DComponent.hpp b/sources/Component/Renderer/Drawable2DComponent.hpp index 63aaaf2b..0fc75f26 100644 --- a/sources/Component/Renderer/Drawable2DComponent.hpp +++ b/sources/Component/Renderer/Drawable2DComponent.hpp @@ -5,35 +5,35 @@ #pragma once #include "Component/Component.hpp" -#include "Drawables/ADrawable2D.hpp" +#include "Drawables/ADrawable3D.hpp" +#include "Model/Model.hpp" namespace BBM { - template class Drawable2DComponent : public WAL::Component { public: //! @brief The type of the component - T member; + std::shared_ptr drawable; - //! ctor - Drawable2DComponent(WAL::Entity &entity, T member) + //! @brief ctor + Drawable2DComponent(WAL::Entity &entity, std::shared_ptr drawable) : WAL::Component(entity), - member(std::move(member)) + drawable(std::move(drawable)) {} //! ctor - template + template explicit Drawable2DComponent(WAL::Entity &entity, Params &&...params) : WAL::Component(entity), - member(std::forward(params)...) + drawable(std::move(T(std::forward(params)...))) {} //! @brief Clone a component for another or the same entity. //! @param entity The entity that owns the ne component. WAL::Component *clone(WAL::Entity &entity) const override { - return new Drawable2DComponent(entity, this->member); + return new Drawable2DComponent(entity, this->drawable); } //! @brief Default copy ctor @@ -42,7 +42,5 @@ namespace BBM ~Drawable2DComponent() override = default; //! @brief Default assignment operator Drawable2DComponent &operator=(const Drawable2DComponent &) = delete; - - }; } \ No newline at end of file diff --git a/sources/Component/Renderer/Drawable3DComponent.hpp b/sources/Component/Renderer/Drawable3DComponent.hpp index e4f85321..5a04da07 100644 --- a/sources/Component/Renderer/Drawable3DComponent.hpp +++ b/sources/Component/Renderer/Drawable3DComponent.hpp @@ -4,37 +4,37 @@ #pragma once +#include #include "Component/Component.hpp" #include "Drawables/ADrawable3D.hpp" #include "Model/Model.hpp" namespace BBM { - template class Drawable3DComponent : public WAL::Component { public: //! @brief The type of the component - T member; + std::shared_ptr drawable; //! @brief ctor - Drawable3DComponent(WAL::Entity &entity, T member) + Drawable3DComponent(WAL::Entity &entity, std::shared_ptr drawable) : WAL::Component(entity), - member(std::move(member)) + drawable(std::move(drawable)) {} //! ctor - template - explicit Drawable3DComponent(WAL::Entity &entity, Params &&...params) + template + explicit Drawable3DComponent(WAL::Entity &entity, WAL::TypeHolder, Params &&...params) : WAL::Component(entity), - member(std::forward(params)...) + drawable(new T(std::forward(params)...)) {} //! @brief Clone a component for another or the same entity. //! @param entity The entity that owns the ne component. WAL::Component *clone(WAL::Entity &entity) const override { - return new Drawable3DComponent(entity, this->member); + return new Drawable3DComponent(entity, this->drawable); } //! @brief Default copy ctor diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index 9e256b05..d45a9273 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -4,16 +4,16 @@ #include #include -#include -#include -#include -#include +#include "System/Movable/MovableSystem.hpp" +#include "System/Renderer/RenderSystem.hpp" #include #include #include -#include +#include "Component/Position/PositionComponent.hpp" #include "Models/Vector2.hpp" #include "Component/Renderer/CameraComponent.hpp" +#include "Component/Renderer/Drawable2DComponent.hpp" +#include "Component/Renderer/Drawable3DComponent.hpp" #include "Runner.hpp" #include "Models/GameState.hpp" @@ -36,23 +36,20 @@ namespace BBM { RAY::TraceLog::setLevel(LOG_WARNING); RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE); - - wal.addSystem>(); - - wal.addSystem(window) - .addSystem>(); - wal.addSystem(window); + wal.addSystem(wal, window); } std::shared_ptr loadGameScene() { +// Drawable2DComponent cmp = Drawable2DComponent(Vector2f(), Vector2f(), RED); + auto scene = std::make_shared(); - scene->addEntity("cube") - .addComponent() - .addComponent>(Vector2f(), Vector2f(10, 10), RED); +// scene->addEntity("cube") +// .addComponent() +// .addComponent(Vector2f(), Vector2f(10, 10), RED); scene->addEntity("player") .addComponent() - .addComponent>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png")); + .addComponent("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png")); scene->addEntity("camera") .addComponent(10, 10, 10) .addComponent(); diff --git a/sources/System/Renderer/Render2DScreenSystem.cpp b/sources/System/Renderer/Render2DScreenSystem.cpp deleted file mode 100644 index 938d107f..00000000 --- a/sources/System/Renderer/Render2DScreenSystem.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// -// Created by Zoe Roux on 5/27/21. -// - -#include "Render2DScreenSystem.hpp" - -namespace BBM -{ - Render2DScreenSystem::Render2DScreenSystem(RAY::Window &window) - : WAL::System({}), - _window(window), - _camera(RAY::Vector2(10, 10), RAY::Vector2(), 0) - {} - - void Render2DScreenSystem::onSelfUpdate() - { - this->_window.useCamera(this->_camera); - } -} \ No newline at end of file diff --git a/sources/System/Renderer/Render2DScreenSystem.hpp b/sources/System/Renderer/Render2DScreenSystem.hpp deleted file mode 100644 index 12adaf34..00000000 --- a/sources/System/Renderer/Render2DScreenSystem.hpp +++ /dev/null @@ -1,33 +0,0 @@ -// -// Created by Zoe Roux on 5/27/21. -// - -#pragma once - -#include -#include - -namespace BBM -{ - class Render2DScreenSystem : public WAL::System - { - //! @brief The window to render on - RAY::Window &_window; - - //! @brief The camera used to render. - RAY::Camera::Camera2D _camera; - public: - //! @brief A method called after all entities that this system manage has been updated. - //! @note render on screen here - void onSelfUpdate() override; - - //! @brief ctor - explicit Render2DScreenSystem(RAY::Window &window); - //! @brief Default copy ctor - Render2DScreenSystem(const Render2DScreenSystem &) = default; - //! @brief Default dtor - ~Render2DScreenSystem() override = default; - //! @brief A render screen system can't be assigned. - Render2DScreenSystem &operator=(const Render2DScreenSystem &) = delete; - }; -} \ No newline at end of file diff --git a/sources/System/Renderer/RenderScreenSystem.cpp b/sources/System/Renderer/RenderScreenSystem.cpp deleted file mode 100644 index 5523ee48..00000000 --- a/sources/System/Renderer/RenderScreenSystem.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// -// Created by Zoe Roux on 5/27/21. -// - -#include "RenderScreenSystem.hpp" -#include "Component/Renderer/CameraComponent.hpp" -#include "Component/Position/PositionComponent.hpp" - -namespace BBM -{ - RenderScreenSystem::RenderScreenSystem(RAY::Window &window) - : WAL::System({ - typeid(CameraComponent), - typeid(PositionComponent) - }), - _window(window), - _camera(Vector3f(), Vector3f(), Vector3f(0, 1, 0), 50, CAMERA_PERSPECTIVE) - {} - - void RenderScreenSystem::onSelfUpdate() - { - this->_window.draw(); - this->_window.clear(); - this->_window.useCamera(this->_camera); - } - - void RenderScreenSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) - { - const auto &pos = entity.getComponent(); - _camera.setPosition(pos.position); - } -} \ No newline at end of file diff --git a/sources/System/Renderer/RenderSystem.cpp b/sources/System/Renderer/RenderSystem.cpp new file mode 100644 index 00000000..590a9262 --- /dev/null +++ b/sources/System/Renderer/RenderSystem.cpp @@ -0,0 +1,49 @@ +// +// Created by Zoe Roux on 5/27/21. +// + +#undef INTERNAL +#define INTERNAL public +#include +#include "RenderSystem.hpp" +#include "Component/Renderer/CameraComponent.hpp" +#include "Component/Position/PositionComponent.hpp" + +namespace BBM +{ + RenderSystem::RenderSystem(WAL::Wal &wal, RAY::Window &window) + : WAL::System({ + typeid(CameraComponent), + typeid(PositionComponent) + }), + _wal(wal), + _window(window), + _camera(Vector3f(), Vector3f(), Vector3f(0, 1, 0), 50, CAMERA_PERSPECTIVE) + {} + + void RenderSystem::onSelfUpdate() + { + this->_camera.update(); + BeginDrawing(); + ClearBackground(BLACK); + BeginMode3D(this->_camera); + for (auto &entity : this->_wal.scene->getEntities()) { + if (!entity.hasComponent() + || !entity.hasComponent()) + continue; + auto &drawable = entity.getComponent(); + auto &pos = entity.getComponent(); + +// drawable.drawable->setPosition(static_cast(pos.position)); +// drawable.drawable->drawOn(this->_window); + } + EndMode3D(); + EndDrawing(); + } + + void RenderSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) + { + const auto &pos = entity.getComponent(); + _camera.setPosition(pos.position); + } +} \ No newline at end of file diff --git a/sources/System/Renderer/RenderScreenSystem.hpp b/sources/System/Renderer/RenderSystem.hpp similarity index 69% rename from sources/System/Renderer/RenderScreenSystem.hpp rename to sources/System/Renderer/RenderSystem.hpp index e9b2ea85..5524f614 100644 --- a/sources/System/Renderer/RenderScreenSystem.hpp +++ b/sources/System/Renderer/RenderSystem.hpp @@ -7,11 +7,15 @@ #include "System/System.hpp" #include "Camera/Camera2D.hpp" #include "Window.hpp" +#include "Wal.hpp" namespace BBM { - class RenderScreenSystem : public WAL::System + class RenderSystem : public WAL::System { + //! @brief The ECS to update. + WAL::Wal &_wal; + //! @brief The window to render on RAY::Window &_window; @@ -26,12 +30,12 @@ namespace BBM void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) override; //! @brief ctor - explicit RenderScreenSystem(RAY::Window &window); + RenderSystem(WAL::Wal &wal, RAY::Window &window); //! @brief Default copy ctor - RenderScreenSystem(const RenderScreenSystem &) = default; + RenderSystem(const RenderSystem &) = default; //! @brief Default dtor - ~RenderScreenSystem() override = default; + ~RenderSystem() override = default; //! @brief A render screen system can't be assigned. - RenderScreenSystem &operator=(const RenderScreenSystem &) = delete; + RenderSystem &operator=(const RenderSystem &) = delete; }; } diff --git a/sources/System/Renderer/Renderer2DSystem.hpp b/sources/System/Renderer/Renderer2DSystem.hpp deleted file mode 100644 index a1622c0d..00000000 --- a/sources/System/Renderer/Renderer2DSystem.hpp +++ /dev/null @@ -1,48 +0,0 @@ -// -// Created by cbihan on 24/05/2021. -// - -#pragma once - -#include -#include "System/System.hpp" -#include "Entity/Entity.hpp" -#include "Component/Position/PositionComponent.hpp" -#include "Component/Renderer/Drawable2DComponent.hpp" -#include "Window.hpp" - -namespace BBM -{ - template - class Renderer2DSystem : public WAL::System - { - private: - //! @brief The class to render - RAY::Window &_window; - public: - explicit Renderer2DSystem() - : WAL::System({typeid(PositionComponent), typeid(Drawable2DComponent)}), - _window(RAY::Window::getInstance()) - { - } - - //! @brief Update the corresponding component of the given entity - //! @param entity The entity to update. - //! @param dtime The delta time. - void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) override - { - auto &comp = entity.getComponent>(); - auto &pos = entity.getComponent(); - - comp.member.setPosition({pos.getX(), pos.getY()}); - comp.member.drawOn(this->_window); - } - - //! @brief default copy ctor - Renderer2DSystem(const Renderer2DSystem &) = default; - //! @brief default dtor - ~Renderer2DSystem() override = default; - //! @brief Default assignment operator - Renderer2DSystem &operator=(const Renderer2DSystem &) = delete; - }; -} \ No newline at end of file diff --git a/sources/System/Renderer/Renderer3DSystem.hpp b/sources/System/Renderer/Renderer3DSystem.hpp deleted file mode 100644 index 8dba98f6..00000000 --- a/sources/System/Renderer/Renderer3DSystem.hpp +++ /dev/null @@ -1,48 +0,0 @@ -// -// Created by cbihan on 24/05/2021. -// - -#pragma once - -#include -#include "System/System.hpp" -#include "Entity/Entity.hpp" -#include "Component/Position/PositionComponent.hpp" -#include "Component/Renderer/Drawable3DComponent.hpp" -#include "Window.hpp" - -namespace BBM -{ - template - class Renderer3DSystem : public WAL::System - { - private: - //! @brief The class to render - RAY::Window &_window; - public: - //! @brief ctor - explicit Renderer3DSystem() - : WAL::System({typeid(PositionComponent), typeid(Drawable3DComponent)}), - _window(RAY::Window::getInstance()) - {} - - //! @brief Update the corresponding component of the given entity - //! @param entity The entity to update. - //! @param dtime The delta time. - void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) override - { - auto &comp = entity.getComponent>(); - auto &pos = entity.getComponent(); - - comp.member.setPosition(static_cast(pos.position)); - comp.member.drawOn(this->_window); - } - - //! @brief Default copy ctor - Renderer3DSystem(const Renderer3DSystem &) = default; - //! @brief Default dtor - ~Renderer3DSystem() override = default; - //! @brief Default assignment operator - Renderer3DSystem &operator=(const Renderer3DSystem &) = delete; - }; -} \ No newline at end of file diff --git a/sources/main.cpp b/sources/main.cpp index 43dccd7d..bd13441a 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -9,45 +9,6 @@ #include #include "Runner/Runner.hpp" -// Dependencies of the demo -#include "Camera/Camera3D.hpp" -#include "Controllers/Keyboard.hpp" -#include "Drawables/2D/Text.hpp" -#include "Drawables/Image.hpp" -#include "Drawables/3D/Grid.hpp" -#include "Drawables/Texture.hpp" -#include "Drawables/3D/Circle.hpp" -#include "Drawables/2D/Circle.hpp" -#include "Drawables/3D/Cube.hpp" -#include "Drawables/3D/Sphere.hpp" -#include "Model/Model.hpp" -#include "Model/ModelAnimations.hpp" -#include "System/Renderer/Renderer3DSystem.hpp" -#include "System/Renderer/Renderer2DSystem.hpp" -#include "Component/Renderer/Drawable3DComponent.hpp" -#include "Component/Renderer/Drawable2DComponent.hpp" -#include "System/Renderer/RenderScreenSystem.hpp" -#include "Vector/Vector3.hpp" -#include "Window.hpp" -#include "TraceLog.hpp" -#include "Wal.hpp" - -const std::vectortextures = { - "blue", "cyan", "green", "purple", "red", "yellow" -}; - -std::string get_full_path(const std::string &color) -{ - std::string path = "assets/player/"; - - path += color; - path += ".png"; - return path; -} - - - - void usage(const std::string &bin) { std::cout << "Bomberman." << std::endl @@ -62,6 +23,5 @@ int main(int argc, char **argv) usage(argv[0]); return 1; } -// return demo(); return BBM::run(); } From 88e086b2728d4eccff1af5e232cfdcd05e080b58 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 2 Jun 2021 16:22:26 +0200 Subject: [PATCH 22/45] Finishing to rework the drawable system --- .../Renderer/Drawable2DComponent.hpp | 5 ++-- sources/Runner/Runner.cpp | 8 +++--- sources/System/Renderer/RenderSystem.cpp | 25 ++++++++++++++++--- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/sources/Component/Renderer/Drawable2DComponent.hpp b/sources/Component/Renderer/Drawable2DComponent.hpp index 0fc75f26..4bab9434 100644 --- a/sources/Component/Renderer/Drawable2DComponent.hpp +++ b/sources/Component/Renderer/Drawable2DComponent.hpp @@ -4,6 +4,7 @@ #pragma once +#include #include "Component/Component.hpp" #include "Drawables/ADrawable3D.hpp" #include "Model/Model.hpp" @@ -24,9 +25,9 @@ namespace BBM //! ctor template - explicit Drawable2DComponent(WAL::Entity &entity, Params &&...params) + explicit Drawable2DComponent(WAL::Entity &entity, WAL::TypeHolder, Params &&...params) : WAL::Component(entity), - drawable(std::move(T(std::forward(params)...))) + drawable(new T(std::forward(params)...)) {} //! @brief Clone a component for another or the same entity. diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index d45a9273..1341bc45 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -41,12 +41,10 @@ namespace BBM std::shared_ptr loadGameScene() { -// Drawable2DComponent cmp = Drawable2DComponent(Vector2f(), Vector2f(), RED); - auto scene = std::make_shared(); -// scene->addEntity("cube") -// .addComponent() -// .addComponent(Vector2f(), Vector2f(10, 10), RED); + scene->addEntity("cube") + .addComponent() + .addComponent(Vector2f(), Vector2f(10, 10), RED); scene->addEntity("player") .addComponent() .addComponent("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png")); diff --git a/sources/System/Renderer/RenderSystem.cpp b/sources/System/Renderer/RenderSystem.cpp index 590a9262..99a94f0e 100644 --- a/sources/System/Renderer/RenderSystem.cpp +++ b/sources/System/Renderer/RenderSystem.cpp @@ -4,10 +4,14 @@ #undef INTERNAL #define INTERNAL public -#include +#include +#include "Models/Vector2.hpp" #include "RenderSystem.hpp" #include "Component/Renderer/CameraComponent.hpp" #include "Component/Position/PositionComponent.hpp" +#include "Component/Renderer/Drawable2DComponent.hpp" +#include "Drawables/ADrawable2D.hpp" +#include "Drawables/ADrawable3D.hpp" namespace BBM { @@ -26,7 +30,21 @@ namespace BBM this->_camera.update(); BeginDrawing(); ClearBackground(BLACK); + BeginMode3D(this->_camera); + for (auto &entity : this->_wal.scene->getEntities()) { + if (!entity.hasComponent() + || !entity.hasComponent()) + continue; + auto &drawable = entity.getComponent(); + auto &pos = entity.getComponent(); + + drawable.drawable->setPosition(pos.position); + drawable.drawable->drawOn(this->_window); + } + EndMode3D(); + + // TODO sort entities based on the Z axis for (auto &entity : this->_wal.scene->getEntities()) { if (!entity.hasComponent() || !entity.hasComponent()) @@ -34,10 +52,9 @@ namespace BBM auto &drawable = entity.getComponent(); auto &pos = entity.getComponent(); -// drawable.drawable->setPosition(static_cast(pos.position)); -// drawable.drawable->drawOn(this->_window); + drawable.drawable->setPosition(Vector2f(pos.position.x, pos.position.y)); + drawable.drawable->drawOn(this->_window); } - EndMode3D(); EndDrawing(); } From 37fb527d5bcf5cecf718f250ff17d3e90d15c32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 16:30:16 +0200 Subject: [PATCH 23/45] little fix --- sources/Component/Animation/AnimationsComponent.hpp | 1 - sources/System/Animation/AnimationsSystem.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sources/Component/Animation/AnimationsComponent.hpp b/sources/Component/Animation/AnimationsComponent.hpp index 62e2e13b..463f241f 100644 --- a/sources/Component/Animation/AnimationsComponent.hpp +++ b/sources/Component/Animation/AnimationsComponent.hpp @@ -60,5 +60,4 @@ namespace BBM //! @brief assignment operator AnimationsComponent &operator=(const AnimationsComponent &) = delete; }; - } diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp index 7e54adbd..fb9f79e0 100644 --- a/sources/System/Animation/AnimationsSystem.cpp +++ b/sources/System/Animation/AnimationsSystem.cpp @@ -27,6 +27,6 @@ namespace BBM if (anim.isDisabled()) return; model.member.setAnimation(anim.getCurrentModelAnim()); - anim.setCurrentAnimFrameCounter(anim.getCurrentAnimFrameCounter() + 1); + anim.incCurrentAnimFrameCounter(); } } \ No newline at end of file From f3d9effb838255e213d986daed69a87c94eb5a61 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Wed, 2 Jun 2021 16:47:05 +0200 Subject: [PATCH 24/45] fix double free for model animation unloading --- lib/Ray/sources/Utils/Cache.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Ray/sources/Utils/Cache.hpp b/lib/Ray/sources/Utils/Cache.hpp index f30fa3ff..a1eef87a 100644 --- a/lib/Ray/sources/Utils/Cache.hpp +++ b/lib/Ray/sources/Utils/Cache.hpp @@ -60,11 +60,13 @@ namespace RAY { {}; std::shared_ptr<::ModelAnimation> fetch(const std::string &path, int *counter) { + ::ModelAnimation *animations = this->_dataLoader(path.c_str(), counter); + unsigned int animCount = *counter; + if (this->_cache.find(path) == this->_cache.end()) this->_cache.emplace(path, std::shared_ptr<::ModelAnimation>( - this->_dataLoader(path.c_str(), counter), [this, counter](::ModelAnimation *p) { - this->_dataUnloader(p, *counter); - delete p; + animations, [this, animCount](::ModelAnimation *p) { + this->_dataUnloader(p, animCount); })); return _cache[path]; }; From 34cbe24c197e71e25fe1cd0e4eeaec689f27e026 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Wed, 2 Jun 2021 17:54:16 +0200 Subject: [PATCH 25/45] remove unwanted defines + upade encapsulation for window drawing function --- lib/Ray/sources/Window.cpp | 8 ++- lib/Ray/sources/Window.hpp | 9 ++-- .../System/Renderer/Render2DScreenSystem.cpp | 21 -------- .../System/Renderer/Render2DScreenSystem.hpp | 30 ------------ .../System/Renderer/RenderScreenSystem.cpp | 40 --------------- sources/System/Renderer/RenderSystem.cpp | 12 ++--- sources/System/Renderer/Renderer2DSystem.hpp | 49 ------------------- sources/System/Renderer/Renderer3DSystem.hpp | 48 ------------------ 8 files changed, 17 insertions(+), 200 deletions(-) delete mode 100644 sources/System/Renderer/Render2DScreenSystem.cpp delete mode 100644 sources/System/Renderer/Render2DScreenSystem.hpp delete mode 100644 sources/System/Renderer/RenderScreenSystem.cpp delete mode 100644 sources/System/Renderer/Renderer2DSystem.hpp delete mode 100644 sources/System/Renderer/Renderer3DSystem.hpp diff --git a/lib/Ray/sources/Window.cpp b/lib/Ray/sources/Window.cpp index 9deba6e0..c89c6363 100644 --- a/lib/Ray/sources/Window.cpp +++ b/lib/Ray/sources/Window.cpp @@ -107,10 +107,14 @@ void RAY::Window::clear(const RAY::Color &color) ClearBackground(color); } -void RAY::Window::draw() +void RAY::Window::beginDrawing() +{ + BeginDrawing(); +} + +void RAY::Window::endDrawing() { EndDrawing(); - BeginDrawing(); } void RAY::Window::useCamera(RAY::Camera::Camera2D &camera) diff --git a/lib/Ray/sources/Window.hpp b/lib/Ray/sources/Window.hpp index c16eae4b..a02c78f9 100644 --- a/lib/Ray/sources/Window.hpp +++ b/lib/Ray/sources/Window.hpp @@ -7,7 +7,7 @@ #ifndef WINDOW_HPP_ #define WINDOW_HPP_ -#define INTERNAL public + #include #include #include @@ -102,8 +102,10 @@ namespace RAY { NONE, }; - //! @brief Draw the content of the buffer on the screen. - void draw(); + //! @brief Setup canvas (framebuffer) to start drawing + void beginDrawing(); + //! @brief End canvas drawing and swap buffers (double buffering) + void endDrawing(); //! @brief Initialize 2D mode with custom camera (2D) void useCamera(Camera::Camera2D &camera); @@ -131,6 +133,7 @@ namespace RAY { //! @brief Draw a 3d mesh with material and transform void draw(const Mesh &mesh, const Material &material, const Matrix &transform); + //! @return true if the window's context has been correctly initialized bool isReady() const; diff --git a/sources/System/Renderer/Render2DScreenSystem.cpp b/sources/System/Renderer/Render2DScreenSystem.cpp deleted file mode 100644 index b21c35da..00000000 --- a/sources/System/Renderer/Render2DScreenSystem.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Created by Zoe Roux on 5/27/21. -// - -#include "Render2DScreenSystem.hpp" - -namespace BBM -{ - Render2DScreenSystem::Render2DScreenSystem(RAY::Window &window) - : WAL::System({}), - _window(window) - {} - - void Render2DScreenSystem::onSelfUpdate() - { - EndMode3D(); - printf("EndMode3D\n"); - DrawText("Try selecting the box with mouse!", 10, 10, 20, WHITE); - //this->_window.unuseCamera(); - } -} \ No newline at end of file diff --git a/sources/System/Renderer/Render2DScreenSystem.hpp b/sources/System/Renderer/Render2DScreenSystem.hpp deleted file mode 100644 index 4fa00ba1..00000000 --- a/sources/System/Renderer/Render2DScreenSystem.hpp +++ /dev/null @@ -1,30 +0,0 @@ -// -// Created by Zoe Roux on 5/27/21. -// - -#pragma once - -#include -#include - -namespace BBM -{ - class Render2DScreenSystem : public WAL::System - { - //! @brief The window to render on - RAY::Window &_window; - public: - //! @brief A method called after all entities that this system manage has been updated. - //! @note render on screen here - void onSelfUpdate() override; - - //! @brief ctor - explicit Render2DScreenSystem(RAY::Window &window); - //! @brief Default copy ctor - Render2DScreenSystem(const Render2DScreenSystem &) = default; - //! @brief Default dtor - ~Render2DScreenSystem() override = default; - //! @brief A render screen system can't be assigned. - Render2DScreenSystem &operator=(const Render2DScreenSystem &) = delete; - }; -} \ No newline at end of file diff --git a/sources/System/Renderer/RenderScreenSystem.cpp b/sources/System/Renderer/RenderScreenSystem.cpp deleted file mode 100644 index 1550bd65..00000000 --- a/sources/System/Renderer/RenderScreenSystem.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// -// Created by Zoe Roux on 5/27/21. -// - -#include "RenderScreenSystem.hpp" -#include "Component/Renderer/CameraComponent.hpp" -#include "Component/Position/PositionComponent.hpp" - -namespace BBM -{ - RenderScreenSystem::RenderScreenSystem(RAY::Window &window) - : WAL::System({ - typeid(CameraComponent), - typeid(PositionComponent) - }), - _window(window), - _camera(Vector3f(), Vector3f(), Vector3f(0, 1, 0), 50, CAMERA_PERSPECTIVE) - { - this->_camera.setMode(CAMERA_FREE); - } - - void RenderScreenSystem::onSelfUpdate() - { - //this->_window.draw(); - //EndMode2D(); - EndDrawing(); - this->_camera.update(); - BeginDrawing(); - this->_window.clear(); - BeginMode3D(this->_camera); - printf("BeginMode3D\n"); - } - - void RenderScreenSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) - { - const auto &pos = entity.getComponent(); - _camera.setPosition(pos.position); - //this->_camera.update(); - } -} \ No newline at end of file diff --git a/sources/System/Renderer/RenderSystem.cpp b/sources/System/Renderer/RenderSystem.cpp index 99a94f0e..5073ee30 100644 --- a/sources/System/Renderer/RenderSystem.cpp +++ b/sources/System/Renderer/RenderSystem.cpp @@ -2,8 +2,6 @@ // Created by Zoe Roux on 5/27/21. // -#undef INTERNAL -#define INTERNAL public #include #include "Models/Vector2.hpp" #include "RenderSystem.hpp" @@ -28,10 +26,10 @@ namespace BBM void RenderSystem::onSelfUpdate() { this->_camera.update(); - BeginDrawing(); - ClearBackground(BLACK); + this->_window.beginDrawing(); + this->_window.clear(); - BeginMode3D(this->_camera); + this->_window.useCamera(this->_camera); for (auto &entity : this->_wal.scene->getEntities()) { if (!entity.hasComponent() || !entity.hasComponent()) @@ -42,7 +40,7 @@ namespace BBM drawable.drawable->setPosition(pos.position); drawable.drawable->drawOn(this->_window); } - EndMode3D(); + this->_window.unuseCamera(); // TODO sort entities based on the Z axis for (auto &entity : this->_wal.scene->getEntities()) { @@ -55,7 +53,7 @@ namespace BBM drawable.drawable->setPosition(Vector2f(pos.position.x, pos.position.y)); drawable.drawable->drawOn(this->_window); } - EndDrawing(); + this->_window.endDrawing(); } void RenderSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) diff --git a/sources/System/Renderer/Renderer2DSystem.hpp b/sources/System/Renderer/Renderer2DSystem.hpp deleted file mode 100644 index 3fd55346..00000000 --- a/sources/System/Renderer/Renderer2DSystem.hpp +++ /dev/null @@ -1,49 +0,0 @@ -// -// Created by cbihan on 24/05/2021. -// - -#pragma once - -#include -#include "System/System.hpp" -#include "Entity/Entity.hpp" -#include "Component/Position/PositionComponent.hpp" -#include "Component/Renderer/Drawable2DComponent.hpp" -#include "Window.hpp" - -namespace BBM -{ - template - class Renderer2DSystem : public WAL::System - { - private: - //! @brief The class to render - RAY::Window &_window; - public: - explicit Renderer2DSystem() - : WAL::System({typeid(PositionComponent), typeid(Drawable2DComponent)}), - _window(RAY::Window::getInstance()) - { - } - - //! @brief Update the corresponding component of the given entity - //! @param entity The entity to update. - //! @param dtime The delta time. - void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) override - { - auto &comp = entity.getComponent>(); - auto &pos = entity.getComponent(); - - comp.member.setPosition({pos.getX(), pos.getY()}); - this->_window.draw(comp.member); - printf("Drawing smth\n"); - } - - //! @brief default copy ctor - Renderer2DSystem(const Renderer2DSystem &) = default; - //! @brief default dtor - ~Renderer2DSystem() override = default; - //! @brief Default assignment operator - Renderer2DSystem &operator=(const Renderer2DSystem &) = delete; - }; -} \ No newline at end of file diff --git a/sources/System/Renderer/Renderer3DSystem.hpp b/sources/System/Renderer/Renderer3DSystem.hpp deleted file mode 100644 index 0fa3a9bb..00000000 --- a/sources/System/Renderer/Renderer3DSystem.hpp +++ /dev/null @@ -1,48 +0,0 @@ -// -// Created by cbihan on 24/05/2021. -// - -#pragma once - -#include -#include "System/System.hpp" -#include "Entity/Entity.hpp" -#include "Component/Position/PositionComponent.hpp" -#include "Component/Renderer/Drawable3DComponent.hpp" -#include "Window.hpp" - -namespace BBM -{ - template - class Renderer3DSystem : public WAL::System - { - private: - //! @brief The class to render - RAY::Window &_window; - public: - //! @brief ctor - explicit Renderer3DSystem() - : WAL::System({typeid(PositionComponent), typeid(Drawable3DComponent)}), - _window(RAY::Window::getInstance()) - {} - - //! @brief Update the corresponding component of the given entity - //! @param entity The entity to update. - //! @param dtime The delta time. - void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) override - { - auto &comp = entity.getComponent>(); - auto &pos = entity.getComponent(); - - comp.member.setPosition(static_cast(pos.position)); - this->_window.draw(comp.member); - } - - //! @brief Default copy ctor - Renderer3DSystem(const Renderer3DSystem &) = default; - //! @brief Default dtor - ~Renderer3DSystem() override = default; - //! @brief Default assignment operator - Renderer3DSystem &operator=(const Renderer3DSystem &) = delete; - }; -} \ No newline at end of file From 3790b2a8cdd03d99f41f55a408e09fe174c4a2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 18:14:44 +0200 Subject: [PATCH 26/45] first pr fixes from reviews --- CMakeLists.txt | 4 +++- lib/Ray/sources/Model/ModelAnimations.cpp | 2 +- lib/Ray/sources/Utils/Cache.hpp | 14 ++++++++------ .../Component/Animation/AnimationsComponent.cpp | 4 ++-- sources/Runner/Runner.cpp | 10 +++++----- sources/System/Animation/AnimationsSystem.cpp | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99872204..589b5630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,9 @@ add_executable(unit_tests EXCLUDE_FROM_ALL tests/MainTest.cpp tests/EngineTests.cpp tests/CallbackTest.cpp - tests/MoveTests.cpp) + tests/MoveTests.cpp + tests/CollisionTest.cpp + ) target_include_directories(unit_tests PUBLIC sources) target_link_libraries(unit_tests PUBLIC wal ray) diff --git a/lib/Ray/sources/Model/ModelAnimations.cpp b/lib/Ray/sources/Model/ModelAnimations.cpp index 5d5d297f..b70abf56 100644 --- a/lib/Ray/sources/Model/ModelAnimations.cpp +++ b/lib/Ray/sources/Model/ModelAnimations.cpp @@ -16,7 +16,7 @@ RAY::ModelAnimations::ModelAnimations(const std::string &filePath): ::ModelAnimation *ptr = this->_animationsPtr.get(); for (int i = 0; i < this->_animationCount; i++) - this->_animations.emplace_back(RAY::ModelAnimation(ptr[i])); + this->_animations.emplace_back(ptr[i]); } RAY::ModelAnimation &RAY::ModelAnimations::operator[](int index) diff --git a/lib/Ray/sources/Utils/Cache.hpp b/lib/Ray/sources/Utils/Cache.hpp index a1eef87a..7f041853 100644 --- a/lib/Ray/sources/Utils/Cache.hpp +++ b/lib/Ray/sources/Utils/Cache.hpp @@ -60,15 +60,17 @@ namespace RAY { {}; std::shared_ptr<::ModelAnimation> fetch(const std::string &path, int *counter) { + if (this->_cache.find(path) != this->_cache.end()) + return this->_cache[path]; + ::ModelAnimation *animations = this->_dataLoader(path.c_str(), counter); unsigned int animCount = *counter; - if (this->_cache.find(path) == this->_cache.end()) - this->_cache.emplace(path, std::shared_ptr<::ModelAnimation>( - animations, [this, animCount](::ModelAnimation *p) { - this->_dataUnloader(p, animCount); - })); - return _cache[path]; + this->_cache.emplace(path, std::shared_ptr<::ModelAnimation>( + animations, [this, animCount](::ModelAnimation *p) { + this->_dataUnloader(p, animCount); + })); + return this->_cache[path]; }; private: //! @brief function to call to load data diff --git a/sources/Component/Animation/AnimationsComponent.cpp b/sources/Component/Animation/AnimationsComponent.cpp index 72be399f..4461cc8e 100644 --- a/sources/Component/Animation/AnimationsComponent.cpp +++ b/sources/Component/Animation/AnimationsComponent.cpp @@ -20,8 +20,8 @@ namespace BBM WAL::Component *AnimationsComponent::clone(WAL::Entity &entity) const { return new AnimationsComponent(entity, - RAY::ModelAnimations(this->_modelAnimation.getFilePath()), - this->_currentAnimIndex); + RAY::ModelAnimations(this->_modelAnimation.getFilePath()), + this->_currentAnimIndex); } size_t AnimationsComponent::getCurrentAnimFrameCounter() const diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index 8b9f70e7..00218852 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -60,8 +60,8 @@ namespace BBM RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE); wal.addSystem>(); - wal.addSystem(); wal.addSystem>(); + wal.addSystem(); wal.addSystem(window) .addSystem>(); @@ -76,12 +76,12 @@ namespace BBM .addComponent>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png")) .addComponent() .addComponent() - .addComponent(RAY::ModelAnimations("assets/player/player.iqm"), 3) + .addComponent(RAY::ModelAnimations("assets/player/player.iqm"), 1) .addComponent(2) .addComponent(); scene->addEntity("cube") - .addComponent(-5, 0, -5) - .addComponent>(Vector3f(-5, 0, -5), Vector3f(3, 3, 3), RED) + .addComponent(5, 0, 5) + .addComponent>(Vector3f(5, 0, 5), Vector3f(3, 3, 3), RED) .addComponent() .addComponent() .addComponent([](WAL::Entity &, const WAL::Entity &){}, @@ -96,7 +96,7 @@ namespace BBM .addComponent(8, 20, 7) .addComponent(Vector3f(8, 0, 8)); std::srand(std::time(NULL)); - MapGenerator::loadMap(16, 16, MapGenerator::createMap(16, 16), scene); + //MapGenerator::loadMap(16, 16, MapGenerator::createMap(16, 16), scene); return scene; } diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp index fb9f79e0..3400cf10 100644 --- a/sources/System/Animation/AnimationsSystem.cpp +++ b/sources/System/Animation/AnimationsSystem.cpp @@ -13,7 +13,7 @@ namespace BBM AnimationsSystem::AnimationsSystem() : WAL::System({ - typeid(Drawable3DComponent), + typeid(Drawable3DComponent), typeid(AnimationsComponent) }) { From 883022d255c2673323273f654a6d38b9f4d7f16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 18:17:32 +0200 Subject: [PATCH 27/45] reenable map drawing --- sources/Runner/Runner.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp index 00218852..8b1f36fd 100644 --- a/sources/Runner/Runner.cpp +++ b/sources/Runner/Runner.cpp @@ -80,8 +80,8 @@ namespace BBM .addComponent(2) .addComponent(); scene->addEntity("cube") - .addComponent(5, 0, 5) - .addComponent>(Vector3f(5, 0, 5), Vector3f(3, 3, 3), RED) + .addComponent(-5, 0, -5) + .addComponent>(Vector3f(-5, 0, -5), Vector3f(3, 3, 3), RED) .addComponent() .addComponent() .addComponent([](WAL::Entity &, const WAL::Entity &){}, @@ -96,7 +96,7 @@ namespace BBM .addComponent(8, 20, 7) .addComponent(Vector3f(8, 0, 8)); std::srand(std::time(NULL)); - //MapGenerator::loadMap(16, 16, MapGenerator::createMap(16, 16), scene); + MapGenerator::loadMap(16, 16, MapGenerator::createMap(16, 16), scene); return scene; } From 4ea98204a22a3524d870407b8ff690fddd6b6241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 18:32:58 +0200 Subject: [PATCH 28/45] indents fixes --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 589b5630..fd2543bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,8 @@ set(SOURCES sources/System/Renderer/Render2DScreenSystem.hpp sources/Component/Animation/AnimationsComponent.cpp sources/Component/Animation/AnimationsComponent.hpp - sources/System/Animation/AnimationsSystem.cpp - sources/System/Animation/AnimationsSystem.hpp + sources/System/Animation/AnimationsSystem.cpp + sources/System/Animation/AnimationsSystem.hpp sources/Component/Collision/CollisionComponent.cpp sources/Component/Collision/CollisionComponent.hpp sources/System/Collision/CollisionSystem.hpp @@ -81,7 +81,7 @@ add_executable(unit_tests EXCLUDE_FROM_ALL tests/EngineTests.cpp tests/CallbackTest.cpp tests/MoveTests.cpp - tests/CollisionTest.cpp + tests/CollisionTest.cpp ) target_include_directories(unit_tests PUBLIC sources) target_link_libraries(unit_tests PUBLIC wal ray) From 066e77c47b9469206b265bf0d29be68881a96051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 18:42:21 +0200 Subject: [PATCH 29/45] hope you're HaPpY --- lib/Ray/sources/Model/ModelAnimations.cpp | 9 +++++++++ lib/Ray/sources/Model/ModelAnimations.hpp | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/Ray/sources/Model/ModelAnimations.cpp b/lib/Ray/sources/Model/ModelAnimations.cpp index b70abf56..1b5f9cc4 100644 --- a/lib/Ray/sources/Model/ModelAnimations.cpp +++ b/lib/Ray/sources/Model/ModelAnimations.cpp @@ -39,3 +39,12 @@ const RAY::ModelAnimation &RAY::ModelAnimations::at(int index) const return this->_animations.at(index); } +const RAY::ModelAnimation &RAY::ModelAnimations::operator[](int index) const +{ + return this->_animations[index]; +} + +RAY::ModelAnimation &RAY::ModelAnimations::at(int index) +{ + return this->_animations.at(index); +} diff --git a/lib/Ray/sources/Model/ModelAnimations.hpp b/lib/Ray/sources/Model/ModelAnimations.hpp index 9188955a..83978b82 100644 --- a/lib/Ray/sources/Model/ModelAnimations.hpp +++ b/lib/Ray/sources/Model/ModelAnimations.hpp @@ -36,9 +36,15 @@ namespace RAY { //! @brief Castin Object to raw model animation pointer ModelAnimation &operator[](int index); - //! @brief Same usage as the operator[] but const + //! @brief std [] const + const ModelAnimation &operator[](int index) const; + + //! @brief std at const const ModelAnimation &at(int index) const; + //! @brief std at + ModelAnimation &at(int index); + //! @return the number of loaded animations size_t getAnimationsCount() const; From d29b0dc4edcfafbc62cecaa56e7e3688585cec9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 2 Jun 2021 18:44:31 +0200 Subject: [PATCH 30/45] pain --- lib/Ray/sources/Model/ModelAnimations.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Ray/sources/Model/ModelAnimations.cpp b/lib/Ray/sources/Model/ModelAnimations.cpp index 1b5f9cc4..6d41832d 100644 --- a/lib/Ray/sources/Model/ModelAnimations.cpp +++ b/lib/Ray/sources/Model/ModelAnimations.cpp @@ -21,7 +21,7 @@ RAY::ModelAnimations::ModelAnimations(const std::string &filePath): RAY::ModelAnimation &RAY::ModelAnimations::operator[](int index) { - return this->_animations.at(index); + return this->_animations[index]; } size_t RAY::ModelAnimations::getAnimationsCount() const From 72d66bc9702ba2d0a932df4c5dbee33b3dfdc626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Thu, 3 Jun 2021 09:13:58 +0200 Subject: [PATCH 31/45] setting copy ctor of ModelAnimations.hpp to default --- lib/Ray/sources/Model/ModelAnimations.hpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/Ray/sources/Model/ModelAnimations.hpp b/lib/Ray/sources/Model/ModelAnimations.hpp index 83978b82..2b99e1d7 100644 --- a/lib/Ray/sources/Model/ModelAnimations.hpp +++ b/lib/Ray/sources/Model/ModelAnimations.hpp @@ -21,17 +21,14 @@ namespace RAY { //! @param filePath Path to the file containing animations ModelAnimations(const std::string &filePath); - //! @brief Only single entity can hold these animations pointers - ModelAnimations(const ModelAnimations &) = delete; + //! @brief default copy ctor + ModelAnimations(const ModelAnimations &) = default; //! @brief Default constructor ~ModelAnimations() = default; - //! @brief Default move ctor - ModelAnimations(ModelAnimations &&) = default; - - //! @brief Only single entity can hold these animations pointers - ModelAnimations &operator=(const ModelAnimations &) = delete; + //! @brief Default assignment operator + ModelAnimations &operator=(const ModelAnimations &) = default; //! @brief Castin Object to raw model animation pointer ModelAnimation &operator[](int index); From edd92efdbe2f45dc6d0f97243ced001a39b6c8bb Mon Sep 17 00:00:00 2001 From: Arthi-chaud <60505370+Arthi-chaud@users.noreply.github.com> Date: Thu, 3 Jun 2021 10:59:31 +0200 Subject: [PATCH 32/45] Update readme's build instruction --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 18e93e7a..0d19b943 100644 --- a/README.md +++ b/README.md @@ -40,12 +40,13 @@ mkdir build cd build cmake .. cmake --build . +cd - ``` Enjoy ! ```bash -./bomberman +./build/bomberman ``` From 0e00a599f616a2061fd520d0c3f3aa67403511db Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 11:19:22 +0200 Subject: [PATCH 33/45] use custom html --- CMakeLists.txt | 3 +- sources/wasm/frontend.html | 147 +++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 sources/wasm/frontend.html diff --git a/CMakeLists.txt b/CMakeLists.txt index 78906406..9fc51470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,8 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) if (EMSCRIPTEN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY -s NO_DISABLE_EXCEPTION_CATCHING --preload-file ../assets") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets") set(CMAKE_EXECUTABLE_SUFFIX ".html") endif () diff --git a/sources/wasm/frontend.html b/sources/wasm/frontend.html new file mode 100644 index 00000000..2816e377 --- /dev/null +++ b/sources/wasm/frontend.html @@ -0,0 +1,147 @@ + + + + + + Emscripten-Generated Code + + + +
+
emscripten
+
Downloading...
+
+ +
+
+ +
+
+
+ Resize canvas + Lock/hide mouse pointer +     + +
+ +
+ + {{{ SCRIPT }}} + + \ No newline at end of file From 56f1b321c0568ec28b61ee3218b4d942166f6bd1 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 11:46:56 +0200 Subject: [PATCH 34/45] better workflow for wasm compilation --- .github/workflows/build_web.yml | 6 ++---- .gitignore | 4 ++-- CMakeLists.txt | 2 +- sources/wasm/frontend.html | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml index 9c84b83b..c2604c47 100644 --- a/.github/workflows/build_web.yml +++ b/.github/workflows/build_web.yml @@ -1,12 +1,10 @@ name: Web Build (Emscripten) -on: - push: - branches: - wasm +on: [push, pull_request] jobs: Push: runs-on: ubuntu-latest + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository steps: - uses: actions/checkout@v1 with: diff --git a/.gitignore b/.gitignore index 74044c49..407c1f67 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ cmake-build-debug .vscode build/* docs/* -emsdk/* -build_web/* \ No newline at end of file +emsdk*/ +build_web/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fc51470..fa75fb54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) if (EMSCRIPTEN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --preload-file ../assets") set(CMAKE_EXECUTABLE_SUFFIX ".html") endif () diff --git a/sources/wasm/frontend.html b/sources/wasm/frontend.html index 2816e377..b6f04e36 100644 --- a/sources/wasm/frontend.html +++ b/sources/wasm/frontend.html @@ -1,5 +1,5 @@ - + From c1be763a9b7d52d27631ee980d7a51dc94cd2fd8 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 12:01:39 +0200 Subject: [PATCH 35/45] Revert "better workflow for wasm compilation" This reverts commit 56f1b321c0568ec28b61ee3218b4d942166f6bd1. --- .github/workflows/build_web.yml | 6 ++++-- .gitignore | 4 ++-- CMakeLists.txt | 2 +- sources/wasm/frontend.html | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml index c2604c47..9c84b83b 100644 --- a/.github/workflows/build_web.yml +++ b/.github/workflows/build_web.yml @@ -1,10 +1,12 @@ name: Web Build (Emscripten) -on: [push, pull_request] +on: + push: + branches: + wasm jobs: Push: runs-on: ubuntu-latest - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository steps: - uses: actions/checkout@v1 with: diff --git a/.gitignore b/.gitignore index 407c1f67..74044c49 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ cmake-build-debug .vscode build/* docs/* -emsdk*/ -build_web/ \ No newline at end of file +emsdk/* +build_web/* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 16771554..71343bba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) if (EMSCRIPTEN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --preload-file ../assets") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets") set(CMAKE_EXECUTABLE_SUFFIX ".html") endif () diff --git a/sources/wasm/frontend.html b/sources/wasm/frontend.html index b6f04e36..2816e377 100644 --- a/sources/wasm/frontend.html +++ b/sources/wasm/frontend.html @@ -1,5 +1,5 @@ - + From c40dc583309407fbf8263005c8fe05e6a69e2b53 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 12:02:49 +0200 Subject: [PATCH 36/45] Revert "use custom html" This reverts commit 0e00a599f616a2061fd520d0c3f3aa67403511db. --- CMakeLists.txt | 3 +- sources/wasm/frontend.html | 147 ------------------------------------- 2 files changed, 1 insertion(+), 149 deletions(-) delete mode 100644 sources/wasm/frontend.html diff --git a/CMakeLists.txt b/CMakeLists.txt index 71343bba..156d2a31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) if (EMSCRIPTEN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY -s NO_DISABLE_EXCEPTION_CATCHING --preload-file ../assets") set(CMAKE_EXECUTABLE_SUFFIX ".html") endif () diff --git a/sources/wasm/frontend.html b/sources/wasm/frontend.html deleted file mode 100644 index 2816e377..00000000 --- a/sources/wasm/frontend.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - Emscripten-Generated Code - - - -
-
emscripten
-
Downloading...
-
- -
-
- -
-
-
- Resize canvas - Lock/hide mouse pointer -     - -
- -
- - {{{ SCRIPT }}} - - \ No newline at end of file From a0ffafbd6da717706bdfd767054f57397f40713c Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 12:03:06 +0200 Subject: [PATCH 37/45] Revert "Revert "use custom html"" This reverts commit c40dc583309407fbf8263005c8fe05e6a69e2b53. --- CMakeLists.txt | 3 +- sources/wasm/frontend.html | 147 +++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 sources/wasm/frontend.html diff --git a/CMakeLists.txt b/CMakeLists.txt index 156d2a31..71343bba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,8 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) if (EMSCRIPTEN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY -s NO_DISABLE_EXCEPTION_CATCHING --preload-file ../assets") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NO_DISABLE_EXCEPTION_CATCHING --shell-file ../sources/wasm/frontend.html --preload-file ../assets") set(CMAKE_EXECUTABLE_SUFFIX ".html") endif () diff --git a/sources/wasm/frontend.html b/sources/wasm/frontend.html new file mode 100644 index 00000000..2816e377 --- /dev/null +++ b/sources/wasm/frontend.html @@ -0,0 +1,147 @@ + + + + + + Emscripten-Generated Code + + + +
+
emscripten
+
Downloading...
+
+ +
+
+ +
+
+
+ Resize canvas + Lock/hide mouse pointer +     + +
+ +
+ + {{{ SCRIPT }}} + + \ No newline at end of file From 63d6d8479b0888298d188f6e7e32bd5078b5adaf Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 12:33:57 +0200 Subject: [PATCH 38/45] fix merge --- .gitignore | 2 +- sources/System/Animation/AnimationsSystem.cpp | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 74044c49..7c2238fc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ cmake-build-debug .vscode build/* docs/* -emsdk/* +emsdk/ build_web/* \ No newline at end of file diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp index 3400cf10..cce35719 100644 --- a/sources/System/Animation/AnimationsSystem.cpp +++ b/sources/System/Animation/AnimationsSystem.cpp @@ -13,7 +13,7 @@ namespace BBM AnimationsSystem::AnimationsSystem() : WAL::System({ - typeid(Drawable3DComponent), + typeid(Drawable3DComponent), typeid(AnimationsComponent) }) { @@ -21,12 +21,15 @@ namespace BBM void AnimationsSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) { - auto &model = entity.getComponent>(); + auto &model = entity.getComponent(); auto &anim = entity.getComponent(); if (anim.isDisabled()) return; - model.member.setAnimation(anim.getCurrentModelAnim()); - anim.incCurrentAnimFrameCounter(); + auto modelPtr = std::dynamic_pointer_cast(model.drawable); + if (modelPtr) { + modelPtr->setAnimation(anim.getCurrentModelAnim()); + anim.incCurrentAnimFrameCounter(); + } } } \ No newline at end of file From dd62fc806c707cfaa859af0ea9e2400196115897 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 14:08:32 +0200 Subject: [PATCH 39/45] remove python server script --- wasm-server.py | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 wasm-server.py diff --git a/wasm-server.py b/wasm-server.py deleted file mode 100644 index 77aad1db..00000000 --- a/wasm-server.py +++ /dev/null @@ -1,24 +0,0 @@ -# Python 3 - -import sys -import socketserver -from http.server import SimpleHTTPRequestHandler - -class WasmHandler(SimpleHTTPRequestHandler): - def end_headers(self): - # Include additional response headers here. CORS for example: - #self.send_header('Access-Control-Allow-Origin', '*') - SimpleHTTPRequestHandler.end_headers(self) - - -# Python 3.7.5 adds in the WebAssembly Media Type. If this is an older -# version, add in the Media Type. -if sys.version_info < (3, 7, 5): - WasmHandler.extensions_map['.wasm'] = 'application/wasm' - - -if __name__ == '__main__': - PORT = 8080 - with socketserver.TCPServer(("", PORT), WasmHandler) as httpd: - print("Listening on port {}. Press Ctrl+C to stop.".format(PORT)) - httpd.serve_forever() From ba315e4010f170142481318f5ab6eb6ef78c66bb Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 15:00:42 +0200 Subject: [PATCH 40/45] add removed target to camera --- sources/System/Renderer/RenderSystem.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/System/Renderer/RenderSystem.cpp b/sources/System/Renderer/RenderSystem.cpp index 5073ee30..03330498 100644 --- a/sources/System/Renderer/RenderSystem.cpp +++ b/sources/System/Renderer/RenderSystem.cpp @@ -59,6 +59,8 @@ namespace BBM void RenderSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) { const auto &pos = entity.getComponent(); + const auto &cam = entity.getComponent(); _camera.setPosition(pos.position); + _camera.setTarget(cam.target); } } \ No newline at end of file From d69198ca1bff7eb83cd9bfe964ee62f3329bc7db Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 15:01:59 +0200 Subject: [PATCH 41/45] remove unnecessary comment --- sources/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/sources/main.cpp b/sources/main.cpp index cfb244b4..bd13441a 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -23,6 +23,5 @@ int main(int argc, char **argv) usage(argv[0]); return 1; } - //return demo(); return BBM::run(); } From 0b2a151ba6f3a19887528830de24629a68aa40f4 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Thu, 3 Jun 2021 15:41:32 +0200 Subject: [PATCH 42/45] using tuples instead of bad, ugly vC void casts --- .gitignore | 3 ++- lib/wal/sources/Wal.hpp | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7c2238fc..f93eff30 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ cmake-build-debug build/* docs/* emsdk/ -build_web/* \ No newline at end of file +build_web/* +wasm-python.py \ No newline at end of file diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp index a2feacbe..3785081a 100644 --- a/lib/wal/sources/Wal.hpp +++ b/lib/wal/sources/Wal.hpp @@ -115,8 +115,8 @@ namespace WAL Callback update(callback); #if defined(PLATFORM_WEB) - void *paramPtr[3] = {(void *)this, (void *)&update, (void *)&state}; - return emscripten_set_main_loop_arg((em_arg_callback_func)runIteration, (void *)paramPtr, 0, 1); + std::tuple iterationParams(this, &update, &state); + return emscripten_set_main_loop_arg((em_arg_callback_func)runIteration, (void *)&iterationParams, 0, 1); #else return this->run(update, state); #endif @@ -151,10 +151,10 @@ namespace WAL template static void runIteration(void *param) { - static void **paramsPtr = (void **)param; - static Wal *wal = (Wal *)paramsPtr[0]; - static const Callback callback = *((Callback *)paramsPtr[1]); - static T *state = (T *)paramsPtr[2]; + static auto iterationParams = reinterpret_cast *, T *> *>(param); + static const Callback callback = *((Callback *)std::get<1>(*iterationParams)); + static T *state = (T *)std::get<2>(*iterationParams); + static Wal *wal = (Wal *)std::get<0>(*iterationParams); static auto lastTick = std::chrono::steady_clock::now(); static std::chrono::nanoseconds fBehind(0); From 7540dee3a2d9cc0db9eaf16dc16887072e2d0759 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 4 Jun 2021 09:30:22 +0200 Subject: [PATCH 43/45] web build: workflow triggered by all branches --- .github/workflows/build_web.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml index 9c84b83b..2b9a2f3e 100644 --- a/.github/workflows/build_web.yml +++ b/.github/workflows/build_web.yml @@ -1,11 +1,9 @@ name: Web Build (Emscripten) -on: - push: - branches: - wasm +on: [push, pull_request] jobs: - Push: + Build: + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From d4d876921966130126bf83a0bccac5b1d64bcd09 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 4 Jun 2021 09:30:36 +0200 Subject: [PATCH 44/45] Revert "Update readme's build instruction" This reverts commit edd92efdbe2f45dc6d0f97243ced001a39b6c8bb. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0d19b943..18e93e7a 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,12 @@ mkdir build cd build cmake .. cmake --build . -cd - ``` Enjoy ! ```bash -./build/bomberman +./bomberman ``` From 17c4a9deaa79f934a2a351daa320b39a6d7f2b75 Mon Sep 17 00:00:00 2001 From: "arthur.jamet" Date: Fri, 4 Jun 2021 09:31:48 +0200 Subject: [PATCH 45/45] revert unwanted revert --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 18e93e7a..6bfa9002 100644 --- a/README.md +++ b/README.md @@ -40,12 +40,13 @@ mkdir build cd build cmake .. cmake --build . +cd .. ``` Enjoy ! ```bash -./bomberman +./build/bomberman ```