From b7df77d6cc26cb9ee46891d7108f01734b3104dd Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sun, 22 Sep 2024 17:08:56 +0200 Subject: add miniaudio poc --- .gitmodules | 3 +++ lib/miniaudio/CMakeLists.txt | 10 ++++++++ lib/miniaudio/lib | 1 + lib/miniaudio/main.c | 2 ++ mwe/audio/bgm.ogg | Bin 0 -> 125020 bytes mwe/audio/miniaudio/CMakeLists.txt | 19 +++++++++++++++ mwe/audio/miniaudio/main.cpp | 46 +++++++++++++++++++++++++++++++++++++ mwe/audio/sfx1.wav | Bin 0 -> 44144 bytes mwe/audio/sfx2.wav | Bin 0 -> 44144 bytes mwe/audio/sfx3.wav | Bin 0 -> 44144 bytes 10 files changed, 81 insertions(+) create mode 100644 lib/miniaudio/CMakeLists.txt create mode 160000 lib/miniaudio/lib create mode 100644 lib/miniaudio/main.c create mode 100644 mwe/audio/bgm.ogg create mode 100644 mwe/audio/miniaudio/CMakeLists.txt create mode 100644 mwe/audio/miniaudio/main.cpp create mode 100644 mwe/audio/sfx1.wav create mode 100644 mwe/audio/sfx2.wav create mode 100644 mwe/audio/sfx3.wav diff --git a/.gitmodules b/.gitmodules index f8a9861..f93e48c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,3 +3,6 @@ url = https://github.com/google/googletest branch = v1.15.x shallow = true +[submodule "lib/miniaudio/lib"] + path = lib/miniaudio/lib + url = https://github.com/mackron/miniaudio diff --git a/lib/miniaudio/CMakeLists.txt b/lib/miniaudio/CMakeLists.txt new file mode 100644 index 0000000..65d416c --- /dev/null +++ b/lib/miniaudio/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.28) + +set(CMAKE_C_STANDARD 11) +set(CMAKE_CXX_STANDARD 20) + +project(miniaudio C CXX) + +add_library(miniaudio STATIC main.c) +target_include_directories(miniaudio SYSTEM INTERFACE lib) + diff --git a/lib/miniaudio/lib b/lib/miniaudio/lib new file mode 160000 index 0000000..4a5b74b --- /dev/null +++ b/lib/miniaudio/lib @@ -0,0 +1 @@ +Subproject commit 4a5b74bef029b3592c54b6048650ee5f972c1a48 diff --git a/lib/miniaudio/main.c b/lib/miniaudio/main.c new file mode 100644 index 0000000..8d898f7 --- /dev/null +++ b/lib/miniaudio/main.c @@ -0,0 +1,2 @@ +#define MINIAUDIO_IMPLEMENTATION +#include "lib/miniaudio.h" diff --git a/mwe/audio/bgm.ogg b/mwe/audio/bgm.ogg new file mode 100644 index 0000000..d6397fb Binary files /dev/null and b/mwe/audio/bgm.ogg differ diff --git a/mwe/audio/miniaudio/CMakeLists.txt b/mwe/audio/miniaudio/CMakeLists.txt new file mode 100644 index 0000000..6dd0191 --- /dev/null +++ b/mwe/audio/miniaudio/CMakeLists.txt @@ -0,0 +1,19 @@ +cmake_minimum_required(VERSION 3.28) + +set(CMAKE_C_STANDARD 11) +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_EXPORT_COMPILE_COMMANDS 1) +set(CMAKE_BUILD_TYPE Debug) + +add_subdirectory(../../../lib/miniaudio miniaudio) + +project(poc C CXX) + +add_executable(main + main.cpp +) + +target_link_libraries(main + miniaudio +) + diff --git a/mwe/audio/miniaudio/main.cpp b/mwe/audio/miniaudio/main.cpp new file mode 100644 index 0000000..bf31898 --- /dev/null +++ b/mwe/audio/miniaudio/main.cpp @@ -0,0 +1,46 @@ +#include + +#include +#include + +using namespace std; +using namespace std::chrono_literals; + +int main() { + ma_engine engine; + ma_engine_init(NULL, &engine); + + // 1. load background track (ogg vorbis) + ma_sound bgm; + ma_sound_init_from_file(&engine, "../bgm.ogg", 0, NULL, NULL, &bgm); + + // 2. load samples (wav) + ma_sound sfx[3]; + ma_sound_init_from_file(&engine, "../sfx1.wav", 0, NULL, NULL, &sfx[0]); + ma_sound_init_from_file(&engine, "../sfx2.wav", 0, NULL, NULL, &sfx[1]); + ma_sound_init_from_file(&engine, "../sfx3.wav", 0, NULL, NULL, &sfx[2]); + + // 3. start the background track + ma_sound_start(&bgm); + + // 4. play samples sequentially while controlling the background track + this_thread::sleep_for(500ms); + ma_sound_start(&sfx[0]); + this_thread::sleep_for(500ms); + ma_sound_start(&sfx[1]); + ma_sound_stop(&bgm); + this_thread::sleep_for(500ms); + ma_sound_start(&sfx[2]); + ma_sound_start(&bgm); // this actually resumes now + this_thread::sleep_for(500ms); + for (unsigned i = 0; i < 3; i++) + ma_sound_seek_to_pcm_frame(&sfx[i], 0); + + // 5. play all samples simultaniously + for (unsigned i = 0; i < 3; i++) + ma_sound_start(&sfx[i]); + this_thread::sleep_for(1000ms); + + ma_engine_uninit(&engine); + return 0; +} diff --git a/mwe/audio/sfx1.wav b/mwe/audio/sfx1.wav new file mode 100644 index 0000000..576377a Binary files /dev/null and b/mwe/audio/sfx1.wav differ diff --git a/mwe/audio/sfx2.wav b/mwe/audio/sfx2.wav new file mode 100644 index 0000000..908ec86 Binary files /dev/null and b/mwe/audio/sfx2.wav differ diff --git a/mwe/audio/sfx3.wav b/mwe/audio/sfx3.wav new file mode 100644 index 0000000..20b7c84 Binary files /dev/null and b/mwe/audio/sfx3.wav differ -- cgit v1.2.3 From 7d8af5f56f9359fff792470fbb55154268b36458 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 25 Oct 2024 21:21:27 +0200 Subject: `make format` --- mwe/events/include/customTypes.h | 55 +++++------ mwe/events/include/event.h | 12 +-- mwe/events/include/eventManager.h | 12 ++- mwe/events/src/event.cpp | 8 +- mwe/events/src/eventManager.cpp | 200 ++++++++++++++++++++++---------------- mwe/events/src/main.cpp | 48 +++++---- 6 files changed, 182 insertions(+), 153 deletions(-) diff --git a/mwe/events/include/customTypes.h b/mwe/events/include/customTypes.h index 7217f8a..a5d8dc9 100644 --- a/mwe/events/include/customTypes.h +++ b/mwe/events/include/customTypes.h @@ -1,39 +1,38 @@ #pragma once #include struct Vector2 { - float x; // X component of the vector - float y; // Y component of the vector + float x; // X component of the vector + float y; // Y component of the vector - // Vector subtraction - Vector2 operator-(const Vector2& other) const { - return {x - other.x, y - other.y}; - } + // Vector subtraction + Vector2 operator-(const Vector2 & other) const { + return {x - other.x, y - other.y}; + } - // Vector addition - Vector2 operator+(const Vector2& other) const { - return {x + other.x, y + other.y}; - } + // Vector addition + Vector2 operator+(const Vector2 & other) const { + return {x + other.x, y + other.y}; + } - // Scalar multiplication - Vector2 operator*(float scalar) const { - return {x * scalar, y * scalar}; - } + // Scalar multiplication + Vector2 operator*(float scalar) const { return {x * scalar, y * scalar}; } - // Normalize the vector - Vector2 normalize() const { - float length = std::sqrt(x * x + y * y); - if (length == 0) return {0, 0}; // Prevent division by zero - return {x / length, y / length}; - } + // Normalize the vector + Vector2 normalize() const { + float length = std::sqrt(x * x + y * y); + if (length == 0) return {0, 0}; // Prevent division by zero + return {x / length, y / length}; + } }; struct Collision { - int objectIdA; // ID of the first object - int objectIdB; // ID of the second object - Vector2 contactPoint; // Point of contact - Vector2 contactNormal; // Normal vector at the contact point - - // Constructor to initialize a Collision - Collision(int idA, int idB, const Vector2& point, const Vector2& normal, float depth) - : objectIdA(idA), objectIdB(idB), contactPoint(point), contactNormal(normal) {} + int objectIdA; // ID of the first object + int objectIdB; // ID of the second object + Vector2 contactPoint; // Point of contact + Vector2 contactNormal; // Normal vector at the contact point + // Constructor to initialize a Collision + Collision(int idA, int idB, const Vector2 & point, const Vector2 & normal, + float depth) + : objectIdA(idA), objectIdB(idB), contactPoint(point), + contactNormal(normal) {} }; diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h index 0208085..730ee4b 100644 --- a/mwe/events/include/event.h +++ b/mwe/events/include/event.h @@ -1,12 +1,11 @@ #pragma once +#include "customTypes.h" #include "keyCodes.h" #include #include #include #include #include -#include "keyCodes.h" -#include "customTypes.h" class UUIDGenerator { public: @@ -93,13 +92,12 @@ private: }; class CollisionEvent : public Event { public: - CollisionEvent(Collision); + CollisionEvent(Collision); - REGISTER_EVENT_TYPE(CollisionEvent) + REGISTER_EVENT_TYPE(CollisionEvent) - Collision getCollisionData() const; + Collision getCollisionData() const; private: - Collision collisionData; - + Collision collisionData; }; diff --git a/mwe/events/include/eventManager.h b/mwe/events/include/eventManager.h index 61e8c01..508a5e2 100644 --- a/mwe/events/include/eventManager.h +++ b/mwe/events/include/eventManager.h @@ -28,10 +28,14 @@ public: void dispatchEvents(); private: - EventManager() = default; - std::vector, int>> eventsQueue; - std::unordered_map>> subscribers; - std::unordered_map>>> subscribersByEventId; + EventManager() = default; + std::vector, int>> eventsQueue; + std::unordered_map>> + subscribers; + std::unordered_map< + int, std::unordered_map< + int, std::vector>>> + subscribersByEventId; }; template diff --git a/mwe/events/src/event.cpp b/mwe/events/src/event.cpp index 38ff62a..c9201d0 100644 --- a/mwe/events/src/event.cpp +++ b/mwe/events/src/event.cpp @@ -44,11 +44,9 @@ std::pair MousePressedEvent::getMousePosition() const { } //Collision event -CollisionEvent::CollisionEvent(Collision collision) : collisionData(collision), Event("CollisionEvent") { +CollisionEvent::CollisionEvent(Collision collision) + : collisionData(collision), Event("CollisionEvent") {} -} - -Collision CollisionEvent::getCollisionData() const -{ +Collision CollisionEvent::getCollisionData() const { return this->collisionData; } diff --git a/mwe/events/src/eventManager.cpp b/mwe/events/src/eventManager.cpp index c37dcb0..34a093d 100644 --- a/mwe/events/src/eventManager.cpp +++ b/mwe/events/src/eventManager.cpp @@ -1,98 +1,130 @@ #include "eventManager.h" -void EventManager::shutdown() -{ - subscribers.clear(); -} +void EventManager::shutdown() { subscribers.clear(); } -void EventManager::subscribe(int eventType, std::unique_ptr&& handler, int eventId) -{ - if (eventId) { - std::unordered_map>>>::iterator subscribers = subscribersByEventId.find(eventType); +void EventManager::subscribe(int eventType, + std::unique_ptr && handler, + int eventId) { + if (eventId) { + std::unordered_map< + int, std::unordered_map< + int, std::vector>>>:: + iterator subscribers + = subscribersByEventId.find(eventType); - if (subscribers != subscribersByEventId.end()) { - std::unordered_map>>& handlersMap = subscribers->second; - std::unordered_map>>::iterator handlers = handlersMap.find(eventId); - if (handlers != handlersMap.end()) { - handlers->second.emplace_back(std::move(handler)); - return; - } - } - subscribersByEventId[eventType][eventId].emplace_back(std::move(handler)); + if (subscribers != subscribersByEventId.end()) { + std::unordered_map< + int, std::vector>> & + handlersMap + = subscribers->second; + std::unordered_map< + int, + std::vector>>::iterator + handlers + = handlersMap.find(eventId); + if (handlers != handlersMap.end()) { + handlers->second.emplace_back(std::move(handler)); + return; + } + } + subscribersByEventId[eventType][eventId].emplace_back( + std::move(handler)); - } else { - auto& handlers = subscribers[eventType]; - handlers.emplace_back(std::move(handler)); - } + } else { + auto & handlers = subscribers[eventType]; + handlers.emplace_back(std::move(handler)); + } } -void EventManager::unsubscribe(int eventType, const std::string& handlerName, int eventId) -{ - if (eventId) { - std::unordered_map>>>::iterator subscriberList = subscribersByEventId.find(eventType); - if (subscriberList != subscribersByEventId.end()) { - std::unordered_map>>& handlersMap = subscriberList->second; - std::unordered_map>>::iterator handlers = handlersMap.find(eventId); - if (handlers != handlersMap.end()) { - std::vector>& callbacks = handlers->second; - for (std::vector>::iterator it = callbacks.begin(); it != callbacks.end(); ++it) { - if (it->get()->getType() == handlerName) { - it = callbacks.erase(it); - return; - } - } - } - } - } else { - std::unordered_map>>::iterator handlersIt = subscribers.find(eventType); - if (handlersIt != subscribers.end()) { - std::vector>& handlers = handlersIt->second; - for (std::vector>::iterator it = handlers.begin(); it != handlers.end(); ++it) { - if (it->get()->getType() == handlerName) { - it = handlers.erase(it); - return; - } - } - } - } +void EventManager::unsubscribe(int eventType, const std::string & handlerName, + int eventId) { + if (eventId) { + std::unordered_map< + int, std::unordered_map< + int, std::vector>>>:: + iterator subscriberList + = subscribersByEventId.find(eventType); + if (subscriberList != subscribersByEventId.end()) { + std::unordered_map< + int, std::vector>> & + handlersMap + = subscriberList->second; + std::unordered_map< + int, + std::vector>>::iterator + handlers + = handlersMap.find(eventId); + if (handlers != handlersMap.end()) { + std::vector> & callbacks + = handlers->second; + for (std::vector< + std::unique_ptr>::iterator it + = callbacks.begin(); + it != callbacks.end(); ++it) { + if (it->get()->getType() == handlerName) { + it = callbacks.erase(it); + return; + } + } + } + } + } else { + std::unordered_map< + int, std::vector>>::iterator + handlersIt + = subscribers.find(eventType); + if (handlersIt != subscribers.end()) { + std::vector> & handlers + = handlersIt->second; + for (std::vector>::iterator it + = handlers.begin(); + it != handlers.end(); ++it) { + if (it->get()->getType() == handlerName) { + it = handlers.erase(it); + return; + } + } + } + } } -void EventManager::triggerEvent(const Event& event_, int eventId) -{ - if (eventId > 0) { - auto handlersIt = subscribersByEventId[event_.getEventType()].find(eventId); - if (handlersIt != subscribersByEventId[event_.getEventType()].end()) { - std::vector>& callbacks = handlersIt->second; - for (auto it = callbacks.begin(); it != callbacks.end();) { - (*it)->exec(event_); - if ((*it)->isDestroyOnSuccess()) { - it = callbacks.erase(it); - } else { - ++it; - } - } - } - } else { - auto& handlers = subscribers[event_.getEventType()]; - for (std::unique_ptr& handler : handlers) { - handler->exec(event_); - } - } +void EventManager::triggerEvent(const Event & event_, int eventId) { + if (eventId > 0) { + auto handlersIt + = subscribersByEventId[event_.getEventType()].find(eventId); + if (handlersIt != subscribersByEventId[event_.getEventType()].end()) { + std::vector> & callbacks + = handlersIt->second; + for (auto it = callbacks.begin(); it != callbacks.end();) { + (*it)->exec(event_); + if ((*it)->isDestroyOnSuccess()) { + it = callbacks.erase(it); + } else { + ++it; + } + } + } + } else { + auto & handlers = subscribers[event_.getEventType()]; + for (std::unique_ptr & handler : handlers) { + handler->exec(event_); + } + } } -void EventManager::queueEvent(std::unique_ptr&& event_, int eventId) -{ - eventsQueue.emplace_back(std::move(event_), eventId); +void EventManager::queueEvent(std::unique_ptr && event_, int eventId) { + eventsQueue.emplace_back(std::move(event_), eventId); } -void EventManager::dispatchEvents() -{ - for (std::vector, int>>::iterator eventIt = eventsQueue.begin(); eventIt != eventsQueue.end();) { - if (!eventIt->first.get()->getHandled()) { - triggerEvent(*eventIt->first.get(), eventIt->second); - eventIt = eventsQueue.erase(eventIt); - } else { - ++eventIt; - } - } +void EventManager::dispatchEvents() { + for (std::vector, int>>::iterator eventIt + = eventsQueue.begin(); + eventIt != eventsQueue.end();) { + if (!eventIt->first.get()->getHandled()) { + triggerEvent(*eventIt->first.get(), eventIt->second); + eventIt = eventsQueue.erase(eventIt); + } else { + ++eventIt; + } + } } diff --git a/mwe/events/src/main.cpp b/mwe/events/src/main.cpp index d056f85..f7e0766 100644 --- a/mwe/events/src/main.cpp +++ b/mwe/events/src/main.cpp @@ -1,11 +1,9 @@ +#include "customTypes.h" #include "event.h" #include "loopManager.h" #include #include #include -#include "loopManager.h" -#include "event.h" -#include "customTypes.h" class PlayerDamagedEvent : public Event { public: PlayerDamagedEvent(int damage, int playerID) @@ -13,9 +11,9 @@ public: REGISTER_EVENT_TYPE(PlayerDamagedEvent); - int getDamage() const { return damage; } - int getPlayerID() const { return playerID; } - + int getDamage() const { return damage; } + int getPlayerID() const { return playerID; } + private: int damage; int playerID; @@ -25,22 +23,22 @@ void onPlayerDamaged(const PlayerDamagedEvent & e) { << " damage." << std::endl; } -void onKeyPressed1(const KeyPressedEvent& e) -{ - int keyCode = e.getKeyCode(); - fprintf(stderr,"first function KeyCode %d\n",keyCode); +void onKeyPressed1(const KeyPressedEvent & e) { + int keyCode = e.getKeyCode(); + fprintf(stderr, "first function KeyCode %d\n", keyCode); } -void onKeyPressed(const KeyPressedEvent& e) -{ - int keyCode = e.getKeyCode(); - fprintf(stderr,"second function KeyCode %d\n",keyCode); +void onKeyPressed(const KeyPressedEvent & e) { + int keyCode = e.getKeyCode(); + fprintf(stderr, "second function KeyCode %d\n", keyCode); } -void CollisionHandler(const CollisionEvent& e){ - std::cout << "collision betwee object id: "<< e.getCollisionData().objectIdA << " and id: " << e.getCollisionData().objectIdB << std::endl; +void CollisionHandler(const CollisionEvent & e) { + std::cout << "collision betwee object id: " + << e.getCollisionData().objectIdA + << " and id: " << e.getCollisionData().objectIdB << std::endl; } void testCollisionEvent() { Collision testCollision(1, 2, {3, 4}, {5, 6}, 7.8f); - subscribe(CollisionHandler,1); + subscribe(CollisionHandler, 1); // EventHandler triggerEvent(CollisionEvent(testCollision), 1); } @@ -53,15 +51,15 @@ int main(int argc, char * args[]) { // custom event class poc subscribe(onPlayerDamaged); triggerEvent(PlayerDamagedEvent(50, 1)); - subscribe(onKeyPressed,1,false); - subscribe(onKeyPressed1,false); - // queueEvent(std::move(anotherKeyPressEvent)); - triggerEvent(KeyPressedEvent(42), 1); - + subscribe(onKeyPressed, 1, false); + subscribe(onKeyPressed1, false); + // queueEvent(std::move(anotherKeyPressEvent)); + triggerEvent(KeyPressedEvent(42), 1); + EventManager::getInstance().dispatchEvents(); //collision event call testCollisionEvent(); - + gameLoop.setup(); gameLoop.loop(); return 0; @@ -76,9 +74,9 @@ int main(int argc, char * args[]) { // triggerEvent(CollisionEvent(1,2),1); // triggerEvent(CollisionEvent(1,2),2); // } - + // } // int main(){ - + // return 0; // } -- cgit v1.2.3 From 2d67cf09b80297d13f642afd7db13dba53ca2b9b Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 25 Oct 2024 21:26:41 +0200 Subject: disable C/C++ autoAddFileAssociations in vscode settings.json --- .vscode/settings.json | 69 +--------------------------------------- mwe/.vscode/settings.json | 11 ------- mwe/events/.vscode/settings.json | 68 --------------------------------------- 3 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 mwe/.vscode/settings.json delete mode 100644 mwe/events/.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 1ea4738..9a9b1ea 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,71 +1,4 @@ { "cmake.sourceDirectory": "${workspaceFolder}/src", - "files.associations": { - "functional": "cpp", - "array": "cpp", - "atomic": "cpp", - "bit": "cpp", - "*.tcc": "cpp", - "cctype": "cpp", - "charconv": "cpp", - "chrono": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "compare": "cpp", - "concepts": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "map": "cpp", - "string": "cpp", - "unordered_map": "cpp", - "vector": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "iterator": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "ratio": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "format": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "new": "cpp", - "numbers": "cpp", - "ostream": "cpp", - "semaphore": "cpp", - "span": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "stop_token": "cpp", - "streambuf": "cpp", - "thread": "cpp", - "cinttypes": "cpp", - "typeinfo": "cpp", - "valarray": "cpp", - "variant": "cpp", - "forward_list": "cpp", - "codecvt": "cpp", - "fstream": "cpp", - "typeindex": "cpp" - } + "C_Cpp.autoAddFileAssociations": false } diff --git a/mwe/.vscode/settings.json b/mwe/.vscode/settings.json deleted file mode 100644 index c7913ab..0000000 --- a/mwe/.vscode/settings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "files.associations": { - "variant": "cpp", - "*.tcc": "cpp", - "string": "cpp", - "unordered_map": "cpp", - "string_view": "cpp", - "ostream": "cpp", - "iostream": "cpp" - } -} diff --git a/mwe/events/.vscode/settings.json b/mwe/events/.vscode/settings.json deleted file mode 100644 index 2b1a397..0000000 --- a/mwe/events/.vscode/settings.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "files.associations": { - "iostream": "cpp", - "array": "cpp", - "atomic": "cpp", - "bit": "cpp", - "*.tcc": "cpp", - "cctype": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "compare": "cpp", - "concepts": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "map": "cpp", - "string": "cpp", - "unordered_map": "cpp", - "vector": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "initializer_list": "cpp", - "iosfwd": "cpp", - "istream": "cpp", - "limits": "cpp", - "new": "cpp", - "numbers": "cpp", - "ostream": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "cinttypes": "cpp", - "typeinfo": "cpp", - "valarray": "cpp", - "variant": "cpp", - "condition_variable": "cpp", - "ctime": "cpp", - "forward_list": "cpp", - "executor": "cpp", - "io_context": "cpp", - "netfwd": "cpp", - "ratio": "cpp", - "timer": "cpp", - "future": "cpp", - "mutex": "cpp", - "semaphore": "cpp", - "stop_token": "cpp", - "thread": "cpp" - } -} -- cgit v1.2.3 From 314354fda83f7f0e4ef11b13322e84997b4ccee0 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 31 Oct 2024 15:50:59 +0100 Subject: update build commands in readme --- readme.md | 27 ++++++++++++++------------- src/readme.md | 8 ++++---- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/readme.md b/readme.md index f09c947..8ce6d78 100644 --- a/readme.md +++ b/readme.md @@ -19,28 +19,29 @@ building instructions. ## Installing libraries The expected library (source) versions are included in this repository as git -submodules. Follow these steps for manually building one of the required -libraries from source: +submodules, which may be used if your distro's package manager does not provide +(recent enough versions of) them. To build any of the dependencies, make sure +the submodules are initialized by running: -1. Ensure the git submodules are initialized: - ``` - $ git submodule update --init --recursive --depth 1 - ``` -2. `cd` into the library source folder: +``` +$ git submodule update --init --recursive --depth 1 +``` + +Then, follow these steps for each library you want to install: + +1. Change into the library folder (run **one** of these): ``` $ cd lib/googletest - or $ cd lib/sdl2 - or $ cd lib/soloud/contrib - or $ cd lib/sdl_image ``` -3. Configure the build, run the build and install: +2. Use CMake to configure the build, run the build and install (run **all** of + these): ``` $ cmake -B build -G Ninja - $ ninja -C build - # ninja -C build install + $ cmake --build build + # cmake --install build ``` ## Documentation diff --git a/src/readme.md b/src/readme.md index a8ffc51..15fa6f3 100644 --- a/src/readme.md +++ b/src/readme.md @@ -8,27 +8,27 @@ Examples (using Ninja): ``` $ cmake -B build -G Ninja -$ ninja -C build +$ cmake --build build ``` Unit tests can be built by explicitly specifying the target `test_main` when running the build command: ``` -$ ninja -C build test_main +$ cmake --build build --target test_main ``` Each source file in the example/ folder corresponds to a CMake target as well (all examples can be built at once by specifying the `examples` target): ``` -$ ninja -C build audio_internal components_internal +$ cmake --build build --target audio_internal script ``` For installing crêpe system-wide after building (install must be run with elevated privileges): ``` -# ninja -C build install +# cmake --install build ``` -- cgit v1.2.3 From 35ef3ba91ce9e00466508f2388f4c1dd2321b505 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 31 Oct 2024 18:40:45 +0100 Subject: minor script system fixes --- src/crepe/ScriptSystem.cpp | 1 + src/crepe/api/Transform.cpp | 2 +- src/crepe/api/Transform.h | 2 +- src/example/script.cpp | 31 +++++++++++++++++++++---------- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp index d00d474..171b490 100644 --- a/src/crepe/ScriptSystem.cpp +++ b/src/crepe/ScriptSystem.cpp @@ -37,6 +37,7 @@ forward_list