Work in progress

Makefile

@@ -20,5 +20,5 @@ build: ## Build
 
 configure: clean ## Configure
 	conan remote update conancenter --url https://center2.conan.io
-	conan install . --output-folder=build --build=missing --profile=webassembly --settings compiler.cppstd=20 --settings build_type=Release
-	cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DSDL2_DIR=generators -DCMAKE_BUILD_TYPE=Release -DLOCAL=ON -DSANDBOX=OFF -DENABLE_PROFILING=ON
+	conan install . --output-folder=build --build=missing --profile=default --settings compiler.cppstd=20 --settings build_type=Release
+	cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DSDL2_DIR=generators -DCMAKE_BUILD_TYPE=Release -DLOCAL=ON -DSANDBOX=ON -DENABLE_PROFILING=ON

requirements.txt

@@ -1,3 +1,3 @@
-conan==2.8.1
+conan==2.11.0
 pre-commit==4.0.1
-pur==7.3.2
+pur==7.3.3

src/application.cpp

@@ -18,7 +18,7 @@ application::application(int argc, char **argv) {
 int application::run() {
   try {
 #if SANDBOX
-    storage::filesystem::mount("../../sandbox", "/");
+    storage::filesystem::mount("../sandbox", "/");
 #else
     storage::filesystem::mount("bundle.7z", "/");
 #endif

src/common.hpp

@@ -10,10 +10,23 @@
 #define NOMINMAX
 #endif
 
+#define WEBSOCKET
+
 #ifdef EMSCRIPTEN
 #include <emscripten.h>
+#ifdef WEBSOCKET
 #include <emscripten/websocket.h>
 #endif
+#endif
+
+#ifndef EMSCRIPTEN
+#ifdef WEBSOCKET
+#include <boost/asio.hpp>
+#include <boost/asio/strand.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
+#endif
+#endif
 
 #ifdef STEAM
 #include <steam/steam_api.h>
@@ -109,7 +122,7 @@ class eventmanager;
 class eventreceiver;
 }
 
-namespace math {
+namespace algebra {
 class vector2d;
 }
 

src/entity.cpp

@@ -47,11 +47,11 @@ void entity::move(float_t x_velocity, float_t y_velocity) noexcept {
   // cpBodySetVelocity(_props.body.get(), {x_velocity, y_velocity});
 }
 
-void entity::set_velocity(const math::vector2d &velocity) noexcept {
+void entity::set_velocity(const algebra::vector2d &velocity) noexcept {
   _props.velocity = velocity;
 }
 
-math::vector2d entity::velocity() const noexcept {
+algebra::vector2d entity::velocity() const noexcept {
   return _props.velocity;
 }
 

src/entity.hpp

@@ -30,8 +30,8 @@ class entity : public std::enable_shared_from_this<entity> {
   int32_t y() const noexcept;
 
   void move(float_t x_velocity, float_t y_velocity) noexcept;
-  void set_velocity(const math::vector2d &velocity) noexcept;
-  math::vector2d velocity() const noexcept;
+  void set_velocity(const algebra::vector2d &velocity) noexcept;
+  algebra::vector2d velocity() const noexcept;
 
   void set_placement(int32_t x, int32_t y) noexcept;
 

src/entityprops.hpp

@@ -32,7 +32,7 @@ struct entityprops {
   geometry::point pivot{};
   geometry::size size{};
   float_t scale{1.0f};
-  math::vector2d velocity{};
+  algebra::vector2d velocity{};
   std::string kind{};
   std::string action{};
   graphics::reflection reflection{graphics::reflection::none};