adapted paths and removed unused parameters

Author: psyinf

CMakeLists.txt

@@ -5,7 +5,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 #some global compiler settings
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_compile_options(/W4 /WX)
+    #add_compile_options(/W4 /WX)
+    add_compile_options(/W3)
     add_compile_options(/bigobj)
 else()
     #add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wno-c++98-compat -Wno-c++98-compat-pedantic)

apps/asteroids/main.cpp

@@ -19,7 +19,8 @@
 int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
 try
 {
-    pg::game::Game game({.vfsConfigs{{.root = "../data", .alias = "data"}}, .resourcePrefix = "data"});
+    pg::game::Game game(
+        {.vfsConfigs{{.root = "../data", .alias = "data"}, {.root = "../data/Meteors", .alias = "Meteors"}}});
 
     pg::game::SystemsFactory::registerSystem<asteroids::Lasers>("lasers");
     pg::game::SystemsFactory::registerSystem<asteroids::Player>("player");

apps/asteroids/systems/Lasers.cpp

@@ -14,7 +14,7 @@ void asteroids::Lasers::setup(std::string_view /*scene_id*/)
 void asteroids::Lasers::createShot(const events::LaserFired& event)
 {
     auto& renderer = _game.getApp().getRenderer();
-    auto  sprite = _game.getResource<pg::Sprite, sdl::Renderer&>("laserBlue01.png", renderer);
+    auto  sprite = _game.getResource<pg::Sprite, sdl::Renderer&>("data/laserBlue01.png", renderer);
 
     pg::game::Drawable d(sprite);
     // determine shoot position

apps/asteroids/systems/Player.cpp

@@ -15,7 +15,7 @@ void asteroids::Player::setup(std::string_view /*scene_id*/)
     auto& registry = _game.getGlobalRegistry();
 
     auto& keyStateMap = _game.getCurrentScene().getKeyStateMap();
-    auto  sprite = _game.getResource<pg::Sprite>("playerShip1_blue.png");
+    auto  sprite = _game.getResource<pg::Sprite>("data/playerShip1_blue.png");
     auto  windowDetails = _game.getCurrentScene().getSingleton<pg::game::WindowDetails>();
 
     auto player = pg::game::makeEntity<pg::BoundingSphere, pg::game::Drawable, pg::Transform2D, asteroids::Dynamics>(

libs/pgGame/config/GameConfig.hpp

@@ -16,7 +16,6 @@ struct GameConfig
     GenericConfig            options;
     pg::config::WindowConfig windowConfig;
     std::vector<VFSConfig>   vfsConfigs;
-    std::string              resourcePrefix;
 
     SDL_Rect getWindowRect()
     {

libs/pgGame/core/Game.cpp

@@ -5,7 +5,6 @@
 #include <core/GameExceptions.hpp>
 #include <events/SceneManagementEvents.hpp>
 #include <events/GameEvents.hpp>
-#include <ranges>
 #include <components/singletons/RegisteredPreloaders.hpp>
 #include <pgGame/core/VFSDataProvider.hpp>
 
@@ -76,7 +75,7 @@ game::Game::Game(pg::game::GameConfig&& config)
   , _inputEventDispatcher(_sdlApp.getEventHandler(), {})
   , _vfs(std::make_unique<physfspp::VirtualFileSystem>())
   , _resourceManager([this](const pg::foundation::URI& uri) -> pg::foundation::DataProviderPtr {
-      return std::make_unique<VFSDataProvider>(uri, _vfs, _gameConfig.resourcePrefix);
+      return std::make_unique<VFSDataProvider>(uri, _vfs);
   })
 {
     // register all vfs's

libs/pgGame/core/VFSDataProvider.hpp

@@ -8,21 +8,12 @@ class VFSDataProvider : public foundation::DataProvider
 {
     std::shared_ptr<physfspp::VirtualFileSystem> _vfs;
     std::shared_ptr<physfspp::IFStream>          _stream;
-    std::string                                  _localPrefix;
 
 public:
-    VFSDataProvider(const foundation::URI&                       uri,
-                    std::shared_ptr<physfspp::VirtualFileSystem> vfs,
-                    std::string                                  local_prefix = "")
+    VFSDataProvider(const foundation::URI& uri, std::shared_ptr<physfspp::VirtualFileSystem> vfs)
       : DataProvider(uri)
       , _vfs(std::move(vfs))
-      , _localPrefix(local_prefix)
     {
-        //         if (!_file && !_localPrefix.empty())
-        //         {
-        //             _file = _vfs->OpenFile({_localPrefix, getUri(), false}, {vfspp::IFile::FileMode::Read});
-        //         }
-        //         if (!_file) { throw std::runtime_error("Cannot open VFS file: " + std::string{getUri()}); }
     }
 
     ~VFSDataProvider() override;